4.0

24 files changed, 5667 insertions, 5484 deletions

diff --git a/ui/batch_config.cpp b/ui/batch_config.cpp
index 043281e9..6e784179 100644
--- a/ui/batch_config.cpp
+++ b/ui/batch_config.cpp
@@ -32,13 +32,13 @@ class BatchDialog: public BatchDlgGenerated
     friend class FolderPairCallback;
 
 public:
-    BatchDialog(wxWindow* window, const xmlAccess::XmlBatchConfig& batchCfg);
-    BatchDialog(wxWindow* window, const wxString& filename);
-    ~BatchDialog();
+    BatchDialog(wxWindow* window,
+                const wxString& referenceFile,
+                const xmlAccess::XmlBatchConfig& batchCfg,
+                const std::shared_ptr<FolderHistory>& folderHistLeft,
+                const std::shared_ptr<FolderHistory>& folderHistRight);
 
 private:
-    void init();
-
     virtual void OnCmpSettings(        wxCommandEvent& event);
     virtual void OnSyncSettings(       wxCommandEvent& event);
     virtual void OnConfigureFilter(    wxCommandEvent& event);
@@ -90,9 +90,12 @@ private:
 
     std::unique_ptr<wxMenu> contextMenu;
 
-    std::unique_ptr<zen::DirectoryName> logfileDir;
+    std::unique_ptr<DirectoryName<wxTextCtrl>> logfileDir;
 
     zen::EnumDescrList<xmlAccess::OnError> enumDescrMap;
+
+    std::shared_ptr<FolderHistory> folderHistLeft_;
+    std::shared_ptr<FolderHistory> folderHistRight_;
 };
 
 //###################################################################################################################################
@@ -131,11 +134,23 @@ private:
         return batchDlg.getConfig().mainCfg;
     }
 
+    virtual void OnAltCompCfgChange()
+    {
+        batchDlg.updateGui();
+    }
+
     virtual void OnAltSyncCfgChange()
     {
         batchDlg.updateGui();
     }
 
+    virtual void OnAltCompCfgRemoveConfirm(wxCommandEvent& event)
+    {
+        FolderPairPanelBasic<GuiPanel>::OnAltCompCfgRemoveConfirm(event);
+        batchDlg.updateGui();
+    }
+
+
     virtual void OnAltSyncCfgRemoveConfirm(wxCommandEvent& event)
     {
         FolderPairPanelBasic<GuiPanel>::OnAltSyncCfgRemoveConfirm(event);
@@ -160,9 +175,13 @@ public:
         dirNameLeft (*m_panelLeft,  *m_dirPickerLeft,  *m_directoryLeft),
         dirNameRight(*m_panelRight, *m_dirPickerRight, *m_directoryRight) {}
 
-    void setValues(const wxString& leftDir, const wxString& rightDir, AltSyncCfgPtr syncCfg, const FilterConfig& filter)
+    void setValues(const wxString& leftDir,
+                   const wxString& rightDir,
+                   AltCompCfgPtr cmpCfg,
+                   AltSyncCfgPtr syncCfg,
+                   const FilterConfig& filter)
     {
-        setConfig(syncCfg, filter);
+        setConfig(cmpCfg, syncCfg, filter);
         dirNameLeft.setName(leftDir);
         dirNameRight.setName(rightDir);
     }
@@ -171,8 +190,8 @@ public:
 
 private:
     //support for drag and drop
-    DirectoryName dirNameLeft;
-    DirectoryName dirNameRight;
+    DirectoryName<FolderHistoryBox> dirNameLeft;
+    DirectoryName<FolderHistoryBox> dirNameRight;
 };
 
 
@@ -190,9 +209,13 @@ public:
                      *batchDialog.m_dirPickerRight,
                      *batchDialog.m_directoryRight) {}
 
-    void setValues(const wxString& leftDir, const wxString& rightDir, AltSyncCfgPtr syncCfg, const FilterConfig& filter)
+    void setValues(const wxString& leftDir,
+                   const wxString& rightDir,
+                   AltCompCfgPtr cmpCfg,
+                   AltSyncCfgPtr syncCfg,
+                   const FilterConfig& filter)
     {
-        setConfig(syncCfg, filter);
+        setConfig(cmpCfg, syncCfg, filter);
         dirNameLeft.setName(leftDir);
         dirNameRight.setName(rightDir);
     }
@@ -201,33 +224,24 @@ public:
 
 private:
     //support for drag and drop
-    DirectoryName dirNameLeft;
-    DirectoryName dirNameRight;
+    DirectoryName<FolderHistoryBox> dirNameLeft;
+    DirectoryName<FolderHistoryBox> dirNameRight;
 };
-
-
 //###################################################################################################################################
-BatchDialog::BatchDialog(wxWindow* window, const xmlAccess::XmlBatchConfig& batchCfg) :
-    BatchDlgGenerated(window)
-{
-    init();
-    setConfig(batchCfg);
-}
 
 
-BatchDialog::BatchDialog(wxWindow* window, const wxString& filename) :
-    BatchDlgGenerated(window)
+BatchDialog::BatchDialog(wxWindow* window,
+                         const wxString& referenceFile,
+                         const xmlAccess::XmlBatchConfig& batchCfg,
+                         const std::shared_ptr<FolderHistory>& folderHistLeft,
+                         const std::shared_ptr<FolderHistory>& folderHistRight) :
+    BatchDlgGenerated(window),
+    folderHistLeft_(folderHistLeft),
+    folderHistRight_(folderHistRight)
 {
-    init();
-    loadBatchFile(filename);
-}
-
-
-BatchDialog::~BatchDialog() {} //non-inline destructor for std::auto_ptr to work with forward declaration
-
+    m_directoryLeft ->init(folderHistLeft_);
+    m_directoryRight->init(folderHistRight_);
 
-void BatchDialog::init()
-{
 #ifdef FFS_WIN
     new zen::MouseMoveWindow(*this); //allow moving main dialog by clicking (nearly) anywhere...; ownership passed to "this"
 #endif
@@ -235,15 +249,15 @@ void BatchDialog::init()
     wxWindowUpdateLocker dummy(this); //avoid display distortion
 
     enumDescrMap.
-    add(xmlAccess::ON_ERROR_POPUP , _("Show popup")    , _("Show popup on errors or warnings")).
+    add(xmlAccess::ON_ERROR_POPUP , _("Show pop-up")    , _("Show pop-up on errors or warnings")).
     add(xmlAccess::ON_ERROR_IGNORE, _("Ignore errors") , _("Hide all error and warning messages")).
     add(xmlAccess::ON_ERROR_EXIT  , _("Exit instantly"), _("Abort synchronization immediately"));
 
 
-    m_bpButtonCmpConfig->SetBitmapLabel(GlobalResources::instance().getImage(wxT("cmpConfig")));
-    m_bpButtonSyncConfig->SetBitmapLabel(GlobalResources::instance().getImage(wxT("syncConfig")));
+    m_bpButtonCmpConfig->SetBitmapLabel(GlobalResources::getImage(wxT("cmpConfig")));
+    m_bpButtonSyncConfig->SetBitmapLabel(GlobalResources::getImage(wxT("syncConfig")));
 
-    m_bpButtonHelp->SetBitmapLabel(GlobalResources::instance().getImage(wxT("help")));
+    m_bpButtonHelp->SetBitmapLabel(GlobalResources::getImage(wxT("help")));
 
     //init handling of first folder pair
     firstFolderPair.reset(new DirectoryPairBatchFirst(*this));
@@ -254,13 +268,21 @@ void BatchDialog::init()
     setupFileDrop(*this);
     Connect(FFS_DROP_FILE_EVENT, FFSFileDropEventHandler(BatchDialog::OnFilesDropped), NULL, this);
 
-    logfileDir.reset(new DirectoryName(*m_panelBatchSettings, *m_dirPickerLogfileDir, *m_textCtrlLogfileDir));
+    logfileDir.reset(new DirectoryName<wxTextCtrl>(*m_panelBatchSettings, *m_dirPickerLogfileDir, *m_textCtrlLogfileDir));
 
     //set icons for this dialog
-    m_bpButtonAddPair->SetBitmapLabel(GlobalResources::instance().getImage(wxT("addFolderPair")));
-    m_bitmap27->SetBitmap(GlobalResources::instance().getImage(wxT("batch")));
+    m_bpButtonAddPair->SetBitmapLabel(GlobalResources::getImage(wxT("addFolderPair")));
+    m_bitmap27->SetBitmap(GlobalResources::getImage(wxT("batch")));
 
     m_buttonSave->SetFocus();
+
+    if (!referenceFile.empty())
+    {
+        SetTitle(referenceFile);
+        proposedBatchFileName = referenceFile; //may be used on next save
+    }
+
+    setConfig(batchCfg);
 }
 
 //------------------- error handling --------------------------
@@ -290,8 +312,7 @@ void BatchDialog::OnCmpSettings(wxCommandEvent& event)
     //wxPoint windowPos = m_bpButtonCmpConfig->GetScreenPosition();
     //windowPos.x += m_bpButtonCmpConfig->GetSize().GetWidth() + 5;
 
-    if (zen::showCompareCfgDialog(localBatchCfg.mainCfg.compareVar,
-                                  localBatchCfg.mainCfg.handleSymlinks) == ReturnSmallDlg::BUTTON_OKAY)
+    if (zen::showCompareCfgDialog(localBatchCfg.mainCfg.cmpConfig) == ReturnSmallDlg::BUTTON_OKAY)
     {
         updateGui();
     }
@@ -300,10 +321,8 @@ void BatchDialog::OnCmpSettings(wxCommandEvent& event)
 
 void BatchDialog::OnSyncSettings(wxCommandEvent& event)
 {
-    if (showSyncConfigDlg(localBatchCfg.mainCfg.compareVar,
-                          localBatchCfg.mainCfg.syncConfiguration,
-                          localBatchCfg.mainCfg.handleDeletion,
-                          localBatchCfg.mainCfg.customDeletionDirectory,
+    if (showSyncConfigDlg(localBatchCfg.mainCfg.cmpConfig.compareVar,
+                          localBatchCfg.mainCfg.syncCfg,
                           NULL) == ReturnSyncConfig::BUTTON_OKAY) //optional input parameter
     {
         updateGui();
@@ -330,7 +349,7 @@ void BatchDialog::updateGui() //re-evaluate gui after config changes
     m_panelLogfile->Enable(cfg.logFileCountMax > 0);
 
     //update compare variant name
-    m_staticTextCmpVariant->SetLabel(wxString(wxT("(")) + getVariantName(cfg.mainCfg.compareVar) + wxT(")"));
+    m_staticTextCmpVariant->SetLabel(wxString(wxT("(")) + cfg.mainCfg.getCompVariantName() + wxT(")"));
 
     //update sync variant name
     m_staticTextSyncVariant->SetLabel(wxString(wxT("(")) + cfg.mainCfg.getSyncVariantName() + wxT(")"));
@@ -338,16 +357,17 @@ void BatchDialog::updateGui() //re-evaluate gui after config changes
     //set filter icon
     if (isNullFilter(cfg.mainCfg.globalFilter))
     {
-        setBitmapLabel(*m_bpButtonFilter, GlobalResources::instance().getImage(wxT("filterOff")));
+        setBitmapLabel(*m_bpButtonFilter, GlobalResources::getImage(wxT("filterOff")));
         m_bpButtonFilter->SetToolTip(_("No filter selected"));
     }
     else
     {
-        setBitmapLabel(*m_bpButtonFilter, GlobalResources::instance().getImage(wxT("filterOn")));
+        setBitmapLabel(*m_bpButtonFilter, GlobalResources::getImage(wxT("filterOn")));
         m_bpButtonFilter->SetToolTip(_("Filter is active"));
     }
 
     m_panelOverview->Layout(); //adjust stuff inside scrolled window
+    m_panelOverview->Refresh(); //refresh filter button (if nothing else)
 }
 
 
@@ -413,9 +433,9 @@ void BatchDialog::OnFilesDropped(FFSFileDropEvent& event)
 void BatchDialog::OnHelp(wxCommandEvent& event)
 {
 #ifdef FFS_WIN
-    zen::displayHelpEntry(wxT("html\\advanced\\ScheduleBatch.html"));
+    zen::displayHelpEntry(wxT("html\\ScheduleBatch.html"));
 #elif defined FFS_LINUX
-    zen::displayHelpEntry(wxT("html/advanced/ScheduleBatch.html"));
+    zen::displayHelpEntry(wxT("html/ScheduleBatch.html"));
 #endif
 }
 
@@ -470,7 +490,6 @@ void BatchDialog::OnSaveBatchJob(wxCommandEvent& event)
     if (defaultFileName.EndsWith(wxT(".ffs_gui")))
         defaultFileName.Replace(wxT(".ffs_gui"), wxT(".ffs_batch"), false);
 
-
     wxFileDialog filePicker(this,
                             wxEmptyString,
                             wxEmptyString,
@@ -513,6 +532,7 @@ FolderPairEnh getEnhancedPair(const DirectoryPairBatch* panel)
 {
     return FolderPairEnh(toZ(panel->getLeftDir()),
                          toZ(panel->getRightDir()),
+                         panel->getAltCompConfig(),
                          panel->getAltSyncConfig(),
                          panel->getAltFilterConfig());
 }
@@ -604,6 +624,7 @@ void BatchDialog::setConfig(const xmlAccess::XmlBatchConfig& batchCfg)
     //set first folder pair
     firstFolderPair->setValues(toWx(batchCfg.mainCfg.firstPair.leftDirectory),
                                toWx(batchCfg.mainCfg.firstPair.rightDirectory),
+                               batchCfg.mainCfg.firstPair.altCmpConfig,
                                batchCfg.mainCfg.firstPair.altSyncConfig,
                                batchCfg.mainCfg.firstPair.localFilter);
 
@@ -630,6 +651,7 @@ xmlAccess::XmlBatchConfig BatchDialog::getConfig() const
     //first folder pair
     batchCfg.mainCfg.firstPair = FolderPairEnh(toZ(firstFolderPair->getLeftDir()),
                                                toZ(firstFolderPair->getRightDir()),
+                                               firstFolderPair->getAltCompConfig(),
                                                firstFolderPair->getAltSyncConfig(),
                                                firstFolderPair->getAltFilterConfig());
 
@@ -656,14 +678,16 @@ void BatchDialog::OnAddFolderPair(wxCommandEvent& event)
     std::vector<FolderPairEnh> newPairs;
     newPairs.push_back(getConfig().mainCfg.firstPair);
 
-    addFolderPair(newPairs, true); //add pair in front of additonal pairs
-
     //clear first pair
     const FolderPairEnh cfgEmpty;
     firstFolderPair->setValues(toWx(cfgEmpty.leftDirectory),
                                toWx(cfgEmpty.rightDirectory),
+                               cfgEmpty.altCmpConfig,
                                cfgEmpty.altSyncConfig,
                                cfgEmpty.localFilter);
+
+    //keep sequence to update GUI as last step
+    addFolderPair(newPairs, true); //add pair in front of additonal pairs
 }
 
 
@@ -692,6 +716,7 @@ void BatchDialog::OnRemoveTopFolderPair(wxCommandEvent& event)
         //reset first pair
         firstFolderPair->setValues(toWx(cfgSecond.leftDirectory),
                                    toWx(cfgSecond.rightDirectory),
+                                   cfgSecond.altCmpConfig,
                                    cfgSecond.altSyncConfig,
                                    cfgSecond.localFilter);
 
@@ -710,16 +735,19 @@ void BatchDialog::updateGuiForFolderPair()
 
     //adapt local filter and sync cfg for first folder pair
     if (additionalFolderPairs.size() == 0 &&
+        firstFolderPair->getAltCompConfig().get() == NULL &&
         firstFolderPair->getAltSyncConfig().get() == NULL &&
         isNullFilter(firstFolderPair->getAltFilterConfig()))
     {
+        m_bpButtonAltCompCfg ->Hide();
         m_bpButtonLocalFilter->Hide();
-        m_bpButtonAltSyncCfg->Hide();
+        m_bpButtonAltSyncCfg ->Hide();
     }
     else
     {
+        m_bpButtonAltCompCfg ->Show();
         m_bpButtonLocalFilter->Show();
-        m_bpButtonAltSyncCfg->Show();
+        m_bpButtonAltSyncCfg ->Show();
     }
 
     //update controls
@@ -757,6 +785,10 @@ void BatchDialog::addFolderPair(const std::vector<zen::FolderPairEnh>& newPairs,
         {
             DirectoryPairBatch* newPair = new DirectoryPairBatch(m_scrolledWindow6, *this);
 
+            //init dropdown history
+            newPair->m_directoryLeft ->init(folderHistLeft_);
+            newPair->m_directoryRight->init(folderHistRight_);
+
             if (addFront)
             {
                 bSizerAddFolderPairs->Insert(0, newPair, 0, wxEXPAND, 5);
@@ -774,6 +806,7 @@ void BatchDialog::addFolderPair(const std::vector<zen::FolderPairEnh>& newPairs,
             //set alternate configuration
             newPair->setValues(toWx(i->leftDirectory),
                                toWx(i->rightDirectory),
+                               i->altCmpConfig,
                                i->altSyncConfig,
                                i->localFilter);
         }
@@ -783,6 +816,8 @@ void BatchDialog::addFolderPair(const std::vector<zen::FolderPairEnh>& newPairs,
     }
 
     updateGuiForFolderPair();
+
+    updateGui(); //mainly to update sync dir description text
 }
 
 
@@ -804,6 +839,8 @@ void BatchDialog::removeAddFolderPair(const int pos)
     }
 
     updateGuiForFolderPair();
+
+    updateGui(); //mainly to update sync dir description text
 }
 
 
@@ -888,16 +925,11 @@ bool BatchDialog::createBatchFile(const wxString& filename)
 */
 
 
-
-ReturnBatchConfig::ButtonPressed zen::showSyncBatchDlg(const wxString& filename)
-{
-    BatchDialog batchDlg(NULL, filename);
-    return static_cast<ReturnBatchConfig::ButtonPressed>(batchDlg.ShowModal());
-}
-
-
-ReturnBatchConfig::ButtonPressed zen::showSyncBatchDlg(const xmlAccess::XmlBatchConfig& batchCfg)
+ReturnBatchConfig::ButtonPressed zen::showSyncBatchDlg(const wxString& referenceFile,
+                                                       const xmlAccess::XmlBatchConfig& batchCfg,
+                                                       const std::shared_ptr<FolderHistory>& folderHistLeft,
+                                                       const std::shared_ptr<FolderHistory>& folderHistRight)
 {
-    BatchDialog batchDlg(NULL, batchCfg);
+    BatchDialog batchDlg(NULL, referenceFile, batchCfg, folderHistLeft, folderHistRight);
     return static_cast<ReturnBatchConfig::ButtonPressed>(batchDlg.ShowModal());
 }
diff --git a/ui/batch_config.h b/ui/batch_config.h
index 9a272261..02f9b5f8 100644
--- a/ui/batch_config.h
+++ b/ui/batch_config.h
@@ -8,7 +8,7 @@
 #define BATCHCONFIG_H_INCLUDED
 
 #include "../library/process_xml.h"
-
+#include "../shared/folder_history_box.h"
 
 namespace zen
 {
@@ -21,8 +21,10 @@ struct ReturnBatchConfig
     };
 };
 
-ReturnBatchConfig::ButtonPressed showSyncBatchDlg(const wxString& filename);
-ReturnBatchConfig::ButtonPressed showSyncBatchDlg(const xmlAccess::XmlBatchConfig& batchCfg);
+ReturnBatchConfig::ButtonPressed showSyncBatchDlg(const wxString& referenceFile,
+                                                  const xmlAccess::XmlBatchConfig& batchCfg,
+                                                  const std::shared_ptr<FolderHistory>& folderHistLeft,
+                                                  const std::shared_ptr<FolderHistory>& folderHistRight);
 }
 
 
diff --git a/ui/batch_status_handler.cpp b/ui/batch_status_handler.cpp
index 772feaf4..84168014 100644
--- a/ui/batch_status_handler.cpp
+++ b/ui/batch_status_handler.cpp
@@ -54,7 +54,7 @@ void removeFileNoThrow(const Zstring& filename)
     {
         zen::removeFile(filename);
     }
-    catch(...) {}
+    catch (...) {}
 }
 }
 
@@ -62,7 +62,7 @@ void removeFileNoThrow(const Zstring& filename)
 class LogFile
 {
 public:
-    LogFile(const wxString& logfileDirectory, const wxString& jobName) : jobName_(jobName) //throw (FileError&)
+    LogFile(const wxString& logfileDirectory, const wxString& jobName) : jobName_(jobName) //throw FileError
     {
         logfileName = findUniqueLogname(logfileDirectory, jobName);
 
@@ -298,10 +298,16 @@ void BatchStatusHandler::updateProcessedData(int objectsProcessed, zen::Int64 da
 }
 
 
+void BatchStatusHandler::reportStatus(const wxString& text)
+{
+    syncStatusFrame.setStatusText_NoUpdate(text);
+    requestUiRefresh(); //throw AbortThisProcess
+}
+
+
 void BatchStatusHandler::reportInfo(const wxString& text)
 {
-    if (currentProcess == StatusHandler::PROCESS_SYNCHRONIZING) //write file transfer information to log
-        errorLog.logMsg(text, TYPE_INFO); //avoid spamming with file copy info: visually identifying warning messages has priority! however when saving to a log file wee need this info
+    errorLog.logMsg(text, TYPE_INFO);
 
     syncStatusFrame.setStatusText_NoUpdate(text);
     requestUiRefresh(); //throw AbortThisProcess
diff --git a/ui/batch_status_handler.h b/ui/batch_status_handler.h
index 61e0f46e..43fa5549 100644
--- a/ui/batch_status_handler.h
+++ b/ui/batch_status_handler.h
@@ -34,6 +34,7 @@ public:
 
     virtual void initNewProcess(int objectsTotal, zen::Int64 dataTotal, Process processID);
     virtual void updateProcessedData(int objectsProcessed, zen::Int64 dataProcessed);
+    virtual void reportStatus(const wxString& text);
     virtual void reportInfo(const wxString& text);
     virtual void forceUiRefresh();
 
diff --git a/ui/check_version.cpp b/ui/check_version.cpp
index 491cf3c2..16eb7719 100644
--- a/ui/check_version.cpp
+++ b/ui/check_version.cpp
@@ -5,6 +5,7 @@
 // **************************************************************************
 
 #include "check_version.h"
+#include <memory>
 #include <wx/msgdlg.h>
 #include <wx/protocol/http.h>
 #include <wx/sstream.h>
@@ -14,36 +15,15 @@
 #include <string_tools.h>
 #include "msg_popup.h"
 #include "../shared/standard_paths.h"
+#include "loki/ScopeGuard.h"
 #include <wx/tokenzr.h>
 #include "../shared/i18n.h"
 
-class CloseConnectionOnExit
-{
-public:
-    CloseConnectionOnExit(wxInputStream* httpStream, wxHTTP& webAccess) :
-        m_httpStream(httpStream),
-        m_webAccess(webAccess) {}
-
-    ~CloseConnectionOnExit()
-    {
-        delete m_httpStream; //must be deleted BEFORE webAccess is closed
-        m_webAccess.Close();
-    }
-
-private:
-    wxInputStream* m_httpStream;
-    wxHTTP& m_webAccess;
-};
-
-
 bool getOnlineVersion(wxString& version)
 {
-    wxHTTP webAccess;
-    wxInputStream* httpStream = NULL;
-
     wxWindowDisabler dummy;
-    CloseConnectionOnExit dummy2(httpStream, webAccess);
 
+    wxHTTP webAccess;
     webAccess.SetHeader(wxT("Content-type"), wxT("text/html; charset=utf-8"));
     webAccess.SetTimeout(5); //5 seconds of timeout instead of 10 minutes...
 
@@ -51,7 +31,8 @@ bool getOnlineVersion(wxString& version)
     {
         //wxApp::IsMainLoopRunning(); // should return true
 
-        httpStream = webAccess.GetInputStream(wxT("/viewvc/freefilesync/version/version.txt"));
+        std::unique_ptr<wxInputStream> httpStream(webAccess.GetInputStream(wxT("/viewvc/freefilesync/version/version.txt")));
+        //must be deleted BEFORE webAccess is closed
 
         if (httpStream && webAccess.GetError() == wxPROTO_NOERR)
         {
diff --git a/ui/folder_pair.h b/ui/folder_pair.h
index 5ca8d92f..6c535664 100644
--- a/ui/folder_pair.h
+++ b/ui/folder_pair.h
@@ -27,49 +27,56 @@ template <class GuiPanel>
 class FolderPairPanelBasic : private wxEvtHandler
 {
 public:
-    typedef std::shared_ptr<const zen::AlternateSyncConfig> AltSyncCfgPtr;
+    typedef std::shared_ptr<const CompConfig> AltCompCfgPtr;
+    typedef std::shared_ptr<const SyncConfig> AltSyncCfgPtr;
 
-    AltSyncCfgPtr getAltSyncConfig() const
-    {
-        return altSyncConfig;
-    }
-
-    FilterConfig getAltFilterConfig() const
-    {
-        return localFilter;
-    }
+    AltCompCfgPtr getAltCompConfig() const { return altCompConfig; }
+    AltSyncCfgPtr getAltSyncConfig() const { return altSyncConfig; }
+    FilterConfig getAltFilterConfig() const { return localFilter; }
 
-    void setConfig(AltSyncCfgPtr syncCfg, const FilterConfig& filter)
+    void setConfig(AltCompCfgPtr compConfig, AltSyncCfgPtr syncCfg, const FilterConfig& filter)
     {
+        altCompConfig = compConfig;
         altSyncConfig = syncCfg;
         localFilter   = filter;
         refreshButtons();
     }
 
-
     void refreshButtons()
     {
+        if (altCompConfig.get())
+        {
+            setBitmapLabel(*basicPanel_.m_bpButtonAltCompCfg, GlobalResources::getImage(wxT("cmpConfigSmall")));
+            basicPanel_.m_bpButtonAltCompCfg->SetToolTip(wxString(_("Select alternate comparison settings")) +  wxT(" \n") +
+                                                         wxT("(") + getVariantName(altCompConfig->compareVar) + wxT(")"));
+        }
+        else
+        {
+            setBitmapLabel(*basicPanel_.m_bpButtonAltCompCfg, GlobalResources::getImage(wxT("cmpConfigSmallGrey")));
+            basicPanel_.m_bpButtonAltCompCfg->SetToolTip(_("Select alternate comparison settings"));
+        }
+
         if (altSyncConfig.get())
         {
-            setBitmapLabel(*basicPanel_.m_bpButtonAltSyncCfg, GlobalResources::instance().getImage(wxT("syncConfigSmall")));
+            setBitmapLabel(*basicPanel_.m_bpButtonAltSyncCfg, GlobalResources::getImage(wxT("syncConfigSmall")));
             basicPanel_.m_bpButtonAltSyncCfg->SetToolTip(wxString(_("Select alternate synchronization settings")) +  wxT(" \n") +
-                                                         wxT("(") + getVariantName(altSyncConfig->syncConfiguration.var) + wxT(")"));
+                                                         wxT("(") + getVariantName(altSyncConfig->directionCfg.var) + wxT(")"));
         }
         else
         {
-            setBitmapLabel(*basicPanel_.m_bpButtonAltSyncCfg, GlobalResources::instance().getImage(wxT("syncConfigSmallGrey")));
+            setBitmapLabel(*basicPanel_.m_bpButtonAltSyncCfg, GlobalResources::getImage(wxT("syncConfigSmallGrey")));
             basicPanel_.m_bpButtonAltSyncCfg->SetToolTip(_("Select alternate synchronization settings"));
         }
 
         //test for Null-filter
         if (isNullFilter(localFilter))
         {
-            setBitmapLabel(*basicPanel_.m_bpButtonLocalFilter, GlobalResources::instance().getImage(wxT("filterSmallGrey")));
+            setBitmapLabel(*basicPanel_.m_bpButtonLocalFilter, GlobalResources::getImage(wxT("filterSmallGrey")));
             basicPanel_.m_bpButtonLocalFilter->SetToolTip(_("No filter selected"));
         }
         else
         {
-            setBitmapLabel(*basicPanel_.m_bpButtonLocalFilter, GlobalResources::instance().getImage(wxT("filterSmall")));
+            setBitmapLabel(*basicPanel_.m_bpButtonLocalFilter, GlobalResources::getImage(wxT("filterSmall")));
             basicPanel_.m_bpButtonLocalFilter->SetToolTip(_("Filter is active"));
         }
     }
@@ -79,18 +86,20 @@ protected:
         basicPanel_(basicPanel)
     {
         //register events for removal of alternate configuration
-        basicPanel_.m_bpButtonAltSyncCfg->Connect(wxEVT_RIGHT_DOWN, wxCommandEventHandler(FolderPairPanelBasic::OnAltSyncCfgRemove), NULL, this);
+        basicPanel_.m_bpButtonAltCompCfg ->Connect(wxEVT_RIGHT_DOWN, wxCommandEventHandler(FolderPairPanelBasic::OnAltCompCfgRemove    ), NULL, this);
+        basicPanel_.m_bpButtonAltSyncCfg ->Connect(wxEVT_RIGHT_DOWN, wxCommandEventHandler(FolderPairPanelBasic::OnAltSyncCfgRemove    ), NULL, this);
         basicPanel_.m_bpButtonLocalFilter->Connect(wxEVT_RIGHT_DOWN, wxCommandEventHandler(FolderPairPanelBasic::OnLocalFilterCfgRemove), NULL, this);
 
-        basicPanel_.m_bpButtonAltSyncCfg-> Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(FolderPairPanelBasic::OnAltSyncCfg), NULL, this);
+        basicPanel_.m_bpButtonAltCompCfg-> Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(FolderPairPanelBasic::OnAltCompCfg    ), NULL, this);
+        basicPanel_.m_bpButtonAltSyncCfg-> Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(FolderPairPanelBasic::OnAltSyncCfg    ), NULL, this);
         basicPanel_.m_bpButtonLocalFilter->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(FolderPairPanelBasic::OnLocalFilterCfg), NULL, this);
 
-        basicPanel_.m_bpButtonRemovePair->SetBitmapLabel(GlobalResources::instance().getImage(wxT("removeFolderPair")));
+        basicPanel_.m_bpButtonRemovePair->SetBitmapLabel(GlobalResources::getImage(wxT("removeFolderPair")));
     }
 
-    virtual void OnLocalFilterCfgRemoveConfirm(wxCommandEvent& event)
+    virtual void OnAltCompCfgRemoveConfirm(wxCommandEvent& event)
     {
-        localFilter = FilterConfig();
+        altCompConfig.reset();
         refreshButtons();
     }
 
@@ -100,18 +109,23 @@ protected:
         refreshButtons();
     }
 
+    virtual void OnLocalFilterCfgRemoveConfirm(wxCommandEvent& event)
+    {
+        localFilter = FilterConfig();
+        refreshButtons();
+    }
 
 private:
-    void OnLocalFilterCfgRemove(wxCommandEvent& event)
+    void OnAltCompCfgRemove(wxCommandEvent& event)
     {
         contextMenu.reset(new wxMenu); //re-create context menu
 
-        wxMenuItem* itemClear = new wxMenuItem(contextMenu.get(), wxID_ANY, _("Clear filter settings"));
-        contextMenu->Append(itemClear);
-        contextMenu->Connect(itemClear->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(FolderPairPanelBasic::OnLocalFilterCfgRemoveConfirm), NULL, this);
+        wxMenuItem* itemRemove = new wxMenuItem(contextMenu.get(), wxID_ANY, _("Remove alternate settings"));
+        contextMenu->Append(itemRemove);
+        contextMenu->Connect(itemRemove->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(FolderPairPanelBasic::OnAltCompCfgRemoveConfirm), NULL, this);
 
-        if (isNullFilter(localFilter))
-            contextMenu->Enable(itemClear->GetId(), false); //disable menu item, if clicking wouldn't make sense anyway
+        if (!altCompConfig.get())
+            contextMenu->Enable(itemRemove->GetId(), false); //disable menu item, if clicking wouldn't make sense anyway
 
         basicPanel_.PopupMenu(contextMenu.get()); //show context menu
     }
@@ -130,36 +144,61 @@ private:
         basicPanel_.PopupMenu(contextMenu.get()); //show context menu
     }
 
+    void OnLocalFilterCfgRemove(wxCommandEvent& event)
+    {
+        contextMenu.reset(new wxMenu); //re-create context menu
+
+        wxMenuItem* itemClear = new wxMenuItem(contextMenu.get(), wxID_ANY, _("Clear filter settings"));
+        contextMenu->Append(itemClear);
+        contextMenu->Connect(itemClear->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(FolderPairPanelBasic::OnLocalFilterCfgRemoveConfirm), NULL, this);
+
+        if (isNullFilter(localFilter))
+            contextMenu->Enable(itemClear->GetId(), false); //disable menu item, if clicking wouldn't make sense anyway
+
+        basicPanel_.PopupMenu(contextMenu.get()); //show context menu
+    }
+
+
     virtual MainConfiguration getMainConfig() const = 0;
     virtual wxWindow* getParentWindow() = 0;
 
-    virtual void OnAltSyncCfgChange() {};
+    virtual void OnAltCompCfgChange() = 0;
+    virtual void OnAltSyncCfgChange() = 0;
+    virtual void OnLocalFilterCfgChange() {};
 
-    void OnAltSyncCfg(wxCommandEvent& event)
+    void OnAltCompCfg(wxCommandEvent& event)
     {
         const MainConfiguration mainCfg = getMainConfig();
-        const AlternateSyncConfig syncConfigMain(mainCfg.syncConfiguration,
-                                                 mainCfg.handleDeletion,
-                                                 mainCfg.customDeletionDirectory);
 
-        AlternateSyncConfig altSyncCfg = altSyncConfig.get() ? *altSyncConfig : syncConfigMain;
+        CompConfig cmpCfg = altCompConfig.get() ? *altCompConfig : mainCfg.cmpConfig;
+
+        if (showCompareCfgDialog(cmpCfg) == ReturnSmallDlg::BUTTON_OKAY)
+        {
+            altCompConfig = std::make_shared<CompConfig>(cmpCfg);
+            refreshButtons();
+
+            OnAltCompCfgChange();
+        }
+    }
+
+    void OnAltSyncCfg(wxCommandEvent& event)
+    {
+        const MainConfiguration mainCfg = getMainConfig();
 
+        CompConfig cmpCfg  = altCompConfig.get() ? *altCompConfig : mainCfg.cmpConfig;
+        SyncConfig syncCfg = altSyncConfig.get() ? *altSyncConfig : mainCfg.syncCfg;
 
-        if (showSyncConfigDlg(mainCfg.compareVar,
-                              altSyncCfg.syncConfiguration,
-                              altSyncCfg.handleDeletion,
-                              altSyncCfg.customDeletionDirectory,
+        if (showSyncConfigDlg(cmpCfg.compareVar,
+                              syncCfg,
                               NULL) == ReturnSyncConfig::BUTTON_OKAY) //optional input parameter
         {
-            altSyncConfig.reset(new AlternateSyncConfig(altSyncCfg));
+            altSyncConfig = std::make_shared<SyncConfig>(syncCfg);
             refreshButtons();
 
             OnAltSyncCfgChange();
         }
     }
 
-    virtual void OnLocalFilterCfgChange() {};
-
     void OnLocalFilterCfg(wxCommandEvent& event)
     {
         FilterConfig localFiltTmp = localFilter;
@@ -177,7 +216,8 @@ private:
     GuiPanel& basicPanel_; //panel to be enhanced by this template
 
     //alternate configuration attached to it
-    AltSyncCfgPtr altSyncConfig; //optional: present if non-NULL
+    AltCompCfgPtr altCompConfig; //optional: present if non-NULL
+    AltSyncCfgPtr altSyncConfig; //
     FilterConfig  localFilter;
 
     std::unique_ptr<wxMenu> contextMenu;
diff --git a/ui/grid_view.cpp b/ui/grid_view.cpp
index 0614b3e5..17fb3ff4 100644
--- a/ui/grid_view.cpp
+++ b/ui/grid_view.cpp
@@ -8,6 +8,7 @@
 #include "sorting.h"
 #include "../synchronization.h"
 #include <boost/bind.hpp>
+#include "../shared/stl_tools.h"
 
 using namespace zen;
 
@@ -258,8 +259,7 @@ void GridView::removeInvalidRows()
     viewRef.clear();
 
     //remove rows that have been deleted meanwhile
-    sortedRef.erase(std::remove_if(sortedRef.begin(), sortedRef.end(),
-                                   boost::bind(&GridView::isInvalidRow, this, _1)), sortedRef.end());
+    vector_remove_if(sortedRef, [&](const RefIndex& refIdx) { return this->isInvalidRow(refIdx); });
 }
 
 
@@ -278,29 +278,24 @@ public:
         index_(index),
         sortedRef_(sortedRef) {}
 
-    void execute(const HierarchyObject& hierObj)
+    void execute(HierarchyObject& hierObj)
     {
-        //add file references
         std::for_each(hierObj.refSubFiles().begin(), hierObj.refSubFiles().end(), *this);
-
-        //add symlink references
         std::for_each(hierObj.refSubLinks().begin(), hierObj.refSubLinks().end(), *this);
-
-        //add dir references
-        std::for_each(hierObj.refSubDirs().begin(), hierObj.refSubDirs().end(), *this);
+        std::for_each(hierObj.refSubDirs ().begin(), hierObj.refSubDirs ().end(), *this);
     }
 
-    void operator()(const FileMapping& fileObj)
+    void operator()(FileMapping& fileObj)
     {
         sortedRef_.push_back(RefIndex(index_, fileObj.getId()));
     }
 
-    void operator()(const SymLinkMapping& linkObj)
+    void operator()(SymLinkMapping& linkObj)
     {
         sortedRef_.push_back(RefIndex(index_, linkObj.getId()));
     }
 
-    void operator()(const DirMapping& dirObj)
+    void operator()(DirMapping& dirObj)
     {
         sortedRef_.push_back(RefIndex(index_, dirObj.getId()));
         execute(dirObj); //add recursion here to list sub-objects directly below parent!
@@ -319,7 +314,7 @@ void GridView::setData(FolderComparison& newData)
     folderCmp.swap(newData);
 
     //fill sortedRef
-    for (FolderComparison::const_iterator j = folderCmp.begin(); j != folderCmp.end(); ++j)
+    for (auto j = begin(folderCmp); j != end(folderCmp); ++j)
         SerializeHierarchy(sortedRef, j - folderCmp.begin()).execute(*j);
 }
 
@@ -338,7 +333,7 @@ public:
 };
 
 
-template <bool ascending, zen::SelectedSide side>
+template <bool ascending>
 class GridView::LessRelativeName : public std::binary_function<RefIndex, RefIndex, bool>
 {
 public:
@@ -359,7 +354,7 @@ public:
         else if (fsObjB == NULL)
             return true;
 
-        return lessRelativeName<ascending, side>(*fsObjA, *fsObjB);
+        return lessRelativeName<ascending>(*fsObjA, *fsObjB);
     }
 private:
     const GridView& m_view;
@@ -526,10 +521,8 @@ void GridView::sortView(SortType type, bool onLeft, bool ascending)
     switch (type)
     {
         case SORT_BY_REL_NAME:
-            if      ( ascending &&  onLeft) std::sort(sortedRef.begin(), sortedRef.end(), LessRelativeName<true,  LEFT_SIDE>(*this));
-            else if ( ascending && !onLeft) std::sort(sortedRef.begin(), sortedRef.end(), LessRelativeName<true,  RIGHT_SIDE>(*this));
-            else if (!ascending &&  onLeft) std::sort(sortedRef.begin(), sortedRef.end(), LessRelativeName<false, LEFT_SIDE >(*this));
-            else if (!ascending && !onLeft) std::sort(sortedRef.begin(), sortedRef.end(), LessRelativeName<false, RIGHT_SIDE>(*this));
+            if      ( ascending) std::sort(sortedRef.begin(), sortedRef.end(), LessRelativeName<true>(*this));
+            else if (!ascending) std::sort(sortedRef.begin(), sortedRef.end(), LessRelativeName<false>(*this));
             break;
         case SORT_BY_FILENAME:
             if      ( ascending &&  onLeft) std::sort(sortedRef.begin(), sortedRef.end(), LessShortFileName<true,  LEFT_SIDE >(*this));
diff --git a/ui/grid_view.h b/ui/grid_view.h
index 87d5c38d..5bf2f8b2 100644
--- a/ui/grid_view.h
+++ b/ui/grid_view.h
@@ -120,15 +120,15 @@ private:
 
     struct RefIndex
     {
-        RefIndex(size_t folderInd, HierarchyObject::ObjectID id) :
+        RefIndex(size_t folderInd, FileSystemObject::ObjectID id) :
             folderIndex(folderInd),
             objId(id) {}
         size_t folderIndex;
-        HierarchyObject::ObjectID objId;
+        FileSystemObject::ObjectID objId;
     };
 
-    FileSystemObject* getReferencedRow(const RefIndex ref); //returns NULL if not found
-    const FileSystemObject* getReferencedRow(const RefIndex ref) const; //returns NULL if not found
+    FileSystemObject* getReferencedRow(const RefIndex& ref); //returns NULL if not found
+    const FileSystemObject* getReferencedRow(const RefIndex& ref) const; //returns NULL if not found
     bool isInvalidRow(const RefIndex& ref) const;
 
 
@@ -147,7 +147,7 @@ private:
     template <bool ascending>
     class LessDirectoryPair;
 
-    template <bool ascending, SelectedSide side>
+    template <bool ascending>
     class LessRelativeName;
 
     template <bool ascending, SelectedSide side>
@@ -219,17 +219,16 @@ size_t GridView::rowsTotal() const //total number of rows available
 
 
 inline
-const zen::FileSystemObject* GridView::getReferencedRow(const RefIndex ref) const
+const zen::FileSystemObject* GridView::getReferencedRow(const RefIndex& ref) const
 {
-    return folderCmp[ref.folderIndex].retrieveById(ref.objId);
+    return FileSystemObject::retrieve(ref.objId);
 }
 
 
 inline
-zen::FileSystemObject* GridView::getReferencedRow(const RefIndex ref)
+zen::FileSystemObject* GridView::getReferencedRow(const RefIndex& ref)
 {
-    //code re-use of const method: see Meyers Effective C++
-    return const_cast<FileSystemObject*>(static_cast<const GridView&>(*this).getReferencedRow(ref));
+    return FileSystemObject::retrieve(ref.objId);
 }
 }
 
diff --git a/ui/gui_generated.cpp b/ui/gui_generated.cpp
index 3270145a..b0fb1b6d 100644
--- a/ui/gui_generated.cpp
+++ b/ui/gui_generated.cpp
@@ -7,8 +7,8 @@
 
 #include "../library/custom_grid.h"
 #include "../shared/custom_button.h"
-#include "../shared/custom_combo_box.h"
 #include "../shared/dir_picker_i18n.h"
+#include "../shared/folder_history_box.h"
 #include "../shared/toggle_button.h"
 
 #include "gui_generated.h"
@@ -17,1525 +17,1539 @@
 
 MainDialogGenerated::MainDialogGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxFrame( parent, id, title, pos, size, style )
 {
-	this->SetSizeHints( wxSize( 640,400 ), wxDefaultSize );
-	
-	m_menubar1 = new wxMenuBar( 0 );
-	m_menuFile = new wxMenu();
-	m_menuItem10 = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("1. &Compare") ) + wxT('\t') + wxT("F5"), wxEmptyString, wxITEM_NORMAL );
-	m_menuFile->Append( m_menuItem10 );
-	
-	m_menuItem11 = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("2. &Synchronize...") ) + wxT('\t') + wxT("F6"), wxEmptyString, wxITEM_NORMAL );
-	m_menuFile->Append( m_menuItem11 );
-	
-	wxMenuItem* m_separator1;
-	m_separator1 = m_menuFile->AppendSeparator();
-	
-	m_menuItemSwitchView = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("S&witch view") ) + wxT('\t') + wxT("F8"), wxEmptyString, wxITEM_NORMAL );
-	m_menuFile->Append( m_menuItemSwitchView );
-	
-	wxMenuItem* m_separator2;
-	m_separator2 = m_menuFile->AppendSeparator();
-	
-	m_menuItemNew = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("&New") ) + wxT('\t') + wxT("Ctrl-N"), wxEmptyString, wxITEM_NORMAL );
-	m_menuFile->Append( m_menuItemNew );
-	
-	m_menuItemSave = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("S&ave configuration...") ) + wxT('\t') + wxT("Ctrl-S"), wxEmptyString, wxITEM_NORMAL );
-	m_menuFile->Append( m_menuItemSave );
-	
-	m_menuItemLoad = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("&Load configuration...") ) + wxT('\t') + wxT("Ctrl-O"), wxEmptyString, wxITEM_NORMAL );
-	m_menuFile->Append( m_menuItemLoad );
-	
-	wxMenuItem* m_separator3;
-	m_separator3 = m_menuFile->AppendSeparator();
-	
-	wxMenuItem* m_menuItem4;
-	m_menuItem4 = new wxMenuItem( m_menuFile, wxID_EXIT, wxString( _("&Quit") ) + wxT('\t') + wxT("Ctrl-Q"), wxEmptyString, wxITEM_NORMAL );
-	m_menuFile->Append( m_menuItem4 );
-	
-	m_menubar1->Append( m_menuFile, _("&Program") ); 
-	
-	m_menuAdvanced = new wxMenu();
-	m_menuLanguages = new wxMenu();
-	m_menuAdvanced->Append( -1, _("&Language"), m_menuLanguages );
-	
-	wxMenuItem* m_separator4;
-	m_separator4 = m_menuAdvanced->AppendSeparator();
-	
-	m_menuItemGlobSett = new wxMenuItem( m_menuAdvanced, wxID_ANY, wxString( _("&Global settings...") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menuAdvanced->Append( m_menuItemGlobSett );
-	
-	m_menuItem7 = new wxMenuItem( m_menuAdvanced, wxID_ANY, wxString( _("&Create batch job...") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menuAdvanced->Append( m_menuItem7 );
-	
-	wxMenuItem* m_menuItem5;
-	m_menuItem5 = new wxMenuItem( m_menuAdvanced, wxID_ANY, wxString( _("&Export file list...") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menuAdvanced->Append( m_menuItem5 );
-	
-	m_menubar1->Append( m_menuAdvanced, _("&Advanced") ); 
-	
-	m_menuHelp = new wxMenu();
-	wxMenuItem* m_menuItemReadme;
-	m_menuItemReadme = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("&Content") ) + wxT('\t') + wxT("F1"), wxEmptyString, wxITEM_NORMAL );
-	m_menuHelp->Append( m_menuItemReadme );
-	
-	m_menuItemCheckVer = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("&Check for new version") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menuHelp->Append( m_menuItemCheckVer );
-	
-	wxMenuItem* m_separator5;
-	m_separator5 = m_menuHelp->AppendSeparator();
-	
-	m_menuItemAbout = new wxMenuItem( m_menuHelp, wxID_ABOUT, wxString( _("&About...") ) + wxT('\t') + wxT("Shift-F1"), wxEmptyString, wxITEM_NORMAL );
-	m_menuHelp->Append( m_menuItemAbout );
-	
-	m_menubar1->Append( m_menuHelp, _("&Help") ); 
-	
-	this->SetMenuBar( m_menubar1 );
-	
-	bSizerPanelHolder = new wxBoxSizer( wxVERTICAL );
-	
-	m_panelTopButtons = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxRAISED_BORDER|wxTAB_TRAVERSAL );
-	bSizerTopButtons = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer155;
-	bSizer155 = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizer155->Add( 15, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	wxFlexGridSizer* fgSizer121;
-	fgSizer121 = new wxFlexGridSizer( 2, 2, 0, 0 );
-	fgSizer121->SetFlexibleDirection( wxBOTH );
-	fgSizer121->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	m_staticTextCmpVariant = new wxStaticText( m_panelTopButtons, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextCmpVariant->Wrap( -1 );
-	m_staticTextCmpVariant->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
-	m_staticTextCmpVariant->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
-	
-	fgSizer121->Add( m_staticTextCmpVariant, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxTOP, 1 );
-	
-	
-	fgSizer121->Add( 0, 0, 1, 0, 5 );
-	
-	wxBoxSizer* bSizer30;
-	bSizer30 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_buttonCompare = new wxButtonWithImage( m_panelTopButtons, wxID_OK, _("Compare"), wxDefaultPosition, wxSize( 180,42 ), 0 );
-	m_buttonCompare->SetDefault(); 
-	m_buttonCompare->SetFont( wxFont( 14, 74, 90, 92, false, wxEmptyString ) );
-	m_buttonCompare->SetToolTip( _("Compare both sides") );
-	
-	bSizer30->Add( m_buttonCompare, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_buttonAbort = new wxButton( m_panelTopButtons, wxID_CANCEL, _("&Abort"), wxDefaultPosition, wxSize( 180,42 ), 0 );
-	m_buttonAbort->SetFont( wxFont( 14, 74, 90, 92, false, wxEmptyString ) );
-	m_buttonAbort->Enable( false );
-	m_buttonAbort->Hide();
-	
-	bSizer30->Add( m_buttonAbort, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	fgSizer121->Add( bSizer30, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonCmpConfig = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,42 ), wxBU_AUTODRAW );
-	m_bpButtonCmpConfig->SetToolTip( _("Comparison settings") );
-	
-	fgSizer121->Add( m_bpButtonCmpConfig, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 3 );
-	
-	bSizer155->Add( fgSizer121, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 );
-	
-	bSizerTopButtons->Add( bSizer155, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerTopButtons->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	wxBoxSizer* bSizer1551;
-	bSizer1551 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxFlexGridSizer* fgSizer12;
-	fgSizer12 = new wxFlexGridSizer( 2, 2, 0, 0 );
-	fgSizer12->SetFlexibleDirection( wxBOTH );
-	fgSizer12->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	
-	fgSizer12->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticTextSyncVariant = new wxStaticText( m_panelTopButtons, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextSyncVariant->Wrap( -1 );
-	m_staticTextSyncVariant->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
-	m_staticTextSyncVariant->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
-	
-	fgSizer12->Add( m_staticTextSyncVariant, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP, 1 );
-	
-	m_bpButtonSyncConfig = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,42 ), wxBU_AUTODRAW );
-	m_bpButtonSyncConfig->SetToolTip( _("Synchronization settings") );
-	
-	fgSizer12->Add( m_bpButtonSyncConfig, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 3 );
-	
-	m_buttonStartSync = new wxButtonWithImage( m_panelTopButtons, wxID_ANY, _("Synchronize..."), wxDefaultPosition, wxSize( 180,42 ), 0 );
-	m_buttonStartSync->SetFont( wxFont( 14, 74, 90, 92, false, wxEmptyString ) );
-	m_buttonStartSync->SetToolTip( _("Start synchronization") );
-	
-	fgSizer12->Add( m_buttonStartSync, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer1551->Add( fgSizer12, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 );
-	
-	
-	bSizer1551->Add( 15, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizerTopButtons->Add( bSizer1551, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_panelTopButtons->SetSizer( bSizerTopButtons );
-	m_panelTopButtons->Layout();
-	bSizerTopButtons->Fit( m_panelTopButtons );
-	bSizerPanelHolder->Add( m_panelTopButtons, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	m_panelDirectoryPairs = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 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 ) );
-	
-	sbSizerDirLeft = new wxStaticBoxSizer( new wxStaticBox( m_panelTopLeft, wxID_ANY, _("Drag && drop") ), wxHORIZONTAL );
-	
-	m_directoryLeft = new CustomComboBox( m_panelTopLeft, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
-	sbSizerDirLeft->Add( m_directoryLeft, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_dirPickerLeft = new FfsDirPickerCtrl( m_panelTopLeft, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_dirPickerLeft->SetToolTip( _("Select a folder") );
-	
-	sbSizerDirLeft->Add( m_dirPickerLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_panelTopLeft->SetSizer( sbSizerDirLeft );
-	m_panelTopLeft->Layout();
-	sbSizerDirLeft->Fit( m_panelTopLeft );
-	bSizer91->Add( m_panelTopLeft, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_panelTopMiddle = new wxPanel( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer93;
-	bSizer93 = new wxBoxSizer( wxVERTICAL );
-	
-	
-	bSizer93->Add( 0, 3, 0, 0, 5 );
-	
-	m_bpButtonSwapSides = new wxBitmapButton( m_panelTopMiddle, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
-	m_bpButtonSwapSides->SetToolTip( _("Swap sides") );
-	
-	bSizer93->Add( m_bpButtonSwapSides, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer160;
-	bSizer160 = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizer160->Add( 0, 0, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonLocalFilter = new wxBitmapButton( m_panelTopMiddle, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
-	bSizer160->Add( m_bpButtonLocalFilter, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer160->Add( 5, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonAltSyncCfg = new wxBitmapButton( m_panelTopMiddle, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
-	bSizer160->Add( m_bpButtonAltSyncCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer160->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	bSizer93->Add( bSizer160, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_panelTopMiddle->SetSizer( bSizer93 );
-	m_panelTopMiddle->Layout();
-	bSizer93->Fit( m_panelTopMiddle );
-	bSizer91->Add( m_panelTopMiddle, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	m_panelTopRight = new wxPanel( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panelTopRight->SetMinSize( wxSize( 1,1 ) );
-	
-	sbSizerDirRight = new wxStaticBoxSizer( new wxStaticBox( m_panelTopRight, wxID_ANY, _("Drag && drop") ), wxHORIZONTAL );
-	
-	m_bpButtonAddPair = new wxBitmapButton( m_panelTopRight, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
-	m_bpButtonAddPair->SetToolTip( _("Add folder pair") );
-	
-	sbSizerDirRight->Add( m_bpButtonAddPair, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 3 );
-	
-	m_bpButtonRemovePair = new wxBitmapButton( m_panelTopRight, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
-	m_bpButtonRemovePair->SetToolTip( _("Remove folder pair") );
-	
-	sbSizerDirRight->Add( m_bpButtonRemovePair, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_directoryRight = new CustomComboBox( m_panelTopRight, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
-	sbSizerDirRight->Add( m_directoryRight, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_dirPickerRight = new FfsDirPickerCtrl( m_panelTopRight, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_dirPickerRight->SetToolTip( _("Select a folder") );
-	
-	sbSizerDirRight->Add( m_dirPickerRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_panelTopRight->SetSizer( sbSizerDirRight );
-	m_panelTopRight->Layout();
-	sbSizerDirRight->Fit( m_panelTopRight );
-	bSizer91->Add( m_panelTopRight, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	bSizer1601->Add( bSizer91, 0, wxEXPAND, 5 );
-	
-	m_scrolledWindowFolderPairs = new wxScrolledWindow( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxHSCROLL|wxVSCROLL );
-	m_scrolledWindowFolderPairs->SetScrollRate( 5, 5 );
-	m_scrolledWindowFolderPairs->SetMinSize( wxSize( -1,0 ) );
-	
-	bSizerAddFolderPairs = new wxBoxSizer( wxVERTICAL );
-	
-	m_scrolledWindowFolderPairs->SetSizer( bSizerAddFolderPairs );
-	m_scrolledWindowFolderPairs->Layout();
-	bSizerAddFolderPairs->Fit( m_scrolledWindowFolderPairs );
-	bSizer1601->Add( m_scrolledWindowFolderPairs, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	m_panelDirectoryPairs->SetSizer( bSizer1601 );
-	m_panelDirectoryPairs->Layout();
-	bSizer1601->Fit( m_panelDirectoryPairs );
-	bSizerPanelHolder->Add( m_panelDirectoryPairs, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	m_panelGrids = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panelGrids->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_APPWORKSPACE ) );
-	
-	bSizerGridHolder = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_panelLeft = new wxPanel( m_panelGrids, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer7;
-	bSizer7 = new wxBoxSizer( wxVERTICAL );
-	
-	m_gridLeft = new CustomGridLeft( m_panelLeft, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	
-	// Grid
-	m_gridLeft->CreateGrid( 15, 4 );
-	m_gridLeft->EnableEditing( false );
-	m_gridLeft->EnableGridLines( true );
-	m_gridLeft->EnableDragGridSize( true );
-	m_gridLeft->SetMargins( 0, 0 );
-	
-	// Columns
-	m_gridLeft->EnableDragColMove( false );
-	m_gridLeft->EnableDragColSize( true );
-	m_gridLeft->SetColLabelSize( 20 );
-	m_gridLeft->SetColLabelAlignment( wxALIGN_LEFT, wxALIGN_CENTRE );
-	
-	// Rows
-	m_gridLeft->EnableDragRowSize( false );
-	m_gridLeft->SetRowLabelSize( 38 );
-	m_gridLeft->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
-	// Label Appearance
-	
-	// Cell Defaults
-	m_gridLeft->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTRE );
-	m_gridLeft->SetMinSize( wxSize( 1,1 ) );
-	
-	bSizer7->Add( m_gridLeft, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	m_panelLeft->SetSizer( bSizer7 );
-	m_panelLeft->Layout();
-	bSizer7->Fit( m_panelLeft );
-	bSizerGridHolder->Add( m_panelLeft, 1, wxEXPAND, 5 );
-	
-	m_panelMiddle = new wxPanel( m_panelGrids, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer18;
-	bSizer18 = new wxBoxSizer( wxVERTICAL );
-	
-	m_gridMiddle = new CustomGridMiddle( m_panelMiddle, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	
-	// Grid
-	m_gridMiddle->CreateGrid( 15, 1 );
-	m_gridMiddle->EnableEditing( false );
-	m_gridMiddle->EnableGridLines( true );
-	m_gridMiddle->EnableDragGridSize( false );
-	m_gridMiddle->SetMargins( 0, 0 );
-	
-	// Columns
-	m_gridMiddle->SetColSize( 0, 60 );
-	m_gridMiddle->EnableDragColMove( false );
-	m_gridMiddle->EnableDragColSize( false );
-	m_gridMiddle->SetColLabelSize( 20 );
-	m_gridMiddle->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
-	// Rows
-	m_gridMiddle->EnableDragRowSize( false );
-	m_gridMiddle->SetRowLabelSize( 0 );
-	m_gridMiddle->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
-	// Label Appearance
-	
-	// Cell Defaults
-	m_gridMiddle->SetDefaultCellFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxT("Arial") ) );
-	m_gridMiddle->SetDefaultCellAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	bSizer18->Add( m_gridMiddle, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
-	
-	m_panelMiddle->SetSizer( bSizer18 );
-	m_panelMiddle->Layout();
-	bSizer18->Fit( m_panelMiddle );
-	bSizerGridHolder->Add( m_panelMiddle, 0, wxEXPAND, 5 );
-	
-	m_panelRight = new wxPanel( m_panelGrids, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer10;
-	bSizer10 = new wxBoxSizer( wxVERTICAL );
-	
-	m_gridRight = new CustomGridRight( m_panelRight, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	
-	// Grid
-	m_gridRight->CreateGrid( 15, 4 );
-	m_gridRight->EnableEditing( false );
-	m_gridRight->EnableGridLines( true );
-	m_gridRight->EnableDragGridSize( true );
-	m_gridRight->SetMargins( 0, 0 );
-	
-	// Columns
-	m_gridRight->EnableDragColMove( false );
-	m_gridRight->EnableDragColSize( true );
-	m_gridRight->SetColLabelSize( 20 );
-	m_gridRight->SetColLabelAlignment( wxALIGN_LEFT, wxALIGN_CENTRE );
-	
-	// Rows
-	m_gridRight->EnableDragRowSize( false );
-	m_gridRight->SetRowLabelSize( 38 );
-	m_gridRight->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
-	// Label Appearance
-	
-	// Cell Defaults
-	m_gridRight->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTRE );
-	m_gridRight->SetMinSize( wxSize( 1,1 ) );
-	
-	bSizer10->Add( m_gridRight, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	m_panelRight->SetSizer( bSizer10 );
-	m_panelRight->Layout();
-	bSizer10->Fit( m_panelRight );
-	bSizerGridHolder->Add( m_panelRight, 1, wxEXPAND, 5 );
-	
-	m_panelGrids->SetSizer( bSizerGridHolder );
-	m_panelGrids->Layout();
-	bSizerGridHolder->Fit( m_panelGrids );
-	bSizerPanelHolder->Add( m_panelGrids, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	m_panelConfig = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	bSizerConfig = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizerConfig->Add( 10, 0, 0, 0, 5 );
-	
-	wxBoxSizer* bSizer151;
-	bSizer151 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bpButtonSave = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	m_bpButtonSave->SetToolTip( _("Save current configuration to file") );
-	
-	bSizer151->Add( m_bpButtonSave, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonLoad = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	m_bpButtonLoad->SetToolTip( _("Load configuration from file") );
-	
-	bSizer151->Add( m_bpButtonLoad, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizerConfig->Add( bSizer151, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_listBoxHistory = new wxListBox( m_panelConfig, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_EXTENDED|wxLB_NEEDED_SB|wxLB_SORT ); 
-	m_listBoxHistory->SetToolTip( _("Last used configurations (press DEL to remove from list)") );
-	m_listBoxHistory->SetMinSize( wxSize( -1,40 ) );
-	
-	bSizerConfig->Add( m_listBoxHistory, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_panelConfig->SetSizer( bSizerConfig );
-	m_panelConfig->Layout();
-	bSizerConfig->Fit( m_panelConfig );
-	bSizerPanelHolder->Add( m_panelConfig, 0, 0, 5 );
-	
-	m_panelFilter = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer140;
-	bSizer140 = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizer140->Add( 10, 0, 0, 0, 5 );
-	
-	m_bpButtonFilter = new wxBitmapButton( m_panelFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW|wxFULL_REPAINT_ON_RESIZE );
-	bSizer140->Add( m_bpButtonFilter, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	wxBoxSizer* bSizer23;
-	bSizer23 = new wxBoxSizer( wxVERTICAL );
-	
-	m_checkBoxHideFilt = new wxCheckBox( m_panelFilter, wxID_ANY, _("Hide excluded items"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_checkBoxHideFilt->SetToolTip( _("Hide filtered or temporarily excluded files") );
-	
-	bSizer23->Add( m_checkBoxHideFilt, 0, wxEXPAND, 5 );
-	
-	bSizer140->Add( bSizer23, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_panelFilter->SetSizer( bSizer140 );
-	m_panelFilter->Layout();
-	bSizer140->Fit( m_panelFilter );
-	bSizerPanelHolder->Add( m_panelFilter, 0, 0, 5 );
-	
-	m_panelStatistics = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	bSizerStatistics = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizerStatistics->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	wxFlexGridSizer* fgSizer5;
-	fgSizer5 = new wxFlexGridSizer( 2, 2, 0, 5 );
-	fgSizer5->SetFlexibleDirection( wxHORIZONTAL );
-	fgSizer5->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	m_bitmapCreate = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_bitmapCreate->SetToolTip( _("Number of files and directories that will be created") );
-	
-	fgSizer5->Add( m_bitmapCreate, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_textCtrlCreate = new wxTextCtrl( m_panelStatistics, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY|wxTE_RIGHT );
-	m_textCtrlCreate->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
-	m_textCtrlCreate->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-	m_textCtrlCreate->SetToolTip( _("Number of files and directories that will be created") );
-	
-	fgSizer5->Add( m_textCtrlCreate, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bitmapUpdate = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_bitmapUpdate->SetToolTip( _("Number of files that will be overwritten") );
-	
-	fgSizer5->Add( m_bitmapUpdate, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_textCtrlUpdate = new wxTextCtrl( m_panelStatistics, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY|wxTE_RIGHT );
-	m_textCtrlUpdate->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
-	m_textCtrlUpdate->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-	m_textCtrlUpdate->SetToolTip( _("Number of files that will be overwritten") );
-	
-	fgSizer5->Add( m_textCtrlUpdate, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizerStatistics->Add( fgSizer5, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
-	
-	wxFlexGridSizer* fgSizer6;
-	fgSizer6 = new wxFlexGridSizer( 2, 2, 0, 5 );
-	fgSizer6->SetFlexibleDirection( wxHORIZONTAL );
-	fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	m_bitmapDelete = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_bitmapDelete->SetToolTip( _("Number of files and directories that will be deleted") );
-	
-	fgSizer6->Add( m_bitmapDelete, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_textCtrlDelete = new wxTextCtrl( m_panelStatistics, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY|wxTE_RIGHT );
-	m_textCtrlDelete->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
-	m_textCtrlDelete->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-	m_textCtrlDelete->SetToolTip( _("Number of files and directories that will be deleted") );
-	
-	fgSizer6->Add( m_textCtrlDelete, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bitmapData = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_bitmapData->SetToolTip( _("Total amount of data that will be transferred") );
-	
-	fgSizer6->Add( m_bitmapData, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_textCtrlData = new wxTextCtrl( m_panelStatistics, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY|wxTE_RIGHT );
-	m_textCtrlData->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
-	m_textCtrlData->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-	m_textCtrlData->SetToolTip( _("Total amount of data that will be transferred") );
-	
-	fgSizer6->Add( m_textCtrlData, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizerStatistics->Add( fgSizer6, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
-	
-	
-	bSizerStatistics->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_panelStatistics->SetSizer( bSizerStatistics );
-	m_panelStatistics->Layout();
-	bSizerStatistics->Fit( m_panelStatistics );
-	bSizerPanelHolder->Add( m_panelStatistics, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_panelViewFilter = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	bSizerViewFilter = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizerViewFilter->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_bpButtonSyncCreateLeft = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonSyncCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonSyncDirOverwLeft = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonSyncDirOverwLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonSyncDeleteLeft = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonSyncDeleteLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonLeftOnly = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonLeftOnly, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonLeftNewer = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonLeftNewer, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonEqual = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonEqual, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonDifferent = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonDifferent, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonSyncDirNone = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonSyncDirNone, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonRightNewer = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonRightNewer, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonRightOnly = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonRightOnly, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonSyncDeleteRight = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonSyncDeleteRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonSyncDirOverwRight = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonSyncDirOverwRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonSyncCreateRight = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonSyncCreateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonConflict = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonConflict, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	bSizerViewFilter->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_panelViewFilter->SetSizer( bSizerViewFilter );
-	m_panelViewFilter->Layout();
-	bSizerViewFilter->Fit( m_panelViewFilter );
-	bSizerPanelHolder->Add( m_panelViewFilter, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_panelStatusBar = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSTATIC_BORDER|wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer451;
-	bSizer451 = new wxBoxSizer( wxHORIZONTAL );
-	
-	bSizer451->SetMinSize( wxSize( -1,22 ) ); 
-	wxBoxSizer* bSizer53;
-	bSizer53 = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizer53->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticTextStatusLeft = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextStatusLeft->Wrap( -1 );
-	m_staticTextStatusLeft->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer53->Add( m_staticTextStatusLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	bSizer53->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer451->Add( bSizer53, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	m_staticline9 = new wxStaticLine( m_panelStatusBar, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-	bSizer451->Add( m_staticline9, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxEXPAND, 2 );
-	
-	
-	bSizer451->Add( 26, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticTextStatusMiddle = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextStatusMiddle->Wrap( -1 );
-	m_staticTextStatusMiddle->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer451->Add( m_staticTextStatusMiddle, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	bSizer451->Add( 26, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticline10 = new wxStaticLine( m_panelStatusBar, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-	bSizer451->Add( m_staticline10, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP, 2 );
-	
-	wxBoxSizer* bSizer52;
-	bSizer52 = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizer52->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticTextStatusRight = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextStatusRight->Wrap( -1 );
-	m_staticTextStatusRight->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer52->Add( m_staticTextStatusRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	wxBoxSizer* bSizer50;
-	bSizer50 = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizer50->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bitmap15 = new wxStaticBitmap( m_panelStatusBar, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 10,10 ), 0 );
-	bSizer50->Add( m_bitmap15, 0, wxALIGN_BOTTOM, 2 );
-	
-	bSizer52->Add( bSizer50, 1, wxALIGN_BOTTOM|wxEXPAND, 5 );
-	
-	bSizer451->Add( bSizer52, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_panelStatusBar->SetSizer( bSizer451 );
-	m_panelStatusBar->Layout();
-	bSizer451->Fit( m_panelStatusBar );
-	bSizerPanelHolder->Add( m_panelStatusBar, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	this->SetSizer( bSizerPanelHolder );
-	this->Layout();
-	bSizerPanelHolder->Fit( this );
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainDialogGenerated::OnClose ) );
-	this->Connect( m_menuItem10->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnCompare ) );
-	this->Connect( m_menuItem11->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnStartSync ) );
-	this->Connect( m_menuItemSwitchView->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnSwitchView ) );
-	this->Connect( m_menuItemNew->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnNewConfig ) );
-	this->Connect( m_menuItemSave->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnSaveConfig ) );
-	this->Connect( m_menuItemLoad->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnLoadConfig ) );
-	this->Connect( m_menuItem4->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuQuit ) );
-	this->Connect( m_menuItemGlobSett->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuGlobalSettings ) );
-	this->Connect( m_menuItem7->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuBatchJob ) );
-	this->Connect( m_menuItem5->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuExportFileList ) );
-	this->Connect( m_menuItemReadme->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnShowHelp ) );
-	this->Connect( m_menuItemCheckVer->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuCheckVersion ) );
-	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_bpButtonSyncConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncSettings ), NULL, this );
-	m_buttonStartSync->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnStartSync ), NULL, this );
-	m_dirPickerLeft->Connect( wxEVT_COMMAND_DIRPICKER_CHANGED, wxFileDirPickerEventHandler( MainDialogGenerated::OnDirSelected ), NULL, this );
-	m_bpButtonSwapSides->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSwapSides ), NULL, this );
-	m_bpButtonAddPair->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnAddFolderPair ), NULL, this );
-	m_bpButtonRemovePair->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnRemoveTopFolderPair ), NULL, this );
-	m_dirPickerRight->Connect( wxEVT_COMMAND_DIRPICKER_CHANGED, wxFileDirPickerEventHandler( MainDialogGenerated::OnDirSelected ), NULL, this );
-	m_gridLeft->Connect( wxEVT_GRID_CELL_LEFT_DCLICK, wxGridEventHandler( MainDialogGenerated::OnLeftGridDoubleClick ), NULL, this );
-	m_gridLeft->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRim ), NULL, this );
-	m_gridLeft->Connect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( MainDialogGenerated::OnSortLeftGrid ), NULL, this );
-	m_gridLeft->Connect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRimLabelLeft ), NULL, this );
-	m_gridMiddle->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextMiddle ), NULL, this );
-	m_gridMiddle->Connect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( MainDialogGenerated::OnSortMiddleGrid ), NULL, this );
-	m_gridMiddle->Connect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextMiddleLabel ), NULL, this );
-	m_gridRight->Connect( wxEVT_GRID_CELL_LEFT_DCLICK, wxGridEventHandler( MainDialogGenerated::OnRightGridDoubleClick ), NULL, this );
-	m_gridRight->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRim ), NULL, this );
-	m_gridRight->Connect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( MainDialogGenerated::OnSortRightGrid ), NULL, this );
-	m_gridRight->Connect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRimLabelRight ), NULL, this );
-	m_bpButtonSave->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSaveConfig ), NULL, this );
-	m_bpButtonLoad->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnLoadConfig ), NULL, this );
-	m_listBoxHistory->Connect( wxEVT_CHAR, wxKeyEventHandler( MainDialogGenerated::OnCfgHistoryKeyEvent ), NULL, this );
-	m_listBoxHistory->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnLoadFromHistory ), NULL, this );
-	m_bpButtonFilter->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigureFilter ), NULL, this );
-	m_checkBoxHideFilt->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnHideFilteredButton ), NULL, this );
-	m_bpButtonSyncCreateLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncCreateLeft ), NULL, this );
-	m_bpButtonSyncDirOverwLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDirLeft ), NULL, this );
-	m_bpButtonSyncDeleteLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDeleteLeft ), NULL, this );
-	m_bpButtonLeftOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnLeftOnlyFiles ), NULL, this );
-	m_bpButtonLeftNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnLeftNewerFiles ), NULL, this );
-	m_bpButtonEqual->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnEqualFiles ), NULL, this );
-	m_bpButtonDifferent->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnDifferentFiles ), NULL, this );
-	m_bpButtonSyncDirNone->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDirNone ), NULL, this );
-	m_bpButtonRightNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnRightNewerFiles ), NULL, this );
-	m_bpButtonRightOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnRightOnlyFiles ), NULL, this );
-	m_bpButtonSyncDeleteRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDeleteRight ), NULL, this );
-	m_bpButtonSyncDirOverwRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDirRight ), NULL, this );
-	m_bpButtonSyncCreateRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncCreateRight ), NULL, this );
-	m_bpButtonConflict->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConflictFiles ), NULL, this );
+    this->SetSizeHints( wxSize( 640,400 ), wxDefaultSize );
+
+    m_menubar1 = new wxMenuBar( 0 );
+    m_menuFile = new wxMenu();
+    m_menuItem10 = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("1. &Compare") ) + wxT('\t') + wxT("F5"), wxEmptyString, wxITEM_NORMAL );
+    m_menuFile->Append( m_menuItem10 );
+
+    m_menuItem11 = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("2. &Synchronize...") ) + wxT('\t') + wxT("F6"), wxEmptyString, wxITEM_NORMAL );
+    m_menuFile->Append( m_menuItem11 );
+
+    wxMenuItem* m_separator1;
+    m_separator1 = m_menuFile->AppendSeparator();
+
+    m_menuItemSwitchView = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("S&witch view") ) + wxT('\t') + wxT("F8"), wxEmptyString, wxITEM_NORMAL );
+    m_menuFile->Append( m_menuItemSwitchView );
+
+    wxMenuItem* m_separator2;
+    m_separator2 = m_menuFile->AppendSeparator();
+
+    m_menuItemNew = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("&New") ) + wxT('\t') + wxT("Ctrl-N"), wxEmptyString, wxITEM_NORMAL );
+    m_menuFile->Append( m_menuItemNew );
+
+    m_menuItemSave = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("S&ave configuration...") ) + wxT('\t') + wxT("Ctrl-S"), wxEmptyString, wxITEM_NORMAL );
+    m_menuFile->Append( m_menuItemSave );
+
+    m_menuItemLoad = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("&Load configuration...") ) + wxT('\t') + wxT("Ctrl-O"), wxEmptyString, wxITEM_NORMAL );
+    m_menuFile->Append( m_menuItemLoad );
+
+    wxMenuItem* m_separator3;
+    m_separator3 = m_menuFile->AppendSeparator();
+
+    wxMenuItem* m_menuItem4;
+    m_menuItem4 = new wxMenuItem( m_menuFile, wxID_EXIT, wxString( _("&Quit") ) + wxT('\t') + wxT("Ctrl-Q"), wxEmptyString, wxITEM_NORMAL );
+    m_menuFile->Append( m_menuItem4 );
+
+    m_menubar1->Append( m_menuFile, _("&Program") );
+
+    m_menuAdvanced = new wxMenu();
+    m_menuLanguages = new wxMenu();
+    m_menuAdvanced->Append( -1, _("&Language"), m_menuLanguages );
+
+    wxMenuItem* m_separator4;
+    m_separator4 = m_menuAdvanced->AppendSeparator();
+
+    m_menuItemGlobSett = new wxMenuItem( m_menuAdvanced, wxID_ANY, wxString( _("&Global settings...") ) , wxEmptyString, wxITEM_NORMAL );
+    m_menuAdvanced->Append( m_menuItemGlobSett );
+
+    m_menuItem7 = new wxMenuItem( m_menuAdvanced, wxID_ANY, wxString( _("&Create batch job...") ) , wxEmptyString, wxITEM_NORMAL );
+    m_menuAdvanced->Append( m_menuItem7 );
+
+    wxMenuItem* m_menuItem5;
+    m_menuItem5 = new wxMenuItem( m_menuAdvanced, wxID_ANY, wxString( _("&Export file list...") ) , wxEmptyString, wxITEM_NORMAL );
+    m_menuAdvanced->Append( m_menuItem5 );
+
+    m_menubar1->Append( m_menuAdvanced, _("&Advanced") );
+
+    m_menuHelp = new wxMenu();
+    wxMenuItem* m_menuItemReadme;
+    m_menuItemReadme = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("&Content") ) + wxT('\t') + wxT("F1"), wxEmptyString, wxITEM_NORMAL );
+    m_menuHelp->Append( m_menuItemReadme );
+
+    m_menuItemCheckVer = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("&Check for new version") ) , wxEmptyString, wxITEM_NORMAL );
+    m_menuHelp->Append( m_menuItemCheckVer );
+
+    wxMenuItem* m_separator5;
+    m_separator5 = m_menuHelp->AppendSeparator();
+
+    m_menuItemAbout = new wxMenuItem( m_menuHelp, wxID_ABOUT, wxString( _("&About...") ) + wxT('\t') + wxT("Shift-F1"), wxEmptyString, wxITEM_NORMAL );
+    m_menuHelp->Append( m_menuItemAbout );
+
+    m_menubar1->Append( m_menuHelp, _("&Help") );
+
+    this->SetMenuBar( m_menubar1 );
+
+    bSizerPanelHolder = new wxBoxSizer( wxVERTICAL );
+
+    m_panelTopButtons = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxRAISED_BORDER|wxTAB_TRAVERSAL );
+    bSizerTopButtons = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer155;
+    bSizer155 = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizer155->Add( 15, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    wxFlexGridSizer* fgSizer121;
+    fgSizer121 = new wxFlexGridSizer( 2, 2, 0, 0 );
+    fgSizer121->SetFlexibleDirection( wxBOTH );
+    fgSizer121->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    m_staticTextCmpVariant = new wxStaticText( m_panelTopButtons, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextCmpVariant->Wrap( -1 );
+    m_staticTextCmpVariant->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
+    m_staticTextCmpVariant->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+
+    fgSizer121->Add( m_staticTextCmpVariant, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxTOP, 1 );
+
+
+    fgSizer121->Add( 0, 0, 1, 0, 5 );
+
+    wxBoxSizer* bSizer30;
+    bSizer30 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_buttonCompare = new wxButtonWithImage( m_panelTopButtons, wxID_OK, _("Compare"), wxDefaultPosition, wxSize( 180,42 ), 0 );
+    m_buttonCompare->SetDefault();
+    m_buttonCompare->SetFont( wxFont( 14, 74, 90, 92, false, wxEmptyString ) );
+    m_buttonCompare->SetToolTip( _("Compare both sides") );
+
+    bSizer30->Add( m_buttonCompare, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_buttonAbort = new wxButton( m_panelTopButtons, wxID_CANCEL, _("&Abort"), wxDefaultPosition, wxSize( 180,42 ), 0 );
+    m_buttonAbort->SetFont( wxFont( 14, 74, 90, 92, false, wxEmptyString ) );
+    m_buttonAbort->Enable( false );
+    m_buttonAbort->Hide();
+
+    bSizer30->Add( m_buttonAbort, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    fgSizer121->Add( bSizer30, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonCmpConfig = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,42 ), wxBU_AUTODRAW );
+    m_bpButtonCmpConfig->SetToolTip( _("Comparison settings") );
+
+    fgSizer121->Add( m_bpButtonCmpConfig, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 3 );
+
+    bSizer155->Add( fgSizer121, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 );
+
+    bSizerTopButtons->Add( bSizer155, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerTopButtons->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    wxBoxSizer* bSizer1551;
+    bSizer1551 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxFlexGridSizer* fgSizer12;
+    fgSizer12 = new wxFlexGridSizer( 2, 2, 0, 0 );
+    fgSizer12->SetFlexibleDirection( wxBOTH );
+    fgSizer12->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+
+    fgSizer12->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticTextSyncVariant = new wxStaticText( m_panelTopButtons, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextSyncVariant->Wrap( -1 );
+    m_staticTextSyncVariant->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
+    m_staticTextSyncVariant->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+
+    fgSizer12->Add( m_staticTextSyncVariant, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP, 1 );
+
+    m_bpButtonSyncConfig = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,42 ), wxBU_AUTODRAW );
+    m_bpButtonSyncConfig->SetToolTip( _("Synchronization settings") );
+
+    fgSizer12->Add( m_bpButtonSyncConfig, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 3 );
+
+    m_buttonStartSync = new wxButtonWithImage( m_panelTopButtons, wxID_ANY, _("Synchronize..."), wxDefaultPosition, wxSize( 180,42 ), 0 );
+    m_buttonStartSync->SetFont( wxFont( 14, 74, 90, 92, false, wxEmptyString ) );
+    m_buttonStartSync->SetToolTip( _("Start synchronization") );
+
+    fgSizer12->Add( m_buttonStartSync, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer1551->Add( fgSizer12, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 );
+
+
+    bSizer1551->Add( 15, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizerTopButtons->Add( bSizer1551, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_panelTopButtons->SetSizer( bSizerTopButtons );
+    m_panelTopButtons->Layout();
+    bSizerTopButtons->Fit( m_panelTopButtons );
+    bSizerPanelHolder->Add( m_panelTopButtons, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+    m_panelDirectoryPairs = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 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 ) );
+
+    sbSizerDirLeft = new wxStaticBoxSizer( new wxStaticBox( m_panelTopLeft, wxID_ANY, _("Drag && drop") ), wxHORIZONTAL );
+
+    m_bpButtonAddPair = new wxBitmapButton( m_panelTopLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
+    m_bpButtonAddPair->SetToolTip( _("Add folder pair") );
+
+    sbSizerDirLeft->Add( m_bpButtonAddPair, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 3 );
+
+    m_bpButtonRemovePair = new wxBitmapButton( m_panelTopLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
+    m_bpButtonRemovePair->SetToolTip( _("Remove folder pair") );
+
+    sbSizerDirLeft->Add( m_bpButtonRemovePair, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_directoryLeft = new FolderHistoryBox( m_panelTopLeft, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+    sbSizerDirLeft->Add( m_directoryLeft, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_dirPickerLeft = new FfsDirPickerCtrl( m_panelTopLeft, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_dirPickerLeft->SetToolTip( _("Select a folder") );
+
+    sbSizerDirLeft->Add( m_dirPickerLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_panelTopLeft->SetSizer( sbSizerDirLeft );
+    m_panelTopLeft->Layout();
+    sbSizerDirLeft->Fit( m_panelTopLeft );
+    bSizer91->Add( m_panelTopLeft, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_panelTopMiddle = new wxPanel( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer93;
+    bSizer93 = new wxBoxSizer( wxVERTICAL );
+
+
+    bSizer93->Add( 0, 3, 0, 0, 5 );
+
+    m_bpButtonSwapSides = new wxBitmapButton( m_panelTopMiddle, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+    m_bpButtonSwapSides->SetToolTip( _("Swap sides") );
+
+    bSizer93->Add( m_bpButtonSwapSides, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer160;
+    bSizer160 = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizer160->Add( 0, 0, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonAltCompCfg = new wxBitmapButton( m_panelTopMiddle, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
+    bSizer160->Add( m_bpButtonAltCompCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonLocalFilter = new wxBitmapButton( m_panelTopMiddle, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
+    bSizer160->Add( m_bpButtonLocalFilter, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 3 );
+
+    m_bpButtonAltSyncCfg = new wxBitmapButton( m_panelTopMiddle, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
+    bSizer160->Add( m_bpButtonAltSyncCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer160->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    bSizer93->Add( bSizer160, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_panelTopMiddle->SetSizer( bSizer93 );
+    m_panelTopMiddle->Layout();
+    bSizer93->Fit( m_panelTopMiddle );
+    bSizer91->Add( m_panelTopMiddle, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    m_panelTopRight = new wxPanel( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panelTopRight->SetMinSize( wxSize( 1,1 ) );
+
+    sbSizerDirRight = new wxStaticBoxSizer( new wxStaticBox( m_panelTopRight, wxID_ANY, _("Drag && drop") ), wxHORIZONTAL );
+
+    m_directoryRight = new FolderHistoryBox( m_panelTopRight, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+    sbSizerDirRight->Add( m_directoryRight, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_dirPickerRight = new FfsDirPickerCtrl( m_panelTopRight, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_dirPickerRight->SetToolTip( _("Select a folder") );
+
+    sbSizerDirRight->Add( m_dirPickerRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_panelTopRight->SetSizer( sbSizerDirRight );
+    m_panelTopRight->Layout();
+    sbSizerDirRight->Fit( m_panelTopRight );
+    bSizer91->Add( m_panelTopRight, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    bSizer1601->Add( bSizer91, 0, wxEXPAND, 5 );
+
+    m_scrolledWindowFolderPairs = new wxScrolledWindow( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxHSCROLL|wxVSCROLL );
+    m_scrolledWindowFolderPairs->SetScrollRate( 5, 5 );
+    m_scrolledWindowFolderPairs->SetMinSize( wxSize( -1,0 ) );
+
+    bSizerAddFolderPairs = new wxBoxSizer( wxVERTICAL );
+
+    m_scrolledWindowFolderPairs->SetSizer( bSizerAddFolderPairs );
+    m_scrolledWindowFolderPairs->Layout();
+    bSizerAddFolderPairs->Fit( m_scrolledWindowFolderPairs );
+    bSizer1601->Add( m_scrolledWindowFolderPairs, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    m_panelDirectoryPairs->SetSizer( bSizer1601 );
+    m_panelDirectoryPairs->Layout();
+    bSizer1601->Fit( m_panelDirectoryPairs );
+    bSizerPanelHolder->Add( m_panelDirectoryPairs, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+    m_panelGrids = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panelGrids->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_APPWORKSPACE ) );
+
+    bSizerGridHolder = new wxBoxSizer( wxHORIZONTAL );
+
+    m_panelLeft = new wxPanel( m_panelGrids, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer7;
+    bSizer7 = new wxBoxSizer( wxVERTICAL );
+
+    m_gridLeft = new CustomGridLeft( m_panelLeft, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+
+    // Grid
+    m_gridLeft->CreateGrid( 15, 4 );
+    m_gridLeft->EnableEditing( false );
+    m_gridLeft->EnableGridLines( true );
+    m_gridLeft->EnableDragGridSize( true );
+    m_gridLeft->SetMargins( 0, 0 );
+
+    // Columns
+    m_gridLeft->EnableDragColMove( false );
+    m_gridLeft->EnableDragColSize( true );
+    m_gridLeft->SetColLabelSize( 20 );
+    m_gridLeft->SetColLabelAlignment( wxALIGN_LEFT, wxALIGN_CENTRE );
+
+    // Rows
+    m_gridLeft->EnableDragRowSize( false );
+    m_gridLeft->SetRowLabelSize( 38 );
+    m_gridLeft->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
+
+    // Label Appearance
+
+    // Cell Defaults
+    m_gridLeft->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTRE );
+    m_gridLeft->SetMinSize( wxSize( 1,1 ) );
+
+    bSizer7->Add( m_gridLeft, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    m_panelLeft->SetSizer( bSizer7 );
+    m_panelLeft->Layout();
+    bSizer7->Fit( m_panelLeft );
+    bSizerGridHolder->Add( m_panelLeft, 1, wxEXPAND, 5 );
+
+    m_panelMiddle = new wxPanel( m_panelGrids, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer18;
+    bSizer18 = new wxBoxSizer( wxVERTICAL );
+
+    m_gridMiddle = new CustomGridMiddle( m_panelMiddle, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+
+    // Grid
+    m_gridMiddle->CreateGrid( 15, 1 );
+    m_gridMiddle->EnableEditing( false );
+    m_gridMiddle->EnableGridLines( true );
+    m_gridMiddle->EnableDragGridSize( false );
+    m_gridMiddle->SetMargins( 0, 0 );
+
+    // Columns
+    m_gridMiddle->SetColSize( 0, 60 );
+    m_gridMiddle->EnableDragColMove( false );
+    m_gridMiddle->EnableDragColSize( false );
+    m_gridMiddle->SetColLabelSize( 20 );
+    m_gridMiddle->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
+
+    // Rows
+    m_gridMiddle->EnableDragRowSize( false );
+    m_gridMiddle->SetRowLabelSize( 0 );
+    m_gridMiddle->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
+
+    // Label Appearance
+
+    // Cell Defaults
+    m_gridMiddle->SetDefaultCellFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxT("Arial") ) );
+    m_gridMiddle->SetDefaultCellAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
+    bSizer18->Add( m_gridMiddle, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
+
+    m_panelMiddle->SetSizer( bSizer18 );
+    m_panelMiddle->Layout();
+    bSizer18->Fit( m_panelMiddle );
+    bSizerGridHolder->Add( m_panelMiddle, 0, wxEXPAND, 5 );
+
+    m_panelRight = new wxPanel( m_panelGrids, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer10;
+    bSizer10 = new wxBoxSizer( wxVERTICAL );
+
+    m_gridRight = new CustomGridRight( m_panelRight, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+
+    // Grid
+    m_gridRight->CreateGrid( 15, 4 );
+    m_gridRight->EnableEditing( false );
+    m_gridRight->EnableGridLines( true );
+    m_gridRight->EnableDragGridSize( true );
+    m_gridRight->SetMargins( 0, 0 );
+
+    // Columns
+    m_gridRight->EnableDragColMove( false );
+    m_gridRight->EnableDragColSize( true );
+    m_gridRight->SetColLabelSize( 20 );
+    m_gridRight->SetColLabelAlignment( wxALIGN_LEFT, wxALIGN_CENTRE );
+
+    // Rows
+    m_gridRight->EnableDragRowSize( false );
+    m_gridRight->SetRowLabelSize( 38 );
+    m_gridRight->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
+
+    // Label Appearance
+
+    // Cell Defaults
+    m_gridRight->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTRE );
+    m_gridRight->SetMinSize( wxSize( 1,1 ) );
+
+    bSizer10->Add( m_gridRight, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    m_panelRight->SetSizer( bSizer10 );
+    m_panelRight->Layout();
+    bSizer10->Fit( m_panelRight );
+    bSizerGridHolder->Add( m_panelRight, 1, wxEXPAND, 5 );
+
+    m_panelGrids->SetSizer( bSizerGridHolder );
+    m_panelGrids->Layout();
+    bSizerGridHolder->Fit( m_panelGrids );
+    bSizerPanelHolder->Add( m_panelGrids, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+    m_panelConfig = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    bSizerConfig = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizerConfig->Add( 10, 0, 0, 0, 5 );
+
+    wxBoxSizer* bSizer151;
+    bSizer151 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bpButtonSave = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    m_bpButtonSave->SetToolTip( _("Save current configuration to file") );
+
+    bSizer151->Add( m_bpButtonSave, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonLoad = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    m_bpButtonLoad->SetToolTip( _("Load configuration from file") );
+
+    bSizer151->Add( m_bpButtonLoad, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizerConfig->Add( bSizer151, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_listBoxHistory = new wxListBox( m_panelConfig, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_EXTENDED|wxLB_NEEDED_SB|wxLB_SORT );
+    m_listBoxHistory->SetToolTip( _("Last used configurations (press DEL to remove from list)") );
+    m_listBoxHistory->SetMinSize( wxSize( -1,40 ) );
+
+    bSizerConfig->Add( m_listBoxHistory, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_panelConfig->SetSizer( bSizerConfig );
+    m_panelConfig->Layout();
+    bSizerConfig->Fit( m_panelConfig );
+    bSizerPanelHolder->Add( m_panelConfig, 0, 0, 5 );
+
+    m_panelFilter = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer140;
+    bSizer140 = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizer140->Add( 10, 0, 0, 0, 5 );
+
+    m_bpButtonFilter = new wxBitmapButton( m_panelFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW|wxFULL_REPAINT_ON_RESIZE );
+    bSizer140->Add( m_bpButtonFilter, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    wxBoxSizer* bSizer23;
+    bSizer23 = new wxBoxSizer( wxVERTICAL );
+
+    m_checkBoxHideFilt = new wxCheckBox( m_panelFilter, wxID_ANY, _("Hide excluded items"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_checkBoxHideFilt->SetToolTip( _("Hide filtered or temporarily excluded files") );
+
+    bSizer23->Add( m_checkBoxHideFilt, 0, wxEXPAND, 5 );
+
+    bSizer140->Add( bSizer23, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_panelFilter->SetSizer( bSizer140 );
+    m_panelFilter->Layout();
+    bSizer140->Fit( m_panelFilter );
+    bSizerPanelHolder->Add( m_panelFilter, 0, 0, 5 );
+
+    m_panelStatistics = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    bSizerStatistics = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizerStatistics->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    wxFlexGridSizer* fgSizer5;
+    fgSizer5 = new wxFlexGridSizer( 2, 2, 0, 5 );
+    fgSizer5->SetFlexibleDirection( wxHORIZONTAL );
+    fgSizer5->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    m_bitmapCreate = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    m_bitmapCreate->SetToolTip( _("Number of files and directories that will be created") );
+
+    fgSizer5->Add( m_bitmapCreate, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_textCtrlCreate = new wxTextCtrl( m_panelStatistics, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY|wxTE_RIGHT );
+    m_textCtrlCreate->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
+    m_textCtrlCreate->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+    m_textCtrlCreate->SetToolTip( _("Number of files and directories that will be created") );
+
+    fgSizer5->Add( m_textCtrlCreate, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bitmapUpdate = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    m_bitmapUpdate->SetToolTip( _("Number of files that will be overwritten") );
+
+    fgSizer5->Add( m_bitmapUpdate, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_textCtrlUpdate = new wxTextCtrl( m_panelStatistics, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY|wxTE_RIGHT );
+    m_textCtrlUpdate->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
+    m_textCtrlUpdate->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+    m_textCtrlUpdate->SetToolTip( _("Number of files that will be overwritten") );
+
+    fgSizer5->Add( m_textCtrlUpdate, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizerStatistics->Add( fgSizer5, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
+
+    wxFlexGridSizer* fgSizer6;
+    fgSizer6 = new wxFlexGridSizer( 2, 2, 0, 5 );
+    fgSizer6->SetFlexibleDirection( wxHORIZONTAL );
+    fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    m_bitmapDelete = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    m_bitmapDelete->SetToolTip( _("Number of files and directories that will be deleted") );
+
+    fgSizer6->Add( m_bitmapDelete, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_textCtrlDelete = new wxTextCtrl( m_panelStatistics, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY|wxTE_RIGHT );
+    m_textCtrlDelete->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
+    m_textCtrlDelete->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+    m_textCtrlDelete->SetToolTip( _("Number of files and directories that will be deleted") );
+
+    fgSizer6->Add( m_textCtrlDelete, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bitmapData = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    m_bitmapData->SetToolTip( _("Total amount of data that will be transferred") );
+
+    fgSizer6->Add( m_bitmapData, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_textCtrlData = new wxTextCtrl( m_panelStatistics, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY|wxTE_RIGHT );
+    m_textCtrlData->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
+    m_textCtrlData->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+    m_textCtrlData->SetToolTip( _("Total amount of data that will be transferred") );
+
+    fgSizer6->Add( m_textCtrlData, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizerStatistics->Add( fgSizer6, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
+
+
+    bSizerStatistics->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_panelStatistics->SetSizer( bSizerStatistics );
+    m_panelStatistics->Layout();
+    bSizerStatistics->Fit( m_panelStatistics );
+    bSizerPanelHolder->Add( m_panelStatistics, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_panelViewFilter = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    bSizerViewFilter = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizerViewFilter->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_bpButtonSyncCreateLeft = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonSyncCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonSyncDirOverwLeft = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonSyncDirOverwLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonSyncDeleteLeft = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonSyncDeleteLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonLeftOnly = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonLeftOnly, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonLeftNewer = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonLeftNewer, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonEqual = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonEqual, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonDifferent = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonDifferent, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonSyncDirNone = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonSyncDirNone, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonRightNewer = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonRightNewer, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonRightOnly = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonRightOnly, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonSyncDeleteRight = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonSyncDeleteRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonSyncDirOverwRight = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonSyncDirOverwRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonSyncCreateRight = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonSyncCreateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonConflict = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonConflict, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    bSizerViewFilter->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_panelViewFilter->SetSizer( bSizerViewFilter );
+    m_panelViewFilter->Layout();
+    bSizerViewFilter->Fit( m_panelViewFilter );
+    bSizerPanelHolder->Add( m_panelViewFilter, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_panelStatusBar = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSTATIC_BORDER|wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer451;
+    bSizer451 = new wxBoxSizer( wxHORIZONTAL );
+
+    bSizer451->SetMinSize( wxSize( -1,22 ) );
+    wxBoxSizer* bSizer53;
+    bSizer53 = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizer53->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticTextStatusLeft = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextStatusLeft->Wrap( -1 );
+    m_staticTextStatusLeft->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer53->Add( m_staticTextStatusLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    bSizer53->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer451->Add( bSizer53, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    m_staticline9 = new wxStaticLine( m_panelStatusBar, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    bSizer451->Add( m_staticline9, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxEXPAND, 2 );
+
+
+    bSizer451->Add( 26, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticTextStatusMiddle = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextStatusMiddle->Wrap( -1 );
+    m_staticTextStatusMiddle->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer451->Add( m_staticTextStatusMiddle, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    bSizer451->Add( 26, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticline10 = new wxStaticLine( m_panelStatusBar, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    bSizer451->Add( m_staticline10, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP, 2 );
+
+    wxBoxSizer* bSizer52;
+    bSizer52 = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizer52->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticTextStatusRight = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextStatusRight->Wrap( -1 );
+    m_staticTextStatusRight->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer52->Add( m_staticTextStatusRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    wxBoxSizer* bSizer50;
+    bSizer50 = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizer50->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bitmap15 = new wxStaticBitmap( m_panelStatusBar, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 10,10 ), 0 );
+    bSizer50->Add( m_bitmap15, 0, wxALIGN_BOTTOM, 2 );
+
+    bSizer52->Add( bSizer50, 1, wxALIGN_BOTTOM|wxEXPAND, 5 );
+
+    bSizer451->Add( bSizer52, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_panelStatusBar->SetSizer( bSizer451 );
+    m_panelStatusBar->Layout();
+    bSizer451->Fit( m_panelStatusBar );
+    bSizerPanelHolder->Add( m_panelStatusBar, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+    this->SetSizer( bSizerPanelHolder );
+    this->Layout();
+    bSizerPanelHolder->Fit( this );
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainDialogGenerated::OnClose ) );
+    this->Connect( m_menuItem10->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnCompare ) );
+    this->Connect( m_menuItem11->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnStartSync ) );
+    this->Connect( m_menuItemSwitchView->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnSwitchView ) );
+    this->Connect( m_menuItemNew->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnNewConfig ) );
+    this->Connect( m_menuItemSave->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnSaveConfig ) );
+    this->Connect( m_menuItemLoad->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnLoadConfig ) );
+    this->Connect( m_menuItem4->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuQuit ) );
+    this->Connect( m_menuItemGlobSett->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuGlobalSettings ) );
+    this->Connect( m_menuItem7->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuBatchJob ) );
+    this->Connect( m_menuItem5->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuExportFileList ) );
+    this->Connect( m_menuItemReadme->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnShowHelp ) );
+    this->Connect( m_menuItemCheckVer->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuCheckVersion ) );
+    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_bpButtonSyncConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncSettings ), NULL, this );
+    m_buttonStartSync->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnStartSync ), NULL, this );
+    m_bpButtonAddPair->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnAddFolderPair ), NULL, this );
+    m_bpButtonRemovePair->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnRemoveTopFolderPair ), NULL, this );
+    m_dirPickerLeft->Connect( wxEVT_COMMAND_DIRPICKER_CHANGED, wxFileDirPickerEventHandler( MainDialogGenerated::OnDirSelected ), NULL, this );
+    m_bpButtonSwapSides->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSwapSides ), NULL, this );
+    m_dirPickerRight->Connect( wxEVT_COMMAND_DIRPICKER_CHANGED, wxFileDirPickerEventHandler( MainDialogGenerated::OnDirSelected ), NULL, this );
+    m_gridLeft->Connect( wxEVT_GRID_CELL_LEFT_DCLICK, wxGridEventHandler( MainDialogGenerated::OnLeftGridDoubleClick ), NULL, this );
+    m_gridLeft->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRim ), NULL, this );
+    m_gridLeft->Connect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( MainDialogGenerated::OnSortLeftGrid ), NULL, this );
+    m_gridLeft->Connect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRimLabelLeft ), NULL, this );
+    m_gridMiddle->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextMiddle ), NULL, this );
+    m_gridMiddle->Connect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( MainDialogGenerated::OnSortMiddleGrid ), NULL, this );
+    m_gridMiddle->Connect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextMiddleLabel ), NULL, this );
+    m_gridRight->Connect( wxEVT_GRID_CELL_LEFT_DCLICK, wxGridEventHandler( MainDialogGenerated::OnRightGridDoubleClick ), NULL, this );
+    m_gridRight->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRim ), NULL, this );
+    m_gridRight->Connect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( MainDialogGenerated::OnSortRightGrid ), NULL, this );
+    m_gridRight->Connect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRimLabelRight ), NULL, this );
+    m_bpButtonSave->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSaveConfig ), NULL, this );
+    m_bpButtonLoad->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnLoadConfig ), NULL, this );
+    m_listBoxHistory->Connect( wxEVT_CHAR, wxKeyEventHandler( MainDialogGenerated::OnCfgHistoryKeyEvent ), NULL, this );
+    m_listBoxHistory->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnLoadFromHistory ), NULL, this );
+    m_bpButtonFilter->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigureFilter ), NULL, this );
+    m_checkBoxHideFilt->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnHideFilteredButton ), NULL, this );
+    m_bpButtonSyncCreateLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncCreateLeft ), NULL, this );
+    m_bpButtonSyncDirOverwLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDirLeft ), NULL, this );
+    m_bpButtonSyncDeleteLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDeleteLeft ), NULL, this );
+    m_bpButtonLeftOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnLeftOnlyFiles ), NULL, this );
+    m_bpButtonLeftNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnLeftNewerFiles ), NULL, this );
+    m_bpButtonEqual->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnEqualFiles ), NULL, this );
+    m_bpButtonDifferent->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnDifferentFiles ), NULL, this );
+    m_bpButtonSyncDirNone->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDirNone ), NULL, this );
+    m_bpButtonRightNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnRightNewerFiles ), NULL, this );
+    m_bpButtonRightOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnRightOnlyFiles ), NULL, this );
+    m_bpButtonSyncDeleteRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDeleteRight ), NULL, this );
+    m_bpButtonSyncDirOverwRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDirRight ), NULL, this );
+    m_bpButtonSyncCreateRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncCreateRight ), NULL, this );
+    m_bpButtonConflict->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConflictFiles ), NULL, this );
 }
 
 MainDialogGenerated::~MainDialogGenerated()
 {
-	// Disconnect Events
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainDialogGenerated::OnClose ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnCompare ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnStartSync ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnSwitchView ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnNewConfig ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnSaveConfig ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnLoadConfig ) );
-	this->Disconnect( wxID_EXIT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuQuit ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuGlobalSettings ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuBatchJob ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuExportFileList ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnShowHelp ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuCheckVersion ) );
-	this->Disconnect( wxID_ABOUT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuAbout ) );
-	m_buttonCompare->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnCompare ), NULL, this );
-	m_bpButtonCmpConfig->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnCmpSettings ), NULL, this );
-	m_bpButtonSyncConfig->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncSettings ), NULL, this );
-	m_buttonStartSync->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnStartSync ), NULL, this );
-	m_dirPickerLeft->Disconnect( wxEVT_COMMAND_DIRPICKER_CHANGED, wxFileDirPickerEventHandler( MainDialogGenerated::OnDirSelected ), NULL, this );
-	m_bpButtonSwapSides->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSwapSides ), NULL, this );
-	m_bpButtonAddPair->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnAddFolderPair ), NULL, this );
-	m_bpButtonRemovePair->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnRemoveTopFolderPair ), NULL, this );
-	m_dirPickerRight->Disconnect( wxEVT_COMMAND_DIRPICKER_CHANGED, wxFileDirPickerEventHandler( MainDialogGenerated::OnDirSelected ), NULL, this );
-	m_gridLeft->Disconnect( wxEVT_GRID_CELL_LEFT_DCLICK, wxGridEventHandler( MainDialogGenerated::OnLeftGridDoubleClick ), NULL, this );
-	m_gridLeft->Disconnect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRim ), NULL, this );
-	m_gridLeft->Disconnect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( MainDialogGenerated::OnSortLeftGrid ), NULL, this );
-	m_gridLeft->Disconnect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRimLabelLeft ), NULL, this );
-	m_gridMiddle->Disconnect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextMiddle ), NULL, this );
-	m_gridMiddle->Disconnect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( MainDialogGenerated::OnSortMiddleGrid ), NULL, this );
-	m_gridMiddle->Disconnect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextMiddleLabel ), NULL, this );
-	m_gridRight->Disconnect( wxEVT_GRID_CELL_LEFT_DCLICK, wxGridEventHandler( MainDialogGenerated::OnRightGridDoubleClick ), NULL, this );
-	m_gridRight->Disconnect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRim ), NULL, this );
-	m_gridRight->Disconnect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( MainDialogGenerated::OnSortRightGrid ), NULL, this );
-	m_gridRight->Disconnect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRimLabelRight ), NULL, this );
-	m_bpButtonSave->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSaveConfig ), NULL, this );
-	m_bpButtonLoad->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnLoadConfig ), NULL, this );
-	m_listBoxHistory->Disconnect( wxEVT_CHAR, wxKeyEventHandler( MainDialogGenerated::OnCfgHistoryKeyEvent ), NULL, this );
-	m_listBoxHistory->Disconnect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnLoadFromHistory ), NULL, this );
-	m_bpButtonFilter->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigureFilter ), NULL, this );
-	m_checkBoxHideFilt->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnHideFilteredButton ), NULL, this );
-	m_bpButtonSyncCreateLeft->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncCreateLeft ), NULL, this );
-	m_bpButtonSyncDirOverwLeft->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDirLeft ), NULL, this );
-	m_bpButtonSyncDeleteLeft->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDeleteLeft ), NULL, this );
-	m_bpButtonLeftOnly->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnLeftOnlyFiles ), NULL, this );
-	m_bpButtonLeftNewer->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnLeftNewerFiles ), NULL, this );
-	m_bpButtonEqual->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnEqualFiles ), NULL, this );
-	m_bpButtonDifferent->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnDifferentFiles ), NULL, this );
-	m_bpButtonSyncDirNone->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDirNone ), NULL, this );
-	m_bpButtonRightNewer->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnRightNewerFiles ), NULL, this );
-	m_bpButtonRightOnly->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnRightOnlyFiles ), NULL, this );
-	m_bpButtonSyncDeleteRight->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDeleteRight ), NULL, this );
-	m_bpButtonSyncDirOverwRight->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDirRight ), NULL, this );
-	m_bpButtonSyncCreateRight->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncCreateRight ), NULL, this );
-	m_bpButtonConflict->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConflictFiles ), NULL, this );
-	
+    // Disconnect Events
+    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainDialogGenerated::OnClose ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnCompare ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnStartSync ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnSwitchView ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnNewConfig ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnSaveConfig ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnLoadConfig ) );
+    this->Disconnect( wxID_EXIT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuQuit ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuGlobalSettings ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuBatchJob ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuExportFileList ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnShowHelp ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuCheckVersion ) );
+    this->Disconnect( wxID_ABOUT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuAbout ) );
+    m_buttonCompare->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnCompare ), NULL, this );
+    m_bpButtonCmpConfig->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnCmpSettings ), NULL, this );
+    m_bpButtonSyncConfig->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncSettings ), NULL, this );
+    m_buttonStartSync->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnStartSync ), NULL, this );
+    m_bpButtonAddPair->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnAddFolderPair ), NULL, this );
+    m_bpButtonRemovePair->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnRemoveTopFolderPair ), NULL, this );
+    m_dirPickerLeft->Disconnect( wxEVT_COMMAND_DIRPICKER_CHANGED, wxFileDirPickerEventHandler( MainDialogGenerated::OnDirSelected ), NULL, this );
+    m_bpButtonSwapSides->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSwapSides ), NULL, this );
+    m_dirPickerRight->Disconnect( wxEVT_COMMAND_DIRPICKER_CHANGED, wxFileDirPickerEventHandler( MainDialogGenerated::OnDirSelected ), NULL, this );
+    m_gridLeft->Disconnect( wxEVT_GRID_CELL_LEFT_DCLICK, wxGridEventHandler( MainDialogGenerated::OnLeftGridDoubleClick ), NULL, this );
+    m_gridLeft->Disconnect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRim ), NULL, this );
+    m_gridLeft->Disconnect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( MainDialogGenerated::OnSortLeftGrid ), NULL, this );
+    m_gridLeft->Disconnect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRimLabelLeft ), NULL, this );
+    m_gridMiddle->Disconnect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextMiddle ), NULL, this );
+    m_gridMiddle->Disconnect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( MainDialogGenerated::OnSortMiddleGrid ), NULL, this );
+    m_gridMiddle->Disconnect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextMiddleLabel ), NULL, this );
+    m_gridRight->Disconnect( wxEVT_GRID_CELL_LEFT_DCLICK, wxGridEventHandler( MainDialogGenerated::OnRightGridDoubleClick ), NULL, this );
+    m_gridRight->Disconnect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRim ), NULL, this );
+    m_gridRight->Disconnect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( MainDialogGenerated::OnSortRightGrid ), NULL, this );
+    m_gridRight->Disconnect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRimLabelRight ), NULL, this );
+    m_bpButtonSave->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSaveConfig ), NULL, this );
+    m_bpButtonLoad->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnLoadConfig ), NULL, this );
+    m_listBoxHistory->Disconnect( wxEVT_CHAR, wxKeyEventHandler( MainDialogGenerated::OnCfgHistoryKeyEvent ), NULL, this );
+    m_listBoxHistory->Disconnect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnLoadFromHistory ), NULL, this );
+    m_bpButtonFilter->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigureFilter ), NULL, this );
+    m_checkBoxHideFilt->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnHideFilteredButton ), NULL, this );
+    m_bpButtonSyncCreateLeft->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncCreateLeft ), NULL, this );
+    m_bpButtonSyncDirOverwLeft->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDirLeft ), NULL, this );
+    m_bpButtonSyncDeleteLeft->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDeleteLeft ), NULL, this );
+    m_bpButtonLeftOnly->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnLeftOnlyFiles ), NULL, this );
+    m_bpButtonLeftNewer->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnLeftNewerFiles ), NULL, this );
+    m_bpButtonEqual->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnEqualFiles ), NULL, this );
+    m_bpButtonDifferent->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnDifferentFiles ), NULL, this );
+    m_bpButtonSyncDirNone->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDirNone ), NULL, this );
+    m_bpButtonRightNewer->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnRightNewerFiles ), NULL, this );
+    m_bpButtonRightOnly->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnRightOnlyFiles ), NULL, this );
+    m_bpButtonSyncDeleteRight->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDeleteRight ), NULL, this );
+    m_bpButtonSyncDirOverwRight->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDirRight ), NULL, this );
+    m_bpButtonSyncCreateRight->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncCreateRight ), NULL, this );
+    m_bpButtonConflict->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConflictFiles ), NULL, this );
+
 }
 
 FolderPairGenerated::FolderPairGenerated( 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 );
-	wxBoxSizer* bSizer134;
-	bSizer134 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_directoryLeft = new wxTextCtrl( m_panelLeft, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer134->Add( m_directoryLeft, 1, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
-	m_dirPickerLeft = new FfsDirPickerCtrl( m_panelLeft, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_dirPickerLeft->SetToolTip( _("Select a folder") );
-	
-	bSizer134->Add( m_dirPickerLeft, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_panelLeft->SetSizer( bSizer134 );
-	m_panelLeft->Layout();
-	bSizer134->Fit( m_panelLeft );
-	bSizer74->Add( m_panelLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_panel20 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer95;
-	bSizer95 = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizer95->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_bpButtonLocalFilter = new wxBitmapButton( m_panel20, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
-	bSizer95->Add( m_bpButtonLocalFilter, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer95->Add( 5, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonAltSyncCfg = new wxBitmapButton( m_panel20, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
-	bSizer95->Add( m_bpButtonAltSyncCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer95->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_panel20->SetSizer( bSizer95 );
-	m_panel20->Layout();
-	bSizer95->Fit( m_panel20 );
-	bSizer74->Add( m_panel20, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-	
-	m_panelRight = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer135;
-	bSizer135 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bpButtonRemovePair = new wxBitmapButton( m_panelRight, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
-	m_bpButtonRemovePair->SetToolTip( _("Remove folder pair") );
-	
-	bSizer135->Add( m_bpButtonRemovePair, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
-	m_directoryRight = new wxTextCtrl( m_panelRight, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer135->Add( m_directoryRight, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_dirPickerRight = new FfsDirPickerCtrl( m_panelRight, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_dirPickerRight->SetToolTip( _("Select a folder") );
-	
-	bSizer135->Add( m_dirPickerRight, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_panelRight->SetSizer( bSizer135 );
-	m_panelRight->Layout();
-	bSizer135->Fit( m_panelRight );
-	bSizer74->Add( m_panelRight, 1, wxALIGN_CENTER_VERTICAL, 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 );
+    wxBoxSizer* bSizer134;
+    bSizer134 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bpButtonRemovePair = new wxBitmapButton( m_panelLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
+    m_bpButtonRemovePair->SetToolTip( _("Remove folder pair") );
+
+    bSizer134->Add( m_bpButtonRemovePair, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+
+    m_directoryLeft = new FolderHistoryBox( m_panelLeft, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+    bSizer134->Add( m_directoryLeft, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_dirPickerLeft = new FfsDirPickerCtrl( m_panelLeft, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_dirPickerLeft->SetToolTip( _("Select a folder") );
+
+    bSizer134->Add( m_dirPickerLeft, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    m_panelLeft->SetSizer( bSizer134 );
+    m_panelLeft->Layout();
+    bSizer134->Fit( m_panelLeft );
+    bSizer74->Add( m_panelLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_panel20 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer95;
+    bSizer95 = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizer95->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_bpButtonAltCompCfg = new wxBitmapButton( m_panel20, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
+    bSizer95->Add( m_bpButtonAltCompCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonLocalFilter = new wxBitmapButton( m_panel20, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
+    bSizer95->Add( m_bpButtonLocalFilter, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 3 );
+
+    m_bpButtonAltSyncCfg = new wxBitmapButton( m_panel20, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
+    bSizer95->Add( m_bpButtonAltSyncCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer95->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_panel20->SetSizer( bSizer95 );
+    m_panel20->Layout();
+    bSizer95->Fit( m_panel20 );
+    bSizer74->Add( m_panel20, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+
+    m_panelRight = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer135;
+    bSizer135 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_directoryRight = new FolderHistoryBox( m_panelRight, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+    bSizer135->Add( m_directoryRight, 1, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+
+    m_dirPickerRight = new FfsDirPickerCtrl( m_panelRight, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_dirPickerRight->SetToolTip( _("Select a folder") );
+
+    bSizer135->Add( m_dirPickerRight, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    m_panelRight->SetSizer( bSizer135 );
+    m_panelRight->Layout();
+    bSizer135->Fit( m_panelRight );
+    bSizer74->Add( m_panelRight, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    this->SetSizer( bSizer74 );
+    this->Layout();
+    bSizer74->Fit( this );
 }
 
 FolderPairGenerated::~FolderPairGenerated()
 {
 }
 
-BatchFolderPairGenerated::BatchFolderPairGenerated( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
+BatchDlgGenerated::BatchDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-	wxBoxSizer* bSizer142;
-	bSizer142 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer140;
-	bSizer140 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_panel32 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxDOUBLE_BORDER );
-	wxBoxSizer* bSizer147;
-	bSizer147 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer136;
-	bSizer136 = new wxBoxSizer( wxVERTICAL );
-	
-	m_bpButtonRemovePair = new wxBitmapButton( m_panel32, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
-	m_bpButtonRemovePair->SetToolTip( _("Remove folder pair") );
-	
-	bSizer136->Add( m_bpButtonRemovePair, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer147->Add( bSizer136, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	wxBoxSizer* bSizer143;
-	bSizer143 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer145;
-	bSizer145 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText53 = new wxStaticText( m_panel32, wxID_ANY, _("Left"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText53->Wrap( -1 );
-	m_staticText53->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer145->Add( m_staticText53, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer143->Add( bSizer145, 1, 0, 5 );
-	
-	wxBoxSizer* bSizer146;
-	bSizer146 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText541 = new wxStaticText( m_panel32, wxID_ANY, _("Right"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText541->Wrap( -1 );
-	m_staticText541->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer146->Add( m_staticText541, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer143->Add( bSizer146, 1, 0, 5 );
-	
-	bSizer147->Add( bSizer143, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
-	
-	m_panel32->SetSizer( bSizer147 );
-	m_panel32->Layout();
-	bSizer147->Fit( m_panel32 );
-	bSizer140->Add( m_panel32, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer144;
-	bSizer144 = new wxBoxSizer( wxVERTICAL );
-	
-	m_panelLeft = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer114;
-	bSizer114 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_directoryLeft = new wxTextCtrl( m_panelLeft, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer114->Add( m_directoryLeft, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_dirPickerLeft = new FfsDirPickerCtrl( m_panelLeft, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_dirPickerLeft->SetToolTip( _("Select a folder") );
-	
-	bSizer114->Add( m_dirPickerLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonLocalFilter = new wxBitmapButton( m_panelLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
-	bSizer114->Add( m_bpButtonLocalFilter, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_panelLeft->SetSizer( bSizer114 );
-	m_panelLeft->Layout();
-	bSizer114->Fit( m_panelLeft );
-	bSizer144->Add( m_panelLeft, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	m_panelRight = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer115;
-	bSizer115 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_directoryRight = new wxTextCtrl( m_panelRight, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer115->Add( m_directoryRight, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_dirPickerRight = new FfsDirPickerCtrl( m_panelRight, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_dirPickerRight->SetToolTip( _("Select a folder") );
-	
-	bSizer115->Add( m_dirPickerRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonAltSyncCfg = new wxBitmapButton( m_panelRight, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
-	bSizer115->Add( m_bpButtonAltSyncCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_panelRight->SetSizer( bSizer115 );
-	m_panelRight->Layout();
-	bSizer115->Fit( m_panelRight );
-	bSizer144->Add( m_panelRight, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer140->Add( bSizer144, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer142->Add( bSizer140, 0, wxEXPAND, 5 );
-	
-	
-	bSizer142->Add( 0, 5, 0, 0, 5 );
-	
-	this->SetSizer( bSizer142 );
-	this->Layout();
-	bSizer142->Fit( this );
+    this->SetSizeHints( wxSize( 560,320 ), wxDefaultSize );
+
+    wxBoxSizer* bSizer54;
+    bSizer54 = new wxBoxSizer( wxVERTICAL );
+
+    bSizer69 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer87;
+    bSizer87 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmap27 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), 0 );
+    bSizer87->Add( m_bitmap27, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    m_panel8 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER|wxTAB_TRAVERSAL );
+    m_panel8->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DLIGHT ) );
+
+    wxBoxSizer* bSizer72;
+    bSizer72 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText56 = new wxStaticText( m_panel8, wxID_ANY, _("Batch job"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText56->Wrap( -1 );
+    m_staticText56->SetFont( wxFont( 16, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer72->Add( m_staticText56, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_panel8->SetSizer( bSizer72 );
+    m_panel8->Layout();
+    bSizer72->Fit( m_panel8 );
+    bSizer87->Add( m_panel8, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+
+    bSizer87->Add( 5, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    wxBoxSizer* bSizer70;
+    bSizer70 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText44 = new wxStaticText( this, wxID_ANY, _("Create a batch file for automated synchronization. To start in batch mode simply double-click the file or execute via command line: FreeFileSync.exe <ffs_batch file>. This can also be scheduled in your operating system's task planner."), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText44->Wrap( 460 );
+    bSizer70->Add( m_staticText44, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    m_bpButtonHelp = new wxBitmapButton( this, wxID_HELP, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    m_bpButtonHelp->SetToolTip( _("Help") );
+
+    bSizer70->Add( m_bpButtonHelp, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+
+    bSizer87->Add( bSizer70, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    bSizer69->Add( bSizer87, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_notebookSettings = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+    m_panelOverview = new wxPanel( m_notebookSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer67;
+    bSizer67 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer120;
+    bSizer120 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer175;
+    bSizer175 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxStaticBoxSizer* sbSizer241;
+    sbSizer241 = new wxStaticBoxSizer( new wxStaticBox( m_panelOverview, wxID_ANY, _("Compare") ), wxHORIZONTAL );
+
+    m_bpButtonCmpConfig = new wxBitmapButton( m_panelOverview, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,42 ), wxBU_AUTODRAW );
+    m_bpButtonCmpConfig->SetToolTip( _("Comparison settings") );
+
+    sbSizer241->Add( m_bpButtonCmpConfig, 0, wxALIGN_CENTER_VERTICAL, 3 );
+
+
+    sbSizer241->Add( 10, 0, 0, 0, 5 );
+
+    m_staticTextCmpVariant = new wxStaticText( m_panelOverview, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextCmpVariant->Wrap( -1 );
+    m_staticTextCmpVariant->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
+    m_staticTextCmpVariant->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+
+    sbSizer241->Add( m_staticTextCmpVariant, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer175->Add( sbSizer241, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer175->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    wxStaticBoxSizer* sbSizer26;
+    sbSizer26 = new wxStaticBoxSizer( new wxStaticBox( m_panelOverview, wxID_ANY, _("Filter files") ), wxVERTICAL );
+
+    m_bpButtonFilter = new wxBitmapButton( m_panelOverview, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW|wxFULL_REPAINT_ON_RESIZE );
+    sbSizer26->Add( m_bpButtonFilter, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 15 );
+
+    bSizer175->Add( sbSizer26, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer175->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    wxStaticBoxSizer* sbSizer252;
+    sbSizer252 = new wxStaticBoxSizer( new wxStaticBox( m_panelOverview, wxID_ANY, _("Synchronize...") ), wxHORIZONTAL );
+
+    m_staticTextSyncVariant = new wxStaticText( m_panelOverview, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextSyncVariant->Wrap( -1 );
+    m_staticTextSyncVariant->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
+    m_staticTextSyncVariant->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+
+    sbSizer252->Add( m_staticTextSyncVariant, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    sbSizer252->Add( 10, 0, 0, 0, 5 );
+
+    m_bpButtonSyncConfig = new wxBitmapButton( m_panelOverview, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,42 ), wxBU_AUTODRAW );
+    m_bpButtonSyncConfig->SetToolTip( _("Synchronization settings") );
+
+    sbSizer252->Add( m_bpButtonSyncConfig, 0, wxALIGN_CENTER_VERTICAL, 3 );
+
+    bSizer175->Add( sbSizer252, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer175->Add( 15, 0, 0, 0, 5 );
+
+    wxStaticBoxSizer* sbSizer25;
+    sbSizer25 = new wxStaticBoxSizer( new wxStaticBox( m_panelOverview, wxID_ANY, _("Error handling") ), wxHORIZONTAL );
+
+    wxArrayString m_choiceHandleErrorChoices;
+    m_choiceHandleError = new wxChoice( m_panelOverview, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceHandleErrorChoices, 0 );
+    m_choiceHandleError->SetSelection( 0 );
+    sbSizer25->Add( m_choiceHandleError, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer175->Add( sbSizer25, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    bSizer120->Add( bSizer175, 0, wxEXPAND, 5 );
+
+
+    bSizer120->Add( 0, 5, 0, 0, 5 );
+
+    m_scrolledWindow6 = new wxScrolledWindow( m_panelOverview, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
+    m_scrolledWindow6->SetScrollRate( 5, 5 );
+    wxBoxSizer* bSizer141;
+    bSizer141 = new wxBoxSizer( wxVERTICAL );
+
+    sbSizerMainPair = new wxBoxSizer( wxHORIZONTAL );
+
+    m_panelMainPair = new wxPanel( m_scrolledWindow6, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxDOUBLE_BORDER );
+    wxBoxSizer* bSizer147;
+    bSizer147 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer1361;
+    bSizer1361 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bpButtonAddPair = new wxBitmapButton( m_panelMainPair, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
+    m_bpButtonAddPair->SetToolTip( _("Add folder pair") );
+
+    bSizer1361->Add( m_bpButtonAddPair, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 3 );
+
+    m_bpButtonRemovePair = new wxBitmapButton( m_panelMainPair, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
+    m_bpButtonRemovePair->SetToolTip( _("Remove folder pair") );
+
+    bSizer1361->Add( m_bpButtonRemovePair, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    bSizer147->Add( bSizer1361, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    wxBoxSizer* bSizer143;
+    bSizer143 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer145;
+    bSizer145 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText532 = new wxStaticText( m_panelMainPair, wxID_ANY, _("Left"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText532->Wrap( -1 );
+    m_staticText532->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer145->Add( m_staticText532, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer143->Add( bSizer145, 1, 0, 5 );
+
+    wxBoxSizer* bSizer146;
+    bSizer146 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText5411 = new wxStaticText( m_panelMainPair, wxID_ANY, _("Right"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText5411->Wrap( -1 );
+    m_staticText5411->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer146->Add( m_staticText5411, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer143->Add( bSizer146, 1, 0, 5 );
+
+    bSizer147->Add( bSizer143, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+
+    m_panelMainPair->SetSizer( bSizer147 );
+    m_panelMainPair->Layout();
+    bSizer147->Fit( m_panelMainPair );
+    sbSizerMainPair->Add( m_panelMainPair, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM, 5 );
+
+    wxBoxSizer* bSizer158;
+    bSizer158 = new wxBoxSizer( wxVERTICAL );
+
+    m_panelLeft = new wxPanel( m_scrolledWindow6, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer1141;
+    bSizer1141 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_directoryLeft = new FolderHistoryBox( m_panelLeft, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+    bSizer1141->Add( m_directoryLeft, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_dirPickerLeft = new FfsDirPickerCtrl( m_panelLeft, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_dirPickerLeft->SetToolTip( _("Select a folder") );
+
+    bSizer1141->Add( m_dirPickerLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_panelLeft->SetSizer( bSizer1141 );
+    m_panelLeft->Layout();
+    bSizer1141->Fit( m_panelLeft );
+    bSizer158->Add( m_panelLeft, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    m_panelRight = new wxPanel( m_scrolledWindow6, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer115;
+    bSizer115 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_directoryRight = new FolderHistoryBox( m_panelRight, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+    bSizer115->Add( m_directoryRight, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_dirPickerRight = new FfsDirPickerCtrl( m_panelRight, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_dirPickerRight->SetToolTip( _("Select a folder") );
+
+    bSizer115->Add( m_dirPickerRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_panelRight->SetSizer( bSizer115 );
+    m_panelRight->Layout();
+    bSizer115->Fit( m_panelRight );
+    bSizer158->Add( m_panelRight, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+
+    sbSizerMainPair->Add( bSizer158, 1, wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 );
+
+    wxBoxSizer* bSizer177;
+    bSizer177 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bpButtonAltCompCfg = new wxBitmapButton( m_scrolledWindow6, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
+    bSizer177->Add( m_bpButtonAltCompCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonLocalFilter = new wxBitmapButton( m_scrolledWindow6, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
+    bSizer177->Add( m_bpButtonLocalFilter, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 3 );
+
+    m_bpButtonAltSyncCfg = new wxBitmapButton( m_scrolledWindow6, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
+    bSizer177->Add( m_bpButtonAltSyncCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    sbSizerMainPair->Add( bSizer177, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+
+    bSizer141->Add( sbSizerMainPair, 0, wxEXPAND, 5 );
+
+    bSizerAddFolderPairs = new wxBoxSizer( wxVERTICAL );
+
+    bSizer141->Add( bSizerAddFolderPairs, 1, wxEXPAND, 5 );
+
+    m_scrolledWindow6->SetSizer( bSizer141 );
+    m_scrolledWindow6->Layout();
+    bSizer141->Fit( m_scrolledWindow6 );
+    bSizer120->Add( m_scrolledWindow6, 1, wxEXPAND, 5 );
+
+
+    bSizer120->Add( 0, 5, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    bSizer67->Add( bSizer120, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 10 );
+
+    m_panelOverview->SetSizer( bSizer67 );
+    m_panelOverview->Layout();
+    bSizer67->Fit( m_panelOverview );
+    m_notebookSettings->AddPage( m_panelOverview, _("Overview"), true );
+    m_panelBatchSettings = new wxPanel( m_notebookSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer117;
+    bSizer117 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer172;
+    bSizer172 = new wxBoxSizer( wxVERTICAL );
+
+    wxStaticBoxSizer* sbSizer24;
+    sbSizer24 = new wxStaticBoxSizer( new wxStaticBox( m_panelBatchSettings, wxID_ANY, _("Status feedback") ), wxVERTICAL );
+
+    m_checkBoxSilent = new wxCheckBox( m_panelBatchSettings, wxID_ANY, _("Run minimized"), wxDefaultPosition, wxDefaultSize, 0 );
+    sbSizer24->Add( m_checkBoxSilent, 0, wxALL|wxEXPAND, 5 );
+
+    bSizer172->Add( sbSizer24, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+
+    bSizer172->Add( 0, 5, 0, 0, 5 );
+
+    sbSizerLogfileDir = new wxStaticBoxSizer( new wxStaticBox( m_panelBatchSettings, wxID_ANY, _("Logging") ), wxVERTICAL );
+
+    wxBoxSizer* bSizer152;
+    bSizer152 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText96 = new wxStaticText( m_panelBatchSettings, wxID_ANY, _("Maximum number of logfiles:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText96->Wrap( -1 );
+    bSizer152->Add( m_staticText96, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+
+
+    bSizer152->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_spinCtrlLogCountMax = new wxSpinCtrl( m_panelBatchSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
+    bSizer152->Add( m_spinCtrlLogCountMax, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    sbSizerLogfileDir->Add( bSizer152, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
+
+    m_panelLogfile = new wxPanel( m_panelBatchSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer1721;
+    bSizer1721 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText94 = new wxStaticText( m_panelLogfile, wxID_ANY, _("Select logfile directory:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText94->Wrap( -1 );
+    bSizer1721->Add( m_staticText94, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+    wxBoxSizer* bSizer170;
+    bSizer170 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_textCtrlLogfileDir = new wxTextCtrl( m_panelLogfile, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer170->Add( m_textCtrlLogfileDir, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_dirPickerLogfileDir = new FfsDirPickerCtrl( m_panelLogfile, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_dirPickerLogfileDir->SetToolTip( _("Select a folder") );
+
+    bSizer170->Add( m_dirPickerLogfileDir, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer1721->Add( bSizer170, 0, wxEXPAND, 5 );
+
+    m_panelLogfile->SetSizer( bSizer1721 );
+    m_panelLogfile->Layout();
+    bSizer1721->Fit( m_panelLogfile );
+    sbSizerLogfileDir->Add( m_panelLogfile, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+    bSizer172->Add( sbSizerLogfileDir, 0, wxEXPAND, 5 );
+
+    bSizer117->Add( bSizer172, 1, wxEXPAND|wxALL, 10 );
+
+    m_panelBatchSettings->SetSizer( bSizer117 );
+    m_panelBatchSettings->Layout();
+    bSizer117->Fit( m_panelBatchSettings );
+    m_notebookSettings->AddPage( m_panelBatchSettings, _("Batch settings"), false );
+
+    bSizer69->Add( m_notebookSettings, 1, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer68;
+    bSizer68 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_buttonSave = new wxButton( this, wxID_SAVE, _("&Save"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_buttonSave->SetDefault();
+    m_buttonSave->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer68->Add( m_buttonSave, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+    m_buttonLoad = new wxButton( this, wxID_OPEN, _("&Load"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_buttonLoad->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer68->Add( m_buttonLoad, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    m_button6 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_button6->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer68->Add( m_button6, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer69->Add( bSizer68, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    bSizer54->Add( bSizer69, 1, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 5 );
+
+    this->SetSizer( bSizer54 );
+    this->Layout();
+    bSizer54->Fit( this );
+
+    this->Centre( wxBOTH );
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( BatchDlgGenerated::OnClose ) );
+    m_bpButtonHelp->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnHelp ), NULL, this );
+    m_bpButtonCmpConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnCmpSettings ), NULL, this );
+    m_bpButtonFilter->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnConfigureFilter ), NULL, this );
+    m_bpButtonSyncConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnSyncSettings ), NULL, this );
+    m_choiceHandleError->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( BatchDlgGenerated::OnChangeErrorHandling ), NULL, this );
+    m_bpButtonAddPair->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnAddFolderPair ), NULL, this );
+    m_bpButtonRemovePair->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnRemoveTopFolderPair ), NULL, this );
+    m_spinCtrlLogCountMax->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( BatchDlgGenerated::OnChangeMaxLogCountTxt ), NULL, this );
+    m_buttonSave->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnSaveBatchJob ), NULL, this );
+    m_buttonLoad->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnLoadBatchJob ), NULL, this );
+    m_button6->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnCancel ), NULL, this );
 }
 
-BatchFolderPairGenerated::~BatchFolderPairGenerated()
+BatchDlgGenerated::~BatchDlgGenerated()
 {
+    // Disconnect Events
+    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( BatchDlgGenerated::OnClose ) );
+    m_bpButtonHelp->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnHelp ), NULL, this );
+    m_bpButtonCmpConfig->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnCmpSettings ), NULL, this );
+    m_bpButtonFilter->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnConfigureFilter ), NULL, this );
+    m_bpButtonSyncConfig->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnSyncSettings ), NULL, this );
+    m_choiceHandleError->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( BatchDlgGenerated::OnChangeErrorHandling ), NULL, this );
+    m_bpButtonAddPair->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnAddFolderPair ), NULL, this );
+    m_bpButtonRemovePair->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnRemoveTopFolderPair ), NULL, this );
+    m_spinCtrlLogCountMax->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( BatchDlgGenerated::OnChangeMaxLogCountTxt ), NULL, this );
+    m_buttonSave->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnSaveBatchJob ), NULL, this );
+    m_buttonLoad->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnLoadBatchJob ), NULL, this );
+    m_button6->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnCancel ), NULL, this );
+
 }
 
-BatchDlgGenerated::BatchDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
+BatchFolderPairGenerated::BatchFolderPairGenerated( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
 {
-	this->SetSizeHints( wxSize( 560,320 ), wxDefaultSize );
-	
-	wxBoxSizer* bSizer54;
-	bSizer54 = new wxBoxSizer( wxVERTICAL );
-	
-	bSizer69 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer87;
-	bSizer87 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmap27 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), 0 );
-	bSizer87->Add( m_bitmap27, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_panel8 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER|wxTAB_TRAVERSAL );
-	m_panel8->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DLIGHT ) );
-	
-	wxBoxSizer* bSizer72;
-	bSizer72 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText56 = new wxStaticText( m_panel8, wxID_ANY, _("Batch job"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText56->Wrap( -1 );
-	m_staticText56->SetFont( wxFont( 16, 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer72->Add( m_staticText56, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_panel8->SetSizer( bSizer72 );
-	m_panel8->Layout();
-	bSizer72->Fit( m_panel8 );
-	bSizer87->Add( m_panel8, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	
-	bSizer87->Add( 5, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	wxBoxSizer* bSizer70;
-	bSizer70 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText44 = new wxStaticText( this, wxID_ANY, _("Create a batch file for automated synchronization. To start in batch mode simply double-click the file or execute via command line: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText44->Wrap( 460 );
-	bSizer70->Add( m_staticText44, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	m_bpButtonHelp = new wxBitmapButton( this, wxID_HELP, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	m_bpButtonHelp->SetToolTip( _("Help") );
-	
-	bSizer70->Add( m_bpButtonHelp, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
-	bSizer87->Add( bSizer70, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	bSizer69->Add( bSizer87, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_notebookSettings = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	m_panelOverview = new wxPanel( m_notebookSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer67;
-	bSizer67 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer120;
-	bSizer120 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer175;
-	bSizer175 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxStaticBoxSizer* sbSizer241;
-	sbSizer241 = new wxStaticBoxSizer( new wxStaticBox( m_panelOverview, wxID_ANY, _("Compare") ), wxHORIZONTAL );
-	
-	m_bpButtonCmpConfig = new wxBitmapButton( m_panelOverview, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,42 ), wxBU_AUTODRAW );
-	m_bpButtonCmpConfig->SetToolTip( _("Comparison settings") );
-	
-	sbSizer241->Add( m_bpButtonCmpConfig, 0, wxALIGN_CENTER_VERTICAL, 3 );
-	
-	
-	sbSizer241->Add( 10, 0, 0, 0, 5 );
-	
-	m_staticTextCmpVariant = new wxStaticText( m_panelOverview, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextCmpVariant->Wrap( -1 );
-	m_staticTextCmpVariant->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
-	m_staticTextCmpVariant->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
-	
-	sbSizer241->Add( m_staticTextCmpVariant, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer175->Add( sbSizer241, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer175->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	wxStaticBoxSizer* sbSizer26;
-	sbSizer26 = new wxStaticBoxSizer( new wxStaticBox( m_panelOverview, wxID_ANY, _("Filter files") ), wxVERTICAL );
-	
-	m_bpButtonFilter = new wxBitmapButton( m_panelOverview, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW|wxFULL_REPAINT_ON_RESIZE );
-	sbSizer26->Add( m_bpButtonFilter, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 15 );
-	
-	bSizer175->Add( sbSizer26, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer175->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	wxStaticBoxSizer* sbSizer252;
-	sbSizer252 = new wxStaticBoxSizer( new wxStaticBox( m_panelOverview, wxID_ANY, _("Synchronize...") ), wxHORIZONTAL );
-	
-	m_staticTextSyncVariant = new wxStaticText( m_panelOverview, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextSyncVariant->Wrap( -1 );
-	m_staticTextSyncVariant->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
-	m_staticTextSyncVariant->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
-	
-	sbSizer252->Add( m_staticTextSyncVariant, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	sbSizer252->Add( 10, 0, 0, 0, 5 );
-	
-	m_bpButtonSyncConfig = new wxBitmapButton( m_panelOverview, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,42 ), wxBU_AUTODRAW );
-	m_bpButtonSyncConfig->SetToolTip( _("Synchronization settings") );
-	
-	sbSizer252->Add( m_bpButtonSyncConfig, 0, wxALIGN_CENTER_VERTICAL, 3 );
-	
-	bSizer175->Add( sbSizer252, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer120->Add( bSizer175, 0, wxEXPAND, 5 );
-	
-	
-	bSizer120->Add( 0, 5, 0, 0, 5 );
-	
-	m_scrolledWindow6 = new wxScrolledWindow( m_panelOverview, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
-	m_scrolledWindow6->SetScrollRate( 5, 5 );
-	wxBoxSizer* bSizer141;
-	bSizer141 = new wxBoxSizer( wxVERTICAL );
-	
-	sbSizerMainPair = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_panelMainPair = new wxPanel( m_scrolledWindow6, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxDOUBLE_BORDER );
-	wxBoxSizer* bSizer147;
-	bSizer147 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer1361;
-	bSizer1361 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bpButtonAddPair = new wxBitmapButton( m_panelMainPair, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
-	m_bpButtonAddPair->SetToolTip( _("Add folder pair") );
-	
-	bSizer1361->Add( m_bpButtonAddPair, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 3 );
-	
-	m_bpButtonRemovePair = new wxBitmapButton( m_panelMainPair, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
-	m_bpButtonRemovePair->SetToolTip( _("Remove folder pair") );
-	
-	bSizer1361->Add( m_bpButtonRemovePair, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	bSizer147->Add( bSizer1361, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	wxBoxSizer* bSizer143;
-	bSizer143 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer145;
-	bSizer145 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText532 = new wxStaticText( m_panelMainPair, wxID_ANY, _("Left"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText532->Wrap( -1 );
-	m_staticText532->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer145->Add( m_staticText532, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer143->Add( bSizer145, 1, 0, 5 );
-	
-	wxBoxSizer* bSizer146;
-	bSizer146 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText5411 = new wxStaticText( m_panelMainPair, wxID_ANY, _("Right"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText5411->Wrap( -1 );
-	m_staticText5411->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer146->Add( m_staticText5411, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer143->Add( bSizer146, 1, 0, 5 );
-	
-	bSizer147->Add( bSizer143, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-	
-	m_panelMainPair->SetSizer( bSizer147 );
-	m_panelMainPair->Layout();
-	bSizer147->Fit( m_panelMainPair );
-	sbSizerMainPair->Add( m_panelMainPair, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM, 5 );
-	
-	wxBoxSizer* bSizer158;
-	bSizer158 = new wxBoxSizer( wxVERTICAL );
-	
-	m_panelLeft = new wxPanel( m_scrolledWindow6, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer1141;
-	bSizer1141 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_directoryLeft = new wxTextCtrl( m_panelLeft, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer1141->Add( m_directoryLeft, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_dirPickerLeft = new FfsDirPickerCtrl( m_panelLeft, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_dirPickerLeft->SetToolTip( _("Select a folder") );
-	
-	bSizer1141->Add( m_dirPickerLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonLocalFilter = new wxBitmapButton( m_panelLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
-	bSizer1141->Add( m_bpButtonLocalFilter, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_panelLeft->SetSizer( bSizer1141 );
-	m_panelLeft->Layout();
-	bSizer1141->Fit( m_panelLeft );
-	bSizer158->Add( m_panelLeft, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	m_panelRight = new wxPanel( m_scrolledWindow6, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer115;
-	bSizer115 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_directoryRight = new wxTextCtrl( m_panelRight, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer115->Add( m_directoryRight, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_dirPickerRight = new FfsDirPickerCtrl( m_panelRight, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_dirPickerRight->SetToolTip( _("Select a folder") );
-	
-	bSizer115->Add( m_dirPickerRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonAltSyncCfg = new wxBitmapButton( m_panelRight, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
-	bSizer115->Add( m_bpButtonAltSyncCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_panelRight->SetSizer( bSizer115 );
-	m_panelRight->Layout();
-	bSizer115->Fit( m_panelRight );
-	bSizer158->Add( m_panelRight, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	sbSizerMainPair->Add( bSizer158, 1, wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 );
-	
-	bSizer141->Add( sbSizerMainPair, 0, wxEXPAND, 5 );
-	
-	bSizerAddFolderPairs = new wxBoxSizer( wxVERTICAL );
-	
-	bSizer141->Add( bSizerAddFolderPairs, 1, wxEXPAND, 5 );
-	
-	m_scrolledWindow6->SetSizer( bSizer141 );
-	m_scrolledWindow6->Layout();
-	bSizer141->Fit( m_scrolledWindow6 );
-	bSizer120->Add( m_scrolledWindow6, 1, wxEXPAND, 5 );
-	
-	
-	bSizer120->Add( 0, 5, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	bSizer67->Add( bSizer120, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 10 );
-	
-	wxBoxSizer* bSizer171;
-	bSizer171 = new wxBoxSizer( wxVERTICAL );
-	
-	wxStaticBoxSizer* sbSizer25;
-	sbSizer25 = new wxStaticBoxSizer( new wxStaticBox( m_panelOverview, wxID_ANY, _("Error handling") ), wxHORIZONTAL );
-	
-	wxArrayString m_choiceHandleErrorChoices;
-	m_choiceHandleError = new wxChoice( m_panelOverview, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceHandleErrorChoices, 0 );
-	m_choiceHandleError->SetSelection( 0 );
-	sbSizer25->Add( m_choiceHandleError, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer171->Add( sbSizer25, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	bSizer67->Add( bSizer171, 0, wxTOP|wxBOTTOM|wxRIGHT, 10 );
-	
-	m_panelOverview->SetSizer( bSizer67 );
-	m_panelOverview->Layout();
-	bSizer67->Fit( m_panelOverview );
-	m_notebookSettings->AddPage( m_panelOverview, _("Overview"), true );
-	m_panelBatchSettings = new wxPanel( m_notebookSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer117;
-	bSizer117 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer172;
-	bSizer172 = new wxBoxSizer( wxVERTICAL );
-	
-	wxStaticBoxSizer* sbSizer24;
-	sbSizer24 = new wxStaticBoxSizer( new wxStaticBox( m_panelBatchSettings, wxID_ANY, _("Status feedback") ), wxVERTICAL );
-	
-	m_checkBoxSilent = new wxCheckBox( m_panelBatchSettings, wxID_ANY, _("Run minimized"), wxDefaultPosition, wxDefaultSize, 0 );
-	sbSizer24->Add( m_checkBoxSilent, 0, wxALL|wxEXPAND, 5 );
-	
-	bSizer172->Add( sbSizer24, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	
-	bSizer172->Add( 0, 5, 0, 0, 5 );
-	
-	sbSizerLogfileDir = new wxStaticBoxSizer( new wxStaticBox( m_panelBatchSettings, wxID_ANY, _("Logging") ), wxVERTICAL );
-	
-	wxBoxSizer* bSizer152;
-	bSizer152 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText96 = new wxStaticText( m_panelBatchSettings, wxID_ANY, _("Maximum number of logfiles:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText96->Wrap( -1 );
-	bSizer152->Add( m_staticText96, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
-	
-	bSizer152->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_spinCtrlLogCountMax = new wxSpinCtrl( m_panelBatchSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
-	bSizer152->Add( m_spinCtrlLogCountMax, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	sbSizerLogfileDir->Add( bSizer152, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
-	
-	m_panelLogfile = new wxPanel( m_panelBatchSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer1721;
-	bSizer1721 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText94 = new wxStaticText( m_panelLogfile, wxID_ANY, _("Select logfile directory:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText94->Wrap( -1 );
-	bSizer1721->Add( m_staticText94, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
-	
-	wxBoxSizer* bSizer170;
-	bSizer170 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_textCtrlLogfileDir = new wxTextCtrl( m_panelLogfile, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer170->Add( m_textCtrlLogfileDir, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_dirPickerLogfileDir = new FfsDirPickerCtrl( m_panelLogfile, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_dirPickerLogfileDir->SetToolTip( _("Select a folder") );
-	
-	bSizer170->Add( m_dirPickerLogfileDir, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer1721->Add( bSizer170, 0, wxEXPAND, 5 );
-	
-	m_panelLogfile->SetSizer( bSizer1721 );
-	m_panelLogfile->Layout();
-	bSizer1721->Fit( m_panelLogfile );
-	sbSizerLogfileDir->Add( m_panelLogfile, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	bSizer172->Add( sbSizerLogfileDir, 0, wxEXPAND, 5 );
-	
-	bSizer117->Add( bSizer172, 1, wxEXPAND|wxALL, 10 );
-	
-	m_panelBatchSettings->SetSizer( bSizer117 );
-	m_panelBatchSettings->Layout();
-	bSizer117->Fit( m_panelBatchSettings );
-	m_notebookSettings->AddPage( m_panelBatchSettings, _("Batch settings"), false );
-	
-	bSizer69->Add( m_notebookSettings, 1, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer68;
-	bSizer68 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_buttonSave = new wxButton( this, wxID_SAVE, _("&Save"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_buttonSave->SetDefault(); 
-	m_buttonSave->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer68->Add( m_buttonSave, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_buttonLoad = new wxButton( this, wxID_OPEN, _("&Load"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_buttonLoad->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer68->Add( m_buttonLoad, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	m_button6 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_button6->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer68->Add( m_button6, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer69->Add( bSizer68, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	bSizer54->Add( bSizer69, 1, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 5 );
-	
-	this->SetSizer( bSizer54 );
-	this->Layout();
-	bSizer54->Fit( this );
-	
-	this->Centre( wxBOTH );
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( BatchDlgGenerated::OnClose ) );
-	m_bpButtonHelp->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnHelp ), NULL, this );
-	m_bpButtonCmpConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnCmpSettings ), NULL, this );
-	m_bpButtonFilter->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnConfigureFilter ), NULL, this );
-	m_bpButtonSyncConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnSyncSettings ), NULL, this );
-	m_bpButtonAddPair->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnAddFolderPair ), NULL, this );
-	m_bpButtonRemovePair->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnRemoveTopFolderPair ), NULL, this );
-	m_choiceHandleError->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( BatchDlgGenerated::OnChangeErrorHandling ), NULL, this );
-	m_spinCtrlLogCountMax->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( BatchDlgGenerated::OnChangeMaxLogCountTxt ), NULL, this );
-	m_buttonSave->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnSaveBatchJob ), NULL, this );
-	m_buttonLoad->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnLoadBatchJob ), NULL, this );
-	m_button6->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnCancel ), NULL, this );
+    wxBoxSizer* bSizer142;
+    bSizer142 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer140;
+    bSizer140 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_panel32 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxDOUBLE_BORDER );
+    wxBoxSizer* bSizer147;
+    bSizer147 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer136;
+    bSizer136 = new wxBoxSizer( wxVERTICAL );
+
+    m_bpButtonRemovePair = new wxBitmapButton( m_panel32, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
+    m_bpButtonRemovePair->SetToolTip( _("Remove folder pair") );
+
+    bSizer136->Add( m_bpButtonRemovePair, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer147->Add( bSizer136, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    wxBoxSizer* bSizer143;
+    bSizer143 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer145;
+    bSizer145 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText53 = new wxStaticText( m_panel32, wxID_ANY, _("Left"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText53->Wrap( -1 );
+    m_staticText53->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer145->Add( m_staticText53, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer143->Add( bSizer145, 1, 0, 5 );
+
+    wxBoxSizer* bSizer146;
+    bSizer146 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText541 = new wxStaticText( m_panel32, wxID_ANY, _("Right"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText541->Wrap( -1 );
+    m_staticText541->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer146->Add( m_staticText541, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer143->Add( bSizer146, 1, 0, 5 );
+
+    bSizer147->Add( bSizer143, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
+
+    m_panel32->SetSizer( bSizer147 );
+    m_panel32->Layout();
+    bSizer147->Fit( m_panel32 );
+    bSizer140->Add( m_panel32, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer144;
+    bSizer144 = new wxBoxSizer( wxVERTICAL );
+
+    m_panelLeft = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer114;
+    bSizer114 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_directoryLeft = new FolderHistoryBox( m_panelLeft, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+    bSizer114->Add( m_directoryLeft, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_dirPickerLeft = new FfsDirPickerCtrl( m_panelLeft, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_dirPickerLeft->SetToolTip( _("Select a folder") );
+
+    bSizer114->Add( m_dirPickerLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_panelLeft->SetSizer( bSizer114 );
+    m_panelLeft->Layout();
+    bSizer114->Fit( m_panelLeft );
+    bSizer144->Add( m_panelLeft, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    m_panelRight = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer115;
+    bSizer115 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_directoryRight = new FolderHistoryBox( m_panelRight, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+    bSizer115->Add( m_directoryRight, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_dirPickerRight = new FfsDirPickerCtrl( m_panelRight, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_dirPickerRight->SetToolTip( _("Select a folder") );
+
+    bSizer115->Add( m_dirPickerRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_panelRight->SetSizer( bSizer115 );
+    m_panelRight->Layout();
+    bSizer115->Fit( m_panelRight );
+    bSizer144->Add( m_panelRight, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer140->Add( bSizer144, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    wxBoxSizer* bSizer176;
+    bSizer176 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bpButtonAltCompCfg = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
+    bSizer176->Add( m_bpButtonAltCompCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonLocalFilter = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
+    bSizer176->Add( m_bpButtonLocalFilter, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 3 );
+
+    m_bpButtonAltSyncCfg = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
+    bSizer176->Add( m_bpButtonAltSyncCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer140->Add( bSizer176, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+
+    bSizer142->Add( bSizer140, 0, wxEXPAND, 5 );
+
+
+    bSizer142->Add( 0, 5, 0, 0, 5 );
+
+    this->SetSizer( bSizer142 );
+    this->Layout();
+    bSizer142->Fit( this );
 }
 
-BatchDlgGenerated::~BatchDlgGenerated()
+BatchFolderPairGenerated::~BatchFolderPairGenerated()
 {
-	// Disconnect Events
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( BatchDlgGenerated::OnClose ) );
-	m_bpButtonHelp->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnHelp ), NULL, this );
-	m_bpButtonCmpConfig->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnCmpSettings ), NULL, this );
-	m_bpButtonFilter->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnConfigureFilter ), NULL, this );
-	m_bpButtonSyncConfig->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnSyncSettings ), NULL, this );
-	m_bpButtonAddPair->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnAddFolderPair ), NULL, this );
-	m_bpButtonRemovePair->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnRemoveTopFolderPair ), NULL, this );
-	m_choiceHandleError->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( BatchDlgGenerated::OnChangeErrorHandling ), NULL, this );
-	m_spinCtrlLogCountMax->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( BatchDlgGenerated::OnChangeMaxLogCountTxt ), NULL, this );
-	m_buttonSave->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnSaveBatchJob ), NULL, this );
-	m_buttonLoad->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnLoadBatchJob ), NULL, this );
-	m_button6->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnCancel ), NULL, this );
-	
 }
 
 CompareStatusGenerated::CompareStatusGenerated( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
 {
-	wxBoxSizer* bSizer40;
-	bSizer40 = new wxBoxSizer( wxVERTICAL );
-	
-	
-	bSizer40->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	bSizer42 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer157;
-	bSizer157 = new wxBoxSizer( wxVERTICAL );
-	
-	bSizerFilesFound = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText321 = new wxStaticText( this, wxID_ANY, _("Elements found:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText321->Wrap( -1 );
-	m_staticText321->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizerFilesFound->Add( m_staticText321, 0, wxALIGN_BOTTOM, 5 );
-	
-	m_staticTextScanned = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextScanned->Wrap( -1 );
-	m_staticTextScanned->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
-	
-	bSizerFilesFound->Add( m_staticTextScanned, 0, wxALIGN_BOTTOM|wxLEFT, 5 );
-	
-	bSizer157->Add( bSizerFilesFound, 0, 0, 5 );
-	
-	bSizerFilesRemaining = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText46 = new wxStaticText( this, wxID_ANY, _("Elements remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText46->Wrap( -1 );
-	m_staticText46->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizerFilesRemaining->Add( m_staticText46, 0, wxALIGN_BOTTOM, 5 );
-	
-	wxBoxSizer* bSizer154;
-	bSizer154 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticTextFilesRemaining = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextFilesRemaining->Wrap( -1 );
-	m_staticTextFilesRemaining->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
-	
-	bSizer154->Add( m_staticTextFilesRemaining, 0, wxALIGN_BOTTOM, 5 );
-	
-	m_staticText117 = new wxStaticText( this, wxID_ANY, _("("), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText117->Wrap( -1 );
-	m_staticText117->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
-	
-	bSizer154->Add( m_staticText117, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
-	
-	m_staticTextDataRemaining = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextDataRemaining->Wrap( -1 );
-	m_staticTextDataRemaining->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
-	
-	bSizer154->Add( m_staticTextDataRemaining, 0, wxALIGN_BOTTOM, 5 );
-	
-	m_staticText118 = new wxStaticText( this, wxID_ANY, _(")"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText118->Wrap( -1 );
-	m_staticText118->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
-	
-	bSizer154->Add( m_staticText118, 0, wxALIGN_BOTTOM, 5 );
-	
-	bSizerFilesRemaining->Add( bSizer154, 0, wxALIGN_BOTTOM|wxLEFT, 5 );
-	
-	bSizer157->Add( bSizerFilesRemaining, 0, 0, 5 );
-	
-	bSizer42->Add( bSizer157, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer42->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	sSizerSpeed = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText104 = new wxStaticText( this, wxID_ANY, _("Speed:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText104->Wrap( -1 );
-	m_staticText104->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	sSizerSpeed->Add( m_staticText104, 0, wxALIGN_BOTTOM, 5 );
-	
-	m_staticTextSpeed = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextSpeed->Wrap( -1 );
-	m_staticTextSpeed->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
-	
-	sSizerSpeed->Add( m_staticTextSpeed, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
-	
-	bSizer42->Add( sSizerSpeed, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer42->Add( 10, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	sSizerTimeRemaining = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticTextTimeRemFixed = new wxStaticText( this, wxID_ANY, _("Time remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextTimeRemFixed->Wrap( -1 );
-	m_staticTextTimeRemFixed->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	sSizerTimeRemaining->Add( m_staticTextTimeRemFixed, 0, wxALIGN_BOTTOM, 5 );
-	
-	m_staticTextTimeRemaining = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextTimeRemaining->Wrap( -1 );
-	m_staticTextTimeRemaining->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
-	
-	sSizerTimeRemaining->Add( m_staticTextTimeRemaining, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
-	
-	bSizer42->Add( sSizerTimeRemaining, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer42->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	sSizerTimeElapsed = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxStaticText* m_staticText37;
-	m_staticText37 = new wxStaticText( this, wxID_ANY, _("Time elapsed:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText37->Wrap( -1 );
-	m_staticText37->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	sSizerTimeElapsed->Add( m_staticText37, 0, wxALIGN_BOTTOM, 5 );
-	
-	m_staticTextTimeElapsed = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextTimeElapsed->Wrap( -1 );
-	m_staticTextTimeElapsed->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
-	
-	sSizerTimeElapsed->Add( m_staticTextTimeElapsed, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
-	
-	bSizer42->Add( sSizerTimeElapsed, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer40->Add( bSizer42, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	wxBoxSizer* bSizer48;
-	bSizer48 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText30 = new wxStaticText( this, wxID_ANY, _("Operation:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText30->Wrap( -1 );
-	m_staticText30->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer48->Add( m_staticText30, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_textCtrlStatus = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
-	m_textCtrlStatus->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-	
-	bSizer48->Add( m_textCtrlStatus, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer40->Add( bSizer48, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	m_gauge2 = new wxGauge( this, wxID_ANY, 100, wxDefaultPosition, wxSize( -1,14 ), wxGA_HORIZONTAL|wxGA_SMOOTH );
-	bSizer40->Add( m_gauge2, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
-	
-	
-	bSizer40->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	this->SetSizer( bSizer40 );
-	this->Layout();
-	bSizer40->Fit( this );
+    wxBoxSizer* bSizer40;
+    bSizer40 = new wxBoxSizer( wxVERTICAL );
+
+
+    bSizer40->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    bSizer42 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer157;
+    bSizer157 = new wxBoxSizer( wxVERTICAL );
+
+    bSizerFilesFound = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText321 = new wxStaticText( this, wxID_ANY, _("Elements found:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText321->Wrap( -1 );
+    m_staticText321->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizerFilesFound->Add( m_staticText321, 0, wxALIGN_BOTTOM, 5 );
+
+    m_staticTextScanned = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextScanned->Wrap( -1 );
+    m_staticTextScanned->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
+
+    bSizerFilesFound->Add( m_staticTextScanned, 0, wxALIGN_BOTTOM|wxLEFT, 5 );
+
+    bSizer157->Add( bSizerFilesFound, 0, 0, 5 );
+
+    bSizerFilesRemaining = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText46 = new wxStaticText( this, wxID_ANY, _("Elements remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText46->Wrap( -1 );
+    m_staticText46->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizerFilesRemaining->Add( m_staticText46, 0, wxALIGN_BOTTOM, 5 );
+
+    wxBoxSizer* bSizer154;
+    bSizer154 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticTextFilesRemaining = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextFilesRemaining->Wrap( -1 );
+    m_staticTextFilesRemaining->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
+
+    bSizer154->Add( m_staticTextFilesRemaining, 0, wxALIGN_BOTTOM, 5 );
+
+    m_staticText117 = new wxStaticText( this, wxID_ANY, _("("), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText117->Wrap( -1 );
+    m_staticText117->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
+
+    bSizer154->Add( m_staticText117, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
+
+    m_staticTextDataRemaining = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextDataRemaining->Wrap( -1 );
+    m_staticTextDataRemaining->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
+
+    bSizer154->Add( m_staticTextDataRemaining, 0, wxALIGN_BOTTOM, 5 );
+
+    m_staticText118 = new wxStaticText( this, wxID_ANY, _(")"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText118->Wrap( -1 );
+    m_staticText118->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
+
+    bSizer154->Add( m_staticText118, 0, wxALIGN_BOTTOM, 5 );
+
+    bSizerFilesRemaining->Add( bSizer154, 0, wxALIGN_BOTTOM|wxLEFT, 5 );
+
+    bSizer157->Add( bSizerFilesRemaining, 0, 0, 5 );
+
+    bSizer42->Add( bSizer157, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer42->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    sSizerSpeed = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText104 = new wxStaticText( this, wxID_ANY, _("Speed:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText104->Wrap( -1 );
+    m_staticText104->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    sSizerSpeed->Add( m_staticText104, 0, wxALIGN_BOTTOM, 5 );
+
+    m_staticTextSpeed = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextSpeed->Wrap( -1 );
+    m_staticTextSpeed->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
+
+    sSizerSpeed->Add( m_staticTextSpeed, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
+
+    bSizer42->Add( sSizerSpeed, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer42->Add( 10, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    sSizerTimeRemaining = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticTextTimeRemFixed = new wxStaticText( this, wxID_ANY, _("Time remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextTimeRemFixed->Wrap( -1 );
+    m_staticTextTimeRemFixed->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    sSizerTimeRemaining->Add( m_staticTextTimeRemFixed, 0, wxALIGN_BOTTOM, 5 );
+
+    m_staticTextTimeRemaining = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextTimeRemaining->Wrap( -1 );
+    m_staticTextTimeRemaining->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
+
+    sSizerTimeRemaining->Add( m_staticTextTimeRemaining, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
+
+    bSizer42->Add( sSizerTimeRemaining, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer42->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    sSizerTimeElapsed = new wxBoxSizer( wxHORIZONTAL );
+
+    wxStaticText* m_staticText37;
+    m_staticText37 = new wxStaticText( this, wxID_ANY, _("Time elapsed:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText37->Wrap( -1 );
+    m_staticText37->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    sSizerTimeElapsed->Add( m_staticText37, 0, wxALIGN_BOTTOM, 5 );
+
+    m_staticTextTimeElapsed = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextTimeElapsed->Wrap( -1 );
+    m_staticTextTimeElapsed->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
+
+    sSizerTimeElapsed->Add( m_staticTextTimeElapsed, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
+
+    bSizer42->Add( sSizerTimeElapsed, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer40->Add( bSizer42, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+    wxBoxSizer* bSizer48;
+    bSizer48 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText30 = new wxStaticText( this, wxID_ANY, _("Operation:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText30->Wrap( -1 );
+    m_staticText30->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer48->Add( m_staticText30, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_textCtrlStatus = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
+    m_textCtrlStatus->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+
+    bSizer48->Add( m_textCtrlStatus, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer40->Add( bSizer48, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+    m_gauge2 = new wxGauge( this, wxID_ANY, 100, wxDefaultPosition, wxSize( -1,14 ), wxGA_HORIZONTAL|wxGA_SMOOTH );
+    bSizer40->Add( m_gauge2, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
+
+
+    bSizer40->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    this->SetSizer( bSizer40 );
+    this->Layout();
+    bSizer40->Fit( this );
 }
 
 CompareStatusGenerated::~CompareStatusGenerated()
@@ -1544,2307 +1558,2138 @@ CompareStatusGenerated::~CompareStatusGenerated()
 
 SyncCfgDlgGenerated::SyncCfgDlgGenerated( 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* bSizer7;
-	bSizer7 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer181;
-	bSizer181 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer29;
-	bSizer29 = new wxBoxSizer( wxVERTICAL );
-	
-	wxStaticBoxSizer* sbSizer7;
-	sbSizer7 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxEmptyString ), wxVERTICAL );
-	
-	m_staticText1 = new wxStaticText( this, wxID_ANY, _("Select variant:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText1->Wrap( -1 );
-	m_staticText1->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
-	
-	sbSizer7->Add( m_staticText1, 0, wxALL, 5 );
-	
-	wxFlexGridSizer* fgSizer1;
-	fgSizer1 = new wxFlexGridSizer( 4, 3, 8, 5 );
-	fgSizer1->SetFlexibleDirection( wxHORIZONTAL );
-	fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	m_radioBtnAutomatic = new wxRadioButton( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_radioBtnAutomatic->SetValue( true ); 
-	m_radioBtnAutomatic->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
-	
-	fgSizer1->Add( m_radioBtnAutomatic, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_buttonAutomatic = new wxButton( this, wxID_ANY, _("<Automatic>"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_buttonAutomatic->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
-	
-	fgSizer1->Add( m_buttonAutomatic, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	m_staticText81 = new wxStaticText( this, wxID_ANY, _("Identify and propagate changes on both sides using a database. Deletions and conflicts are detected automatically."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText81->Wrap( 400 );
-	fgSizer1->Add( m_staticText81, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
-	m_radioBtnMirror = new wxRadioButton( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_radioBtnMirror->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
-	
-	fgSizer1->Add( m_radioBtnMirror, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_buttonOneWay = new wxButton( this, wxID_ANY, _("Mirror ->>"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_buttonOneWay->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
-	
-	fgSizer1->Add( m_buttonOneWay, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	m_staticText8 = new wxStaticText( this, wxID_ANY, _("Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText8->Wrap( 400 );
-	fgSizer1->Add( m_staticText8, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_radioBtnUpdate = new wxRadioButton( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_radioBtnUpdate->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
-	
-	fgSizer1->Add( m_radioBtnUpdate, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_buttonUpdate = new wxButton( this, wxID_ANY, _("Update ->"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_buttonUpdate->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
-	
-	fgSizer1->Add( m_buttonUpdate, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	m_staticText101 = new wxStaticText( this, wxID_ANY, _("Copy new or updated files to right folder."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText101->Wrap( 400 );
-	fgSizer1->Add( m_staticText101, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
-	m_radioBtnCustom = new wxRadioButton( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_radioBtnCustom->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
-	
-	fgSizer1->Add( m_radioBtnCustom, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_buttonUpdate1 = new wxButton( this, wxID_ANY, _("Custom"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_buttonUpdate1->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
-	
-	fgSizer1->Add( m_buttonUpdate1, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	m_staticText9 = new wxStaticText( this, wxID_ANY, _("Configure your own synchronization rules."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText9->Wrap( 400 );
-	fgSizer1->Add( m_staticText9, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
-	sbSizer7->Add( fgSizer1, 0, 0, 5 );
-	
-	bSizer29->Add( sbSizer7, 0, wxEXPAND, 5 );
-	
-	
-	bSizer29->Add( 0, 5, 1, 0, 5 );
-	
-	bSizer201 = new wxBoxSizer( wxHORIZONTAL );
-	
-	sbSizerErrorHandling = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Error handling") ), wxHORIZONTAL );
-	
-	wxArrayString m_choiceHandleErrorChoices;
-	m_choiceHandleError = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceHandleErrorChoices, 0 );
-	m_choiceHandleError->SetSelection( 0 );
-	sbSizerErrorHandling->Add( m_choiceHandleError, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer201->Add( sbSizerErrorHandling, 0, wxEXPAND|wxRIGHT, 10 );
-	
-	sbSizerCustDelDir = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Deletion handling") ), wxVERTICAL );
-	
-	wxArrayString m_choiceHandleDeletionChoices;
-	m_choiceHandleDeletion = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceHandleDeletionChoices, 0 );
-	m_choiceHandleDeletion->SetSelection( 0 );
-	sbSizerCustDelDir->Add( m_choiceHandleDeletion, 0, wxBOTTOM, 5 );
-	
-	m_panelCustomDeletionDir = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer1151;
-	bSizer1151 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_textCtrlCustomDelFolder = new wxTextCtrl( m_panelCustomDeletionDir, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_textCtrlCustomDelFolder->SetMinSize( wxSize( 200,-1 ) );
-	
-	bSizer1151->Add( m_textCtrlCustomDelFolder, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_dirPickerCustomDelFolder = new FfsDirPickerCtrl( m_panelCustomDeletionDir, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer1151->Add( m_dirPickerCustomDelFolder, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_panelCustomDeletionDir->SetSizer( bSizer1151 );
-	m_panelCustomDeletionDir->Layout();
-	bSizer1151->Fit( m_panelCustomDeletionDir );
-	sbSizerCustDelDir->Add( m_panelCustomDeletionDir, 0, 0, 5 );
-	
-	bSizer201->Add( sbSizerCustDelDir, 0, wxEXPAND, 5 );
-	
-	bSizer29->Add( bSizer201, 0, wxTOP|wxBOTTOM, 5 );
-	
-	wxBoxSizer* bSizer291;
-	bSizer291 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_buttonOK = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_buttonOK->SetDefault(); 
-	m_buttonOK->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer291->Add( m_buttonOK, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	m_button16 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_button16->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer291->Add( m_button16, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer291->Add( 20, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer29->Add( bSizer291, 0, wxEXPAND, 5 );
-	
-	bSizer181->Add( bSizer29, 0, wxEXPAND, 5 );
-	
-	
-	bSizer181->Add( 10, 0, 0, 0, 5 );
-	
-	wxStaticBoxSizer* sbSizer2453245;
-	sbSizer2453245 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Configuration") ), wxVERTICAL );
-	
-	
-	sbSizer2453245->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_bitmapDatabase = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 70,70 ), 0 );
-	sbSizer2453245->Add( m_bitmapDatabase, 1, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 10 );
-	
-	sbSizerSyncDirections = new wxBoxSizer( wxVERTICAL );
-	
-	wxGridSizer* gSizer3;
-	gSizer3 = new wxGridSizer( 1, 2, 0, 5 );
-	
-	m_staticText21 = new wxStaticText( this, wxID_ANY, _("Category"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText21->Wrap( -1 );
-	m_staticText21->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
-	
-	gSizer3->Add( m_staticText21, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticText31 = new wxStaticText( this, wxID_ANY, _("Action"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText31->Wrap( -1 );
-	m_staticText31->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
-	
-	gSizer3->Add( m_staticText31, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	sbSizerSyncDirections->Add( gSizer3, 0, wxEXPAND, 5 );
-	
-	m_staticline3 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	sbSizerSyncDirections->Add( m_staticline3, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP|wxBOTTOM, 5 );
-	
-	wxBoxSizer* bSizer121;
-	bSizer121 = new wxBoxSizer( wxVERTICAL );
-	
-	bSizerLeftOnly = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapLeftOnly = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
-	m_bitmapLeftOnly->SetToolTip( _("File/folder exists on left side only") );
-	
-	bSizerLeftOnly->Add( m_bitmapLeftOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerLeftOnly->Add( 5, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonLeftOnly = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizerLeftOnly->Add( m_bpButtonLeftOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer121->Add( bSizerLeftOnly, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	bSizerRightOnly = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapRightOnly = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
-	m_bitmapRightOnly->SetToolTip( _("File/folder exists on right side only") );
-	
-	bSizerRightOnly->Add( m_bitmapRightOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerRightOnly->Add( 5, 0, 0, 0, 5 );
-	
-	m_bpButtonRightOnly = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizerRightOnly->Add( m_bpButtonRightOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer121->Add( bSizerRightOnly, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	bSizerLeftNewer = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapLeftNewer = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
-	m_bitmapLeftNewer->SetToolTip( _("Left file is newer") );
-	
-	bSizerLeftNewer->Add( m_bitmapLeftNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerLeftNewer->Add( 5, 0, 0, 0, 5 );
-	
-	m_bpButtonLeftNewer = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizerLeftNewer->Add( m_bpButtonLeftNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer121->Add( bSizerLeftNewer, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	bSizerRightNewer = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapRightNewer = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
-	m_bitmapRightNewer->SetToolTip( _("Right file is newer") );
-	
-	bSizerRightNewer->Add( m_bitmapRightNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerRightNewer->Add( 5, 0, 0, 0, 5 );
-	
-	m_bpButtonRightNewer = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizerRightNewer->Add( m_bpButtonRightNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer121->Add( bSizerRightNewer, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	bSizerDifferent = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapDifferent = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
-	m_bitmapDifferent->SetToolTip( _("Files have different content") );
-	
-	bSizerDifferent->Add( m_bitmapDifferent, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerDifferent->Add( 5, 0, 0, 0, 5 );
-	
-	m_bpButtonDifferent = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizerDifferent->Add( m_bpButtonDifferent, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer121->Add( bSizerDifferent, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	bSizerConflict = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapConflict = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
-	m_bitmapConflict->SetToolTip( _("Conflict/file cannot be categorized") );
-	
-	bSizerConflict->Add( m_bitmapConflict, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerConflict->Add( 5, 0, 0, 0, 5 );
-	
-	m_bpButtonConflict = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizerConflict->Add( m_bpButtonConflict, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer121->Add( bSizerConflict, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	sbSizerSyncDirections->Add( bSizer121, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	sbSizer2453245->Add( sbSizerSyncDirections, 0, wxEXPAND, 5 );
-	
-	
-	sbSizer2453245->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	bSizer181->Add( sbSizer2453245, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	bSizer7->Add( bSizer181, 0, wxALL, 5 );
-	
-	this->SetSizer( bSizer7 );
-	this->Layout();
-	bSizer7->Fit( this );
-	
-	this->Centre( wxBOTH );
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SyncCfgDlgGenerated::OnClose ) );
-	m_radioBtnAutomatic->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncAutomatic ), NULL, this );
-	m_buttonAutomatic->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncAutomatic ), NULL, this );
-	m_buttonAutomatic->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncAutomaticDouble ), NULL, this );
-	m_radioBtnMirror->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncMirror ), NULL, this );
-	m_buttonOneWay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncMirror ), NULL, this );
-	m_buttonOneWay->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncMirrorDouble ), NULL, this );
-	m_radioBtnUpdate->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncUpdate ), NULL, this );
-	m_buttonUpdate->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncUpdate ), NULL, this );
-	m_buttonUpdate->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncUpdateDouble ), NULL, this );
-	m_radioBtnCustom->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncCustom ), NULL, this );
-	m_buttonUpdate1->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncCustom ), NULL, this );
-	m_buttonUpdate1->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncCustomDouble ), NULL, this );
-	m_choiceHandleError->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnChangeErrorHandling ), NULL, this );
-	m_choiceHandleDeletion->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnChangeDeletionHandling ), NULL, this );
-	m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnApply ), NULL, this );
-	m_button16->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnCancel ), NULL, this );
-	m_bpButtonLeftOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnExLeftSideOnly ), NULL, this );
-	m_bpButtonRightOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnExRightSideOnly ), NULL, this );
-	m_bpButtonLeftNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnLeftNewer ), NULL, this );
-	m_bpButtonRightNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnRightNewer ), NULL, this );
-	m_bpButtonDifferent->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnDifferent ), NULL, this );
-	m_bpButtonConflict->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnConflict ), NULL, this );
+    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+
+    wxBoxSizer* bSizer7;
+    bSizer7 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer181;
+    bSizer181 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer29;
+    bSizer29 = new wxBoxSizer( wxVERTICAL );
+
+    wxStaticBoxSizer* sbSizer7;
+    sbSizer7 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxEmptyString ), wxVERTICAL );
+
+    m_staticText1 = new wxStaticText( this, wxID_ANY, _("Select variant:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText1->Wrap( -1 );
+    m_staticText1->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
+
+    sbSizer7->Add( m_staticText1, 0, wxALL, 5 );
+
+    wxFlexGridSizer* fgSizer1;
+    fgSizer1 = new wxFlexGridSizer( 4, 3, 8, 5 );
+    fgSizer1->SetFlexibleDirection( wxHORIZONTAL );
+    fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    m_radioBtnAutomatic = new wxRadioButton( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    m_radioBtnAutomatic->SetValue( true );
+    m_radioBtnAutomatic->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
+
+    fgSizer1->Add( m_radioBtnAutomatic, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_buttonAutomatic = new wxButton( this, wxID_ANY, _("<Automatic>"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+    m_buttonAutomatic->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
+
+    fgSizer1->Add( m_buttonAutomatic, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    m_staticText81 = new wxStaticText( this, wxID_ANY, _("Identify and propagate changes on both sides using a database. Deletions and conflicts are detected automatically."), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText81->Wrap( 400 );
+    fgSizer1->Add( m_staticText81, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+
+    m_radioBtnMirror = new wxRadioButton( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    m_radioBtnMirror->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
+
+    fgSizer1->Add( m_radioBtnMirror, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_buttonOneWay = new wxButton( this, wxID_ANY, _("Mirror ->>"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+    m_buttonOneWay->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
+
+    fgSizer1->Add( m_buttonOneWay, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    m_staticText8 = new wxStaticText( this, wxID_ANY, _("Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization."), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText8->Wrap( 400 );
+    fgSizer1->Add( m_staticText8, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_radioBtnUpdate = new wxRadioButton( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    m_radioBtnUpdate->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
+
+    fgSizer1->Add( m_radioBtnUpdate, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_buttonUpdate = new wxButton( this, wxID_ANY, _("Update ->"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+    m_buttonUpdate->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
+
+    fgSizer1->Add( m_buttonUpdate, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    m_staticText101 = new wxStaticText( this, wxID_ANY, _("Copy new or updated files to right folder."), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText101->Wrap( 400 );
+    fgSizer1->Add( m_staticText101, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+
+    m_radioBtnCustom = new wxRadioButton( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    m_radioBtnCustom->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
+
+    fgSizer1->Add( m_radioBtnCustom, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_buttonUpdate1 = new wxButton( this, wxID_ANY, _("Custom"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+    m_buttonUpdate1->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
+
+    fgSizer1->Add( m_buttonUpdate1, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    m_staticText9 = new wxStaticText( this, wxID_ANY, _("Configure your own synchronization rules."), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText9->Wrap( 400 );
+    fgSizer1->Add( m_staticText9, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+
+    sbSizer7->Add( fgSizer1, 0, 0, 5 );
+
+    bSizer29->Add( sbSizer7, 0, wxEXPAND, 5 );
+
+
+    bSizer29->Add( 0, 5, 1, 0, 5 );
+
+    bSizer201 = new wxBoxSizer( wxHORIZONTAL );
+
+    sbSizerErrorHandling = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Error handling") ), wxHORIZONTAL );
+
+    wxArrayString m_choiceHandleErrorChoices;
+    m_choiceHandleError = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceHandleErrorChoices, 0 );
+    m_choiceHandleError->SetSelection( 0 );
+    sbSizerErrorHandling->Add( m_choiceHandleError, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer201->Add( sbSizerErrorHandling, 0, wxEXPAND|wxRIGHT, 10 );
+
+    sbSizerCustDelDir = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Deletion handling") ), wxVERTICAL );
+
+    wxArrayString m_choiceHandleDeletionChoices;
+    m_choiceHandleDeletion = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceHandleDeletionChoices, 0 );
+    m_choiceHandleDeletion->SetSelection( 0 );
+    sbSizerCustDelDir->Add( m_choiceHandleDeletion, 0, wxBOTTOM, 5 );
+
+    m_panelCustomDeletionDir = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer1151;
+    bSizer1151 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_customDelFolder = new FolderHistoryBox( m_panelCustomDeletionDir, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+    bSizer1151->Add( m_customDelFolder, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_dirPickerCustomDelFolder = new FfsDirPickerCtrl( m_panelCustomDeletionDir, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer1151->Add( m_dirPickerCustomDelFolder, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_panelCustomDeletionDir->SetSizer( bSizer1151 );
+    m_panelCustomDeletionDir->Layout();
+    bSizer1151->Fit( m_panelCustomDeletionDir );
+    sbSizerCustDelDir->Add( m_panelCustomDeletionDir, 0, wxEXPAND, 5 );
+
+    bSizer201->Add( sbSizerCustDelDir, 1, wxEXPAND, 5 );
+
+    bSizer29->Add( bSizer201, 0, wxTOP|wxBOTTOM|wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer291;
+    bSizer291 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_buttonOK = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_buttonOK->SetDefault();
+    m_buttonOK->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer291->Add( m_buttonOK, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+    m_button16 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_button16->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer291->Add( m_button16, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer291->Add( 20, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer29->Add( bSizer291, 0, wxEXPAND, 5 );
+
+    bSizer181->Add( bSizer29, 0, wxEXPAND, 5 );
+
+
+    bSizer181->Add( 10, 0, 0, 0, 5 );
+
+    wxStaticBoxSizer* sbSizer2453245;
+    sbSizer2453245 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Configuration") ), wxVERTICAL );
+
+
+    sbSizer2453245->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_bitmapDatabase = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 70,70 ), 0 );
+    sbSizer2453245->Add( m_bitmapDatabase, 1, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 10 );
+
+    sbSizerSyncDirections = new wxBoxSizer( wxVERTICAL );
+
+    wxGridSizer* gSizer3;
+    gSizer3 = new wxGridSizer( 1, 2, 0, 5 );
+
+    m_staticText21 = new wxStaticText( this, wxID_ANY, _("Category"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText21->Wrap( -1 );
+    m_staticText21->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
+
+    gSizer3->Add( m_staticText21, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticText31 = new wxStaticText( this, wxID_ANY, _("Action"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText31->Wrap( -1 );
+    m_staticText31->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
+
+    gSizer3->Add( m_staticText31, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    sbSizerSyncDirections->Add( gSizer3, 0, wxEXPAND, 5 );
+
+    m_staticline3 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    sbSizerSyncDirections->Add( m_staticline3, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP|wxBOTTOM, 5 );
+
+    wxBoxSizer* bSizer121;
+    bSizer121 = new wxBoxSizer( wxVERTICAL );
+
+    bSizerLeftOnly = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapLeftOnly = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
+    m_bitmapLeftOnly->SetToolTip( _("File/folder exists on left side only") );
+
+    bSizerLeftOnly->Add( m_bitmapLeftOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerLeftOnly->Add( 5, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonLeftOnly = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
+    bSizerLeftOnly->Add( m_bpButtonLeftOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer121->Add( bSizerLeftOnly, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    bSizerRightOnly = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapRightOnly = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
+    m_bitmapRightOnly->SetToolTip( _("File/folder exists on right side only") );
+
+    bSizerRightOnly->Add( m_bitmapRightOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerRightOnly->Add( 5, 0, 0, 0, 5 );
+
+    m_bpButtonRightOnly = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
+    bSizerRightOnly->Add( m_bpButtonRightOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer121->Add( bSizerRightOnly, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    bSizerLeftNewer = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapLeftNewer = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
+    m_bitmapLeftNewer->SetToolTip( _("Left file is newer") );
+
+    bSizerLeftNewer->Add( m_bitmapLeftNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerLeftNewer->Add( 5, 0, 0, 0, 5 );
+
+    m_bpButtonLeftNewer = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
+    bSizerLeftNewer->Add( m_bpButtonLeftNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer121->Add( bSizerLeftNewer, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    bSizerRightNewer = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapRightNewer = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
+    m_bitmapRightNewer->SetToolTip( _("Right file is newer") );
+
+    bSizerRightNewer->Add( m_bitmapRightNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerRightNewer->Add( 5, 0, 0, 0, 5 );
+
+    m_bpButtonRightNewer = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
+    bSizerRightNewer->Add( m_bpButtonRightNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer121->Add( bSizerRightNewer, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    bSizerDifferent = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapDifferent = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
+    m_bitmapDifferent->SetToolTip( _("Files have different content") );
+
+    bSizerDifferent->Add( m_bitmapDifferent, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerDifferent->Add( 5, 0, 0, 0, 5 );
+
+    m_bpButtonDifferent = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
+    bSizerDifferent->Add( m_bpButtonDifferent, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer121->Add( bSizerDifferent, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    bSizerConflict = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapConflict = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
+    m_bitmapConflict->SetToolTip( _("Conflict/file cannot be categorized") );
+
+    bSizerConflict->Add( m_bitmapConflict, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerConflict->Add( 5, 0, 0, 0, 5 );
+
+    m_bpButtonConflict = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
+    bSizerConflict->Add( m_bpButtonConflict, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer121->Add( bSizerConflict, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    sbSizerSyncDirections->Add( bSizer121, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    sbSizer2453245->Add( sbSizerSyncDirections, 0, wxEXPAND, 5 );
+
+
+    sbSizer2453245->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    bSizer181->Add( sbSizer2453245, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    bSizer7->Add( bSizer181, 0, wxALL, 5 );
+
+    this->SetSizer( bSizer7 );
+    this->Layout();
+    bSizer7->Fit( this );
+
+    this->Centre( wxBOTH );
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SyncCfgDlgGenerated::OnClose ) );
+    m_radioBtnAutomatic->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncAutomatic ), NULL, this );
+    m_buttonAutomatic->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncAutomatic ), NULL, this );
+    m_buttonAutomatic->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncAutomaticDouble ), NULL, this );
+    m_radioBtnMirror->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncMirror ), NULL, this );
+    m_buttonOneWay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncMirror ), NULL, this );
+    m_buttonOneWay->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncMirrorDouble ), NULL, this );
+    m_radioBtnUpdate->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncUpdate ), NULL, this );
+    m_buttonUpdate->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncUpdate ), NULL, this );
+    m_buttonUpdate->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncUpdateDouble ), NULL, this );
+    m_radioBtnCustom->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncCustom ), NULL, this );
+    m_buttonUpdate1->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncCustom ), NULL, this );
+    m_buttonUpdate1->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncCustomDouble ), NULL, this );
+    m_choiceHandleError->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnChangeErrorHandling ), NULL, this );
+    m_choiceHandleDeletion->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnChangeDeletionHandling ), NULL, this );
+    m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnApply ), NULL, this );
+    m_button16->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnCancel ), NULL, this );
+    m_bpButtonLeftOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnExLeftSideOnly ), NULL, this );
+    m_bpButtonRightOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnExRightSideOnly ), NULL, this );
+    m_bpButtonLeftNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnLeftNewer ), NULL, this );
+    m_bpButtonRightNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnRightNewer ), NULL, this );
+    m_bpButtonDifferent->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnDifferent ), NULL, this );
+    m_bpButtonConflict->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnConflict ), NULL, this );
 }
 
 SyncCfgDlgGenerated::~SyncCfgDlgGenerated()
 {
-	// Disconnect Events
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SyncCfgDlgGenerated::OnClose ) );
-	m_radioBtnAutomatic->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncAutomatic ), NULL, this );
-	m_buttonAutomatic->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncAutomatic ), NULL, this );
-	m_buttonAutomatic->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncAutomaticDouble ), NULL, this );
-	m_radioBtnMirror->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncMirror ), NULL, this );
-	m_buttonOneWay->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncMirror ), NULL, this );
-	m_buttonOneWay->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncMirrorDouble ), NULL, this );
-	m_radioBtnUpdate->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncUpdate ), NULL, this );
-	m_buttonUpdate->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncUpdate ), NULL, this );
-	m_buttonUpdate->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncUpdateDouble ), NULL, this );
-	m_radioBtnCustom->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncCustom ), NULL, this );
-	m_buttonUpdate1->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncCustom ), NULL, this );
-	m_buttonUpdate1->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncCustomDouble ), NULL, this );
-	m_choiceHandleError->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnChangeErrorHandling ), NULL, this );
-	m_choiceHandleDeletion->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnChangeDeletionHandling ), NULL, this );
-	m_buttonOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnApply ), NULL, this );
-	m_button16->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnCancel ), NULL, this );
-	m_bpButtonLeftOnly->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnExLeftSideOnly ), NULL, this );
-	m_bpButtonRightOnly->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnExRightSideOnly ), NULL, this );
-	m_bpButtonLeftNewer->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnLeftNewer ), NULL, this );
-	m_bpButtonRightNewer->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnRightNewer ), NULL, this );
-	m_bpButtonDifferent->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnDifferent ), NULL, this );
-	m_bpButtonConflict->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnConflict ), NULL, this );
-	
+    // Disconnect Events
+    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SyncCfgDlgGenerated::OnClose ) );
+    m_radioBtnAutomatic->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncAutomatic ), NULL, this );
+    m_buttonAutomatic->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncAutomatic ), NULL, this );
+    m_buttonAutomatic->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncAutomaticDouble ), NULL, this );
+    m_radioBtnMirror->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncMirror ), NULL, this );
+    m_buttonOneWay->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncMirror ), NULL, this );
+    m_buttonOneWay->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncMirrorDouble ), NULL, this );
+    m_radioBtnUpdate->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncUpdate ), NULL, this );
+    m_buttonUpdate->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncUpdate ), NULL, this );
+    m_buttonUpdate->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncUpdateDouble ), NULL, this );
+    m_radioBtnCustom->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncCustom ), NULL, this );
+    m_buttonUpdate1->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncCustom ), NULL, this );
+    m_buttonUpdate1->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncCustomDouble ), NULL, this );
+    m_choiceHandleError->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnChangeErrorHandling ), NULL, this );
+    m_choiceHandleDeletion->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnChangeDeletionHandling ), NULL, this );
+    m_buttonOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnApply ), NULL, this );
+    m_button16->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnCancel ), NULL, this );
+    m_bpButtonLeftOnly->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnExLeftSideOnly ), NULL, this );
+    m_bpButtonRightOnly->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnExRightSideOnly ), NULL, this );
+    m_bpButtonLeftNewer->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnLeftNewer ), NULL, this );
+    m_bpButtonRightNewer->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnRightNewer ), NULL, this );
+    m_bpButtonDifferent->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnDifferent ), NULL, this );
+    m_bpButtonConflict->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnConflict ), NULL, this );
+
 }
 
 CmpCfgDlgGenerated::CmpCfgDlgGenerated( 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* bSizer136;
-	bSizer136 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer55;
-	bSizer55 = new wxBoxSizer( wxVERTICAL );
-	
-	wxStaticBoxSizer* sbSizer6;
-	sbSizer6 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Compare by...") ), wxHORIZONTAL );
-	
-	wxFlexGridSizer* fgSizer16;
-	fgSizer16 = new wxFlexGridSizer( 2, 3, 0, 0 );
-	fgSizer16->SetFlexibleDirection( wxBOTH );
-	fgSizer16->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	m_radioBtnSizeDate = new wxRadioButton( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
-	m_radioBtnSizeDate->SetValue( true ); 
-	m_radioBtnSizeDate->SetToolTip( _("Files are found equal if\n     - file size\n     - last write time and date\nare the same") );
-	
-	fgSizer16->Add( m_radioBtnSizeDate, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bitmapByTime = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_bitmapByTime->SetToolTip( _("Files are found equal if\n     - file size\n     - last write time and date\nare the same") );
-	
-	fgSizer16->Add( m_bitmapByTime, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_buttonTimeSize = new wxButton( this, wxID_ANY, _("File size and date"), wxDefaultPosition, wxSize( -1,42 ), 0 );
-	m_buttonTimeSize->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
-	m_buttonTimeSize->SetToolTip( _("Files are found equal if\n     - file size\n     - last write time and date\nare the same") );
-	
-	fgSizer16->Add( m_buttonTimeSize, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALL, 5 );
-	
-	m_radioBtnContent = new wxRadioButton( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_radioBtnContent->SetToolTip( _("Files are found equal if\n     - file content\nis the same") );
-	
-	fgSizer16->Add( m_radioBtnContent, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bitmapByContent = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_bitmapByContent->SetToolTip( _("Files are found equal if\n     - file content\nis the same") );
-	
-	fgSizer16->Add( m_bitmapByContent, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_buttonContent = new wxButton( this, wxID_ANY, _("File content"), wxDefaultPosition, wxSize( -1,42 ), 0 );
-	m_buttonContent->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
-	m_buttonContent->SetToolTip( _("Files are found equal if\n     - file content\nis the same") );
-	
-	fgSizer16->Add( m_buttonContent, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	sbSizer6->Add( fgSizer16, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	m_staticline14 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-	sbSizer6->Add( m_staticline14, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
-	
-	m_bpButtonHelp = new wxBitmapButton( this, wxID_HELP, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	m_bpButtonHelp->SetToolTip( _("Help") );
-	
-	sbSizer6->Add( m_bpButtonHelp, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer55->Add( sbSizer6, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 2 );
-	
-	
-	bSizer55->Add( 0, 4, 0, 0, 5 );
-	
-	wxStaticBoxSizer* sbSizer25;
-	sbSizer25 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Symbolic Link handling") ), wxVERTICAL );
-	
-	wxArrayString m_choiceHandleSymlinksChoices;
-	m_choiceHandleSymlinks = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceHandleSymlinksChoices, 0 );
-	m_choiceHandleSymlinks->SetSelection( 0 );
-	sbSizer25->Add( m_choiceHandleSymlinks, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	bSizer55->Add( sbSizer25, 0, wxEXPAND|wxTOP, 5 );
-	
-	wxBoxSizer* bSizer22;
-	bSizer22 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_button10 = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_button10->SetDefault(); 
-	m_button10->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer22->Add( m_button10, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_button6 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_button6->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer22->Add( m_button6, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer55->Add( bSizer22, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	bSizer136->Add( bSizer55, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	this->SetSizer( bSizer136 );
-	this->Layout();
-	bSizer136->Fit( this );
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CmpCfgDlgGenerated::OnClose ) );
-	m_radioBtnSizeDate->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( CmpCfgDlgGenerated::OnTimeSize ), NULL, this );
-	m_buttonTimeSize->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnTimeSize ), NULL, this );
-	m_buttonTimeSize->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( CmpCfgDlgGenerated::OnTimeSizeDouble ), NULL, this );
-	m_radioBtnContent->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( CmpCfgDlgGenerated::OnContent ), NULL, this );
-	m_buttonContent->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnContent ), NULL, this );
-	m_buttonContent->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( CmpCfgDlgGenerated::OnContentDouble ), NULL, this );
-	m_bpButtonHelp->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnShowHelp ), NULL, this );
-	m_choiceHandleSymlinks->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( CmpCfgDlgGenerated::OnChangeErrorHandling ), NULL, this );
-	m_button10->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnOkay ), NULL, this );
-	m_button6->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnCancel ), NULL, this );
+    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+
+    wxBoxSizer* bSizer136;
+    bSizer136 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer55;
+    bSizer55 = new wxBoxSizer( wxVERTICAL );
+
+    wxStaticBoxSizer* sbSizer6;
+    sbSizer6 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Compare by...") ), wxHORIZONTAL );
+
+    wxFlexGridSizer* fgSizer16;
+    fgSizer16 = new wxFlexGridSizer( 2, 3, 0, 0 );
+    fgSizer16->SetFlexibleDirection( wxBOTH );
+    fgSizer16->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    m_radioBtnSizeDate = new wxRadioButton( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
+    m_radioBtnSizeDate->SetValue( true );
+    m_radioBtnSizeDate->SetToolTip( _("Files are found equal if\n     - last write time and date\n     - file size\nare the same") );
+
+    fgSizer16->Add( m_radioBtnSizeDate, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bitmapByTime = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    m_bitmapByTime->SetToolTip( _("Files are found equal if\n     - last write time and date\n     - file size\nare the same") );
+
+    fgSizer16->Add( m_bitmapByTime, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_buttonTimeSize = new wxButton( this, wxID_ANY, _("File time and size"), wxDefaultPosition, wxSize( -1,42 ), 0 );
+    m_buttonTimeSize->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
+    m_buttonTimeSize->SetToolTip( _("Files are found equal if\n     - last write time and date\n     - file size\nare the same") );
+
+    fgSizer16->Add( m_buttonTimeSize, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALL, 5 );
+
+    m_radioBtnContent = new wxRadioButton( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    m_radioBtnContent->SetToolTip( _("Files are found equal if\n     - file content\nis the same") );
+
+    fgSizer16->Add( m_radioBtnContent, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bitmapByContent = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    m_bitmapByContent->SetToolTip( _("Files are found equal if\n     - file content\nis the same") );
+
+    fgSizer16->Add( m_bitmapByContent, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_buttonContent = new wxButton( this, wxID_ANY, _("File content"), wxDefaultPosition, wxSize( -1,42 ), 0 );
+    m_buttonContent->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
+    m_buttonContent->SetToolTip( _("Files are found equal if\n     - file content\nis the same") );
+
+    fgSizer16->Add( m_buttonContent, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+    sbSizer6->Add( fgSizer16, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    bSizer55->Add( sbSizer6, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 2 );
+
+
+    bSizer55->Add( 0, 4, 0, 0, 5 );
+
+    wxBoxSizer* bSizer177;
+    bSizer177 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxStaticBoxSizer* sbSizer25;
+    sbSizer25 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Symbolic Link handling") ), wxVERTICAL );
+
+    wxArrayString m_choiceHandleSymlinksChoices;
+    m_choiceHandleSymlinks = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceHandleSymlinksChoices, 0 );
+    m_choiceHandleSymlinks->SetSelection( -1 );
+    sbSizer25->Add( m_choiceHandleSymlinks, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    bSizer177->Add( sbSizer25, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonHelp = new wxBitmapButton( this, wxID_HELP, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    m_bpButtonHelp->SetToolTip( _("Help") );
+
+    bSizer177->Add( m_bpButtonHelp, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+
+    bSizer55->Add( bSizer177, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer22;
+    bSizer22 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_button10 = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_button10->SetDefault();
+    m_button10->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer22->Add( m_button10, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+    m_button6 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_button6->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer22->Add( m_button6, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer55->Add( bSizer22, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    bSizer136->Add( bSizer55, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    this->SetSizer( bSizer136 );
+    this->Layout();
+    bSizer136->Fit( this );
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CmpCfgDlgGenerated::OnClose ) );
+    m_radioBtnSizeDate->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( CmpCfgDlgGenerated::OnTimeSize ), NULL, this );
+    m_buttonTimeSize->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnTimeSize ), NULL, this );
+    m_buttonTimeSize->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( CmpCfgDlgGenerated::OnTimeSizeDouble ), NULL, this );
+    m_radioBtnContent->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( CmpCfgDlgGenerated::OnContent ), NULL, this );
+    m_buttonContent->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnContent ), NULL, this );
+    m_buttonContent->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( CmpCfgDlgGenerated::OnContentDouble ), NULL, this );
+    m_choiceHandleSymlinks->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( CmpCfgDlgGenerated::OnChangeErrorHandling ), NULL, this );
+    m_bpButtonHelp->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnShowHelp ), NULL, this );
+    m_button10->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnOkay ), NULL, this );
+    m_button6->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnCancel ), NULL, this );
 }
 
 CmpCfgDlgGenerated::~CmpCfgDlgGenerated()
 {
-	// Disconnect Events
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CmpCfgDlgGenerated::OnClose ) );
-	m_radioBtnSizeDate->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( CmpCfgDlgGenerated::OnTimeSize ), NULL, this );
-	m_buttonTimeSize->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnTimeSize ), NULL, this );
-	m_buttonTimeSize->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( CmpCfgDlgGenerated::OnTimeSizeDouble ), NULL, this );
-	m_radioBtnContent->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( CmpCfgDlgGenerated::OnContent ), NULL, this );
-	m_buttonContent->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnContent ), NULL, this );
-	m_buttonContent->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( CmpCfgDlgGenerated::OnContentDouble ), NULL, this );
-	m_bpButtonHelp->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnShowHelp ), NULL, this );
-	m_choiceHandleSymlinks->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( CmpCfgDlgGenerated::OnChangeErrorHandling ), NULL, this );
-	m_button10->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnOkay ), NULL, this );
-	m_button6->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnCancel ), NULL, this );
-	
+    // Disconnect Events
+    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CmpCfgDlgGenerated::OnClose ) );
+    m_radioBtnSizeDate->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( CmpCfgDlgGenerated::OnTimeSize ), NULL, this );
+    m_buttonTimeSize->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnTimeSize ), NULL, this );
+    m_buttonTimeSize->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( CmpCfgDlgGenerated::OnTimeSizeDouble ), NULL, this );
+    m_radioBtnContent->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( CmpCfgDlgGenerated::OnContent ), NULL, this );
+    m_buttonContent->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnContent ), NULL, this );
+    m_buttonContent->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( CmpCfgDlgGenerated::OnContentDouble ), NULL, this );
+    m_choiceHandleSymlinks->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( CmpCfgDlgGenerated::OnChangeErrorHandling ), NULL, this );
+    m_bpButtonHelp->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnShowHelp ), NULL, this );
+    m_button10->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnOkay ), NULL, this );
+    m_button6->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnCancel ), NULL, this );
+
 }
 
 SyncStatusDlgGenerated::SyncStatusDlgGenerated( 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( 470,300 ), wxDefaultSize );
-	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-	
-	wxBoxSizer* bSizer27;
-	bSizer27 = new wxBoxSizer( wxVERTICAL );
-	
-	
-	bSizer27->Add( 0, 15, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer37;
-	bSizer37 = new wxBoxSizer( wxHORIZONTAL );
-	
-	bSizer27->Add( bSizer37, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	wxBoxSizer* bSizer42;
-	bSizer42 = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizer42->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_bitmapStatus = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 28,28 ), 0 );
-	bSizer42->Add( m_bitmapStatus, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticTextStatus = new wxStaticText( this, wxID_ANY, _("Synchronizing..."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextStatus->Wrap( -1 );
-	m_staticTextStatus->SetFont( wxFont( 14, 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer42->Add( m_staticTextStatus, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-	
-	m_animationControl1 = new wxAnimationCtrl( this, wxID_ANY, wxNullAnimation, wxDefaultPosition, wxDefaultSize, wxAC_DEFAULT_STYLE ); 
-	m_animationControl1->SetMinSize( wxSize( 45,45 ) );
-	
-	bSizer42->Add( m_animationControl1, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
-	
-	bSizer42->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	bSizer27->Add( bSizer42, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	bSizer31 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer111;
-	bSizer111 = new wxBoxSizer( wxVERTICAL );
-	
-	bSizerObjectsRemaining = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText25 = new wxStaticText( this, wxID_ANY, _("Elements remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText25->Wrap( -1 );
-	m_staticText25->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizerObjectsRemaining->Add( m_staticText25, 0, wxALIGN_BOTTOM, 5 );
-	
-	m_staticTextRemainingObj = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_staticTextRemainingObj->Wrap( -1 );
-	m_staticTextRemainingObj->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
-	
-	bSizerObjectsRemaining->Add( m_staticTextRemainingObj, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
-	
-	m_staticText96 = new wxStaticText( this, wxID_ANY, _("("), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText96->Wrap( -1 );
-	m_staticText96->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
-	
-	bSizerObjectsRemaining->Add( m_staticText96, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
-	
-	m_staticTextDataRemaining = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextDataRemaining->Wrap( -1 );
-	m_staticTextDataRemaining->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
-	
-	bSizerObjectsRemaining->Add( m_staticTextDataRemaining, 0, wxALIGN_BOTTOM, 5 );
-	
-	m_staticText97 = new wxStaticText( this, wxID_ANY, _(")"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText97->Wrap( -1 );
-	m_staticText97->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
-	
-	bSizerObjectsRemaining->Add( m_staticText97, 0, wxALIGN_BOTTOM, 5 );
-	
-	bSizer111->Add( bSizerObjectsRemaining, 0, 0, 5 );
-	
-	bSizerObjectsProcessed = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText251 = new wxStaticText( this, wxID_ANY, _("Elements processed:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText251->Wrap( -1 );
-	m_staticText251->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizerObjectsProcessed->Add( m_staticText251, 0, wxALIGN_BOTTOM, 5 );
-	
-	m_staticTextProcessedObj = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_staticTextProcessedObj->Wrap( -1 );
-	m_staticTextProcessedObj->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
-	
-	bSizerObjectsProcessed->Add( m_staticTextProcessedObj, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
-	
-	m_staticText98 = new wxStaticText( this, wxID_ANY, _("("), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText98->Wrap( -1 );
-	m_staticText98->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
-	
-	bSizerObjectsProcessed->Add( m_staticText98, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
-	
-	m_staticTextDataProcessed = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextDataProcessed->Wrap( -1 );
-	m_staticTextDataProcessed->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
-	
-	bSizerObjectsProcessed->Add( m_staticTextDataProcessed, 0, wxALIGN_BOTTOM, 5 );
-	
-	m_staticText99 = new wxStaticText( this, wxID_ANY, _(")"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText99->Wrap( -1 );
-	m_staticText99->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
-	
-	bSizerObjectsProcessed->Add( m_staticText99, 0, wxALIGN_BOTTOM, 5 );
-	
-	bSizer111->Add( bSizerObjectsProcessed, 0, 0, 5 );
-	
-	bSizer31->Add( bSizer111, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer31->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer114;
-	bSizer114 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText55 = new wxStaticText( this, wxID_ANY, _("Time elapsed:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText55->Wrap( -1 );
-	m_staticText55->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer114->Add( m_staticText55, 0, wxALIGN_BOTTOM, 5 );
-	
-	m_staticTextTimeElapsed = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextTimeElapsed->Wrap( -1 );
-	m_staticTextTimeElapsed->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
-	
-	bSizer114->Add( m_staticTextTimeElapsed, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
-	
-	bSizer31->Add( bSizer114, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer27->Add( bSizer31, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	bSizerProgressText = new wxBoxSizer( wxVERTICAL );
-	
-	m_textCtrlInfo = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY );
-	m_textCtrlInfo->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-	
-	bSizerProgressText->Add( m_textCtrlInfo, 3, wxEXPAND|wxALL, 5 );
-	
-	bSizer27->Add( bSizerProgressText, 1, wxEXPAND, 5 );
-	
-	m_gauge1 = new wxGauge( this, wxID_ANY, 100, wxDefaultPosition, wxSize( -1,20 ), wxGA_HORIZONTAL );
-	bSizer27->Add( m_gauge1, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	bSizer28 = new wxBoxSizer( wxHORIZONTAL );
-	
-	bSizerSpeed = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText108 = new wxStaticText( this, wxID_ANY, _("Speed:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText108->Wrap( -1 );
-	m_staticText108->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizerSpeed->Add( m_staticText108, 0, wxALIGN_BOTTOM, 5 );
-	
-	m_staticTextSpeed = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextSpeed->Wrap( -1 );
-	m_staticTextSpeed->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
-	
-	bSizerSpeed->Add( m_staticTextSpeed, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
-	
-	
-	bSizerSpeed->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer28->Add( bSizerSpeed, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer28->Add( 0, 0, 1, 0, 5 );
-	
-	m_buttonOK = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( 100,32 ), 0 );
-	m_buttonOK->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	m_buttonOK->Enable( false );
-	m_buttonOK->Hide();
-	
-	bSizer28->Add( m_buttonOK, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-	
-	m_buttonPause = new wxButton( this, wxID_ANY, _("&Pause"), wxDefaultPosition, wxSize( 100,32 ), 0 );
-	m_buttonPause->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer28->Add( m_buttonPause, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-	
-	m_buttonAbort = new wxButton( this, wxID_CANCEL, _("&Abort"), wxDefaultPosition, wxSize( 100,32 ), 0 );
-	m_buttonAbort->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer28->Add( m_buttonAbort, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-	
-	
-	bSizer28->Add( 0, 0, 1, 0, 5 );
-	
-	bSizerRemTime = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizerRemTime->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticText21 = new wxStaticText( this, wxID_ANY, _("Time remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText21->Wrap( -1 );
-	m_staticText21->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizerRemTime->Add( m_staticText21, 0, wxALIGN_BOTTOM, 5 );
-	
-	m_staticTextTimeRemaining = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextTimeRemaining->Wrap( -1 );
-	m_staticTextTimeRemaining->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
-	
-	bSizerRemTime->Add( m_staticTextTimeRemaining, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
-	
-	bSizer28->Add( bSizerRemTime, 1, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer27->Add( bSizer28, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxALL, 5 );
-	
-	
-	bSizer27->Add( 0, 5, 0, wxEXPAND, 5 );
-	
-	this->SetSizer( bSizer27 );
-	this->Layout();
-	
-	this->Centre( wxBOTH );
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SyncStatusDlgGenerated::OnClose ) );
-	this->Connect( wxEVT_ICONIZE, wxIconizeEventHandler( SyncStatusDlgGenerated::OnIconize ) );
-	m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncStatusDlgGenerated::OnOkay ), NULL, this );
-	m_buttonPause->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncStatusDlgGenerated::OnPause ), NULL, this );
-	m_buttonAbort->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncStatusDlgGenerated::OnAbort ), NULL, this );
+    this->SetSizeHints( wxSize( 470,300 ), wxDefaultSize );
+    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+    wxBoxSizer* bSizer27;
+    bSizer27 = new wxBoxSizer( wxVERTICAL );
+
+
+    bSizer27->Add( 0, 15, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer37;
+    bSizer37 = new wxBoxSizer( wxHORIZONTAL );
+
+    bSizer27->Add( bSizer37, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    wxBoxSizer* bSizer42;
+    bSizer42 = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizer42->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_bitmapStatus = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 28,28 ), 0 );
+    bSizer42->Add( m_bitmapStatus, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticTextStatus = new wxStaticText( this, wxID_ANY, _("Synchronizing..."), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextStatus->Wrap( -1 );
+    m_staticTextStatus->SetFont( wxFont( 14, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer42->Add( m_staticTextStatus, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+
+    m_animationControl1 = new wxAnimationCtrl( this, wxID_ANY, wxNullAnimation, wxDefaultPosition, wxDefaultSize, wxAC_DEFAULT_STYLE );
+    m_animationControl1->SetMinSize( wxSize( 45,45 ) );
+
+    bSizer42->Add( m_animationControl1, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+
+
+    bSizer42->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    bSizer27->Add( bSizer42, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    bSizer31 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer111;
+    bSizer111 = new wxBoxSizer( wxVERTICAL );
+
+    bSizerObjectsRemaining = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText25 = new wxStaticText( this, wxID_ANY, _("Elements remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText25->Wrap( -1 );
+    m_staticText25->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizerObjectsRemaining->Add( m_staticText25, 0, wxALIGN_BOTTOM, 5 );
+
+    m_staticTextRemainingObj = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+    m_staticTextRemainingObj->Wrap( -1 );
+    m_staticTextRemainingObj->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
+
+    bSizerObjectsRemaining->Add( m_staticTextRemainingObj, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
+
+    m_staticText96 = new wxStaticText( this, wxID_ANY, _("("), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText96->Wrap( -1 );
+    m_staticText96->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
+
+    bSizerObjectsRemaining->Add( m_staticText96, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
+
+    m_staticTextDataRemaining = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextDataRemaining->Wrap( -1 );
+    m_staticTextDataRemaining->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
+
+    bSizerObjectsRemaining->Add( m_staticTextDataRemaining, 0, wxALIGN_BOTTOM, 5 );
+
+    m_staticText97 = new wxStaticText( this, wxID_ANY, _(")"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText97->Wrap( -1 );
+    m_staticText97->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
+
+    bSizerObjectsRemaining->Add( m_staticText97, 0, wxALIGN_BOTTOM, 5 );
+
+    bSizer111->Add( bSizerObjectsRemaining, 0, 0, 5 );
+
+    bSizerObjectsProcessed = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText251 = new wxStaticText( this, wxID_ANY, _("Elements processed:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText251->Wrap( -1 );
+    m_staticText251->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizerObjectsProcessed->Add( m_staticText251, 0, wxALIGN_BOTTOM, 5 );
+
+    m_staticTextProcessedObj = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+    m_staticTextProcessedObj->Wrap( -1 );
+    m_staticTextProcessedObj->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
+
+    bSizerObjectsProcessed->Add( m_staticTextProcessedObj, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
+
+    m_staticText98 = new wxStaticText( this, wxID_ANY, _("("), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText98->Wrap( -1 );
+    m_staticText98->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
+
+    bSizerObjectsProcessed->Add( m_staticText98, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
+
+    m_staticTextDataProcessed = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextDataProcessed->Wrap( -1 );
+    m_staticTextDataProcessed->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
+
+    bSizerObjectsProcessed->Add( m_staticTextDataProcessed, 0, wxALIGN_BOTTOM, 5 );
+
+    m_staticText99 = new wxStaticText( this, wxID_ANY, _(")"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText99->Wrap( -1 );
+    m_staticText99->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
+
+    bSizerObjectsProcessed->Add( m_staticText99, 0, wxALIGN_BOTTOM, 5 );
+
+    bSizer111->Add( bSizerObjectsProcessed, 0, 0, 5 );
+
+    bSizer31->Add( bSizer111, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer31->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer114;
+    bSizer114 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText55 = new wxStaticText( this, wxID_ANY, _("Time elapsed:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText55->Wrap( -1 );
+    m_staticText55->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer114->Add( m_staticText55, 0, wxALIGN_BOTTOM, 5 );
+
+    m_staticTextTimeElapsed = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextTimeElapsed->Wrap( -1 );
+    m_staticTextTimeElapsed->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
+
+    bSizer114->Add( m_staticTextTimeElapsed, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
+
+    bSizer31->Add( bSizer114, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer27->Add( bSizer31, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+    bSizerProgressText = new wxBoxSizer( wxVERTICAL );
+
+    m_textCtrlInfo = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY );
+    m_textCtrlInfo->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+
+    bSizerProgressText->Add( m_textCtrlInfo, 3, wxEXPAND|wxALL, 5 );
+
+    bSizer27->Add( bSizerProgressText, 1, wxEXPAND, 5 );
+
+    m_gauge1 = new wxGauge( this, wxID_ANY, 100, wxDefaultPosition, wxSize( -1,14 ), wxGA_HORIZONTAL );
+    bSizer27->Add( m_gauge1, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+    bSizer28 = new wxBoxSizer( wxHORIZONTAL );
+
+    bSizerSpeed = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText108 = new wxStaticText( this, wxID_ANY, _("Speed:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText108->Wrap( -1 );
+    m_staticText108->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizerSpeed->Add( m_staticText108, 0, wxALIGN_BOTTOM, 5 );
+
+    m_staticTextSpeed = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextSpeed->Wrap( -1 );
+    m_staticTextSpeed->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
+
+    bSizerSpeed->Add( m_staticTextSpeed, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
+
+
+    bSizerSpeed->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer28->Add( bSizerSpeed, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer28->Add( 0, 0, 1, 0, 5 );
+
+    m_buttonOK = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( 100,32 ), 0 );
+    m_buttonOK->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+    m_buttonOK->Enable( false );
+    m_buttonOK->Hide();
+
+    bSizer28->Add( m_buttonOK, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+
+    m_buttonPause = new wxButton( this, wxID_ANY, _("&Pause"), wxDefaultPosition, wxSize( 100,32 ), 0 );
+    m_buttonPause->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer28->Add( m_buttonPause, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+
+    m_buttonAbort = new wxButton( this, wxID_CANCEL, _("&Abort"), wxDefaultPosition, wxSize( 100,32 ), 0 );
+    m_buttonAbort->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer28->Add( m_buttonAbort, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+
+
+    bSizer28->Add( 0, 0, 1, 0, 5 );
+
+    bSizerRemTime = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizerRemTime->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticText21 = new wxStaticText( this, wxID_ANY, _("Time remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText21->Wrap( -1 );
+    m_staticText21->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizerRemTime->Add( m_staticText21, 0, wxALIGN_BOTTOM, 5 );
+
+    m_staticTextTimeRemaining = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextTimeRemaining->Wrap( -1 );
+    m_staticTextTimeRemaining->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
+
+    bSizerRemTime->Add( m_staticTextTimeRemaining, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
+
+    bSizer28->Add( bSizerRemTime, 1, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer27->Add( bSizer28, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxALL, 5 );
+
+
+    bSizer27->Add( 0, 5, 0, wxEXPAND, 5 );
+
+    this->SetSizer( bSizer27 );
+    this->Layout();
+
+    this->Centre( wxBOTH );
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SyncStatusDlgGenerated::OnClose ) );
+    this->Connect( wxEVT_ICONIZE, wxIconizeEventHandler( SyncStatusDlgGenerated::OnIconize ) );
+    m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncStatusDlgGenerated::OnOkay ), NULL, this );
+    m_buttonPause->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncStatusDlgGenerated::OnPause ), NULL, this );
+    m_buttonAbort->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncStatusDlgGenerated::OnAbort ), NULL, this );
 }
 
 SyncStatusDlgGenerated::~SyncStatusDlgGenerated()
 {
-	// Disconnect Events
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SyncStatusDlgGenerated::OnClose ) );
-	this->Disconnect( wxEVT_ICONIZE, wxIconizeEventHandler( SyncStatusDlgGenerated::OnIconize ) );
-	m_buttonOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncStatusDlgGenerated::OnOkay ), NULL, this );
-	m_buttonPause->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncStatusDlgGenerated::OnPause ), NULL, this );
-	m_buttonAbort->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncStatusDlgGenerated::OnAbort ), NULL, this );
-	
+    // Disconnect Events
+    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SyncStatusDlgGenerated::OnClose ) );
+    this->Disconnect( wxEVT_ICONIZE, wxIconizeEventHandler( SyncStatusDlgGenerated::OnIconize ) );
+    m_buttonOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncStatusDlgGenerated::OnOkay ), NULL, this );
+    m_buttonPause->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncStatusDlgGenerated::OnPause ), NULL, this );
+    m_buttonAbort->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncStatusDlgGenerated::OnAbort ), NULL, this );
+
 }
 
 LogControlGenerated::LogControlGenerated( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
 {
-	wxBoxSizer* bSizer153;
-	bSizer153 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer154;
-	bSizer154 = new wxBoxSizer( wxVERTICAL );
-	
-	m_bpButtonErrors = new ToggleButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), wxBU_AUTODRAW );
-	bSizer154->Add( m_bpButtonErrors, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonWarnings = new ToggleButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), wxBU_AUTODRAW );
-	bSizer154->Add( m_bpButtonWarnings, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonInfo = new ToggleButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), wxBU_AUTODRAW );
-	bSizer154->Add( m_bpButtonInfo, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	bSizer153->Add( bSizer154, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_textCtrlInfo = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_DONTWRAP|wxTE_MULTILINE|wxTE_READONLY );
-	m_textCtrlInfo->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-	
-	bSizer153->Add( m_textCtrlInfo, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	this->SetSizer( bSizer153 );
-	this->Layout();
-	bSizer153->Fit( this );
-	
-	// Connect Events
-	m_bpButtonErrors->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogControlGenerated::OnErrors ), NULL, this );
-	m_bpButtonWarnings->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogControlGenerated::OnWarnings ), NULL, this );
-	m_bpButtonInfo->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogControlGenerated::OnInfo ), NULL, this );
-}
+    wxBoxSizer* bSizer153;
+    bSizer153 = new wxBoxSizer( wxHORIZONTAL );
 
-LogControlGenerated::~LogControlGenerated()
-{
-	// Disconnect Events
-	m_bpButtonErrors->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogControlGenerated::OnErrors ), NULL, this );
-	m_bpButtonWarnings->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogControlGenerated::OnWarnings ), NULL, this );
-	m_bpButtonInfo->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogControlGenerated::OnInfo ), NULL, this );
-	
-}
+    wxBoxSizer* bSizer154;
+    bSizer154 = new wxBoxSizer( wxVERTICAL );
 
-HelpDlgGenerated::HelpDlgGenerated( 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* bSizer20;
-	bSizer20 = new wxBoxSizer( wxVERTICAL );
-	
-	
-	bSizer20->Add( 0, 10, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer85;
-	bSizer85 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmap25 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), 0 );
-	bSizer85->Add( m_bitmap25, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_panel8 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER|wxTAB_TRAVERSAL );
-	m_panel8->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DLIGHT ) );
-	
-	wxBoxSizer* bSizer72;
-	bSizer72 = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizer72->Add( 20, 0, 0, 0, 5 );
-	
-	m_staticText56 = new wxStaticText( m_panel8, wxID_ANY, _("Help"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText56->Wrap( -1 );
-	m_staticText56->SetFont( wxFont( 16, 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer72->Add( m_staticText56, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer72->Add( 20, 0, 0, 0, 5 );
-	
-	m_panel8->SetSizer( bSizer72 );
-	m_panel8->Layout();
-	bSizer72->Fit( m_panel8 );
-	bSizer85->Add( m_panel8, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	
-	bSizer85->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer20->Add( bSizer85, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_notebook1 = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	m_scrolledWindow1 = new wxScrolledWindow( m_notebook1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxSIMPLE_BORDER|wxVSCROLL );
-	m_scrolledWindow1->SetScrollRate( 5, 5 );
-	m_scrolledWindow1->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_INACTIVEBORDER ) );
-	
-	wxBoxSizer* bSizer70;
-	bSizer70 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText59 = new wxStaticText( m_scrolledWindow1, wxID_ANY, _("Compare by \"File size and date\""), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText59->Wrap( 500 );
-	m_staticText59->SetFont( wxFont( 10, 70, 90, 92, true, wxEmptyString ) );
-	
-	bSizer70->Add( m_staticText59, 0, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_staticText60 = new wxStaticText( m_scrolledWindow1, wxID_ANY, _("This variant evaluates two equally named files as being equal when they have the same file size AND the same last write date and time."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText60->Wrap( 500 );
-	bSizer70->Add( m_staticText60, 0, wxALL, 5 );
-	
-	m_staticText61 = new wxStaticText( m_scrolledWindow1, wxID_ANY, _("When the comparison is started with this option set the following decision tree is processed:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText61->Wrap( 500 );
-	bSizer70->Add( m_staticText61, 0, wxALL, 5 );
-	
-	m_treeCtrl1 = new wxTreeCtrl( m_scrolledWindow1, wxID_ANY, wxDefaultPosition, wxSize( -1,220 ), wxTR_DEFAULT_STYLE );
-	m_treeCtrl1->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-	
-	bSizer70->Add( m_treeCtrl1, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	m_staticText63 = new wxStaticText( m_scrolledWindow1, wxID_ANY, _("As a result the files are separated into the following categories:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText63->Wrap( 500 );
-	bSizer70->Add( m_staticText63, 0, wxALL, 5 );
-	
-	m_staticText75 = new wxStaticText( m_scrolledWindow1, wxID_ANY, _("- equal"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText75->Wrap( -1 );
-	bSizer70->Add( m_staticText75, 0, wxRIGHT|wxLEFT, 5 );
-	
-	m_staticText76 = new wxStaticText( m_scrolledWindow1, wxID_ANY, _("- left newer"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText76->Wrap( -1 );
-	bSizer70->Add( m_staticText76, 0, wxRIGHT|wxLEFT, 5 );
-	
-	m_staticText77 = new wxStaticText( m_scrolledWindow1, wxID_ANY, _("- right newer"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText77->Wrap( -1 );
-	bSizer70->Add( m_staticText77, 0, wxRIGHT|wxLEFT, 5 );
-	
-	m_staticText79 = new wxStaticText( m_scrolledWindow1, wxID_ANY, _("- exists left only"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText79->Wrap( -1 );
-	bSizer70->Add( m_staticText79, 0, wxRIGHT|wxLEFT, 5 );
-	
-	m_staticText80 = new wxStaticText( m_scrolledWindow1, wxID_ANY, _("- exists right only"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText80->Wrap( -1 );
-	bSizer70->Add( m_staticText80, 0, wxRIGHT|wxLEFT, 5 );
-	
-	m_staticText78 = new wxStaticText( m_scrolledWindow1, wxID_ANY, _("- conflict (same date, different size)"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText78->Wrap( -1 );
-	bSizer70->Add( m_staticText78, 0, wxRIGHT|wxLEFT, 5 );
-	
-	m_scrolledWindow1->SetSizer( bSizer70 );
-	m_scrolledWindow1->Layout();
-	bSizer70->Fit( m_scrolledWindow1 );
-	m_notebook1->AddPage( m_scrolledWindow1, _("File size and date"), true );
-	m_scrolledWindow5 = new wxScrolledWindow( m_notebook1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxSIMPLE_BORDER|wxVSCROLL );
-	m_scrolledWindow5->SetScrollRate( 5, 5 );
-	m_scrolledWindow5->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_INACTIVEBORDER ) );
-	
-	wxBoxSizer* bSizer74;
-	bSizer74 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText65 = new wxStaticText( m_scrolledWindow5, wxID_ANY, _("Compare by \"File content\""), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText65->Wrap( 500 );
-	m_staticText65->SetFont( wxFont( 10, 70, 90, 92, true, wxEmptyString ) );
-	
-	bSizer74->Add( m_staticText65, 0, wxALL, 5 );
-	
-	m_staticText66 = new wxStaticText( m_scrolledWindow5, wxID_ANY, _("As the name suggests, two files which share the same name are marked as equal if and only if they have the same content. This option is useful for consistency checks rather than backup operations. Therefore the file times are not taken into account at all.\n\nWith this option enabled the decision tree is smaller:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText66->Wrap( 500 );
-	bSizer74->Add( m_staticText66, 0, wxALL, 5 );
-	
-	m_treeCtrl2 = new wxTreeCtrl( m_scrolledWindow5, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTR_DEFAULT_STYLE );
-	m_treeCtrl2->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-	m_treeCtrl2->SetMinSize( wxSize( -1,130 ) );
-	
-	bSizer74->Add( m_treeCtrl2, 0, wxALL|wxEXPAND, 5 );
-	
-	m_staticText69 = new wxStaticText( m_scrolledWindow5, wxID_ANY, _("As a result the files are separated into the following categories:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText69->Wrap( 500 );
-	bSizer74->Add( m_staticText69, 0, wxALL, 5 );
-	
-	m_staticText81 = new wxStaticText( m_scrolledWindow5, wxID_ANY, _("- equal"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText81->Wrap( -1 );
-	bSizer74->Add( m_staticText81, 0, wxRIGHT|wxLEFT, 5 );
-	
-	m_staticText82 = new wxStaticText( m_scrolledWindow5, wxID_ANY, _("- different"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText82->Wrap( -1 );
-	bSizer74->Add( m_staticText82, 0, wxRIGHT|wxLEFT, 5 );
-	
-	m_staticText83 = new wxStaticText( m_scrolledWindow5, wxID_ANY, _("- exists left only"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText83->Wrap( -1 );
-	bSizer74->Add( m_staticText83, 0, wxRIGHT|wxLEFT, 5 );
-	
-	m_staticText84 = new wxStaticText( m_scrolledWindow5, wxID_ANY, _("- exists right only"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText84->Wrap( -1 );
-	bSizer74->Add( m_staticText84, 0, wxRIGHT|wxLEFT, 5 );
-	
-	m_scrolledWindow5->SetSizer( bSizer74 );
-	m_scrolledWindow5->Layout();
-	bSizer74->Fit( m_scrolledWindow5 );
-	m_notebook1->AddPage( m_scrolledWindow5, _("File content"), false );
-	
-	bSizer20->Add( m_notebook1, 1, wxEXPAND | wxALL, 5 );
-	
-	m_button8 = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( 100,32 ), 0 );
-	m_button8->SetDefault(); 
-	m_button8->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer20->Add( m_button8, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	this->SetSizer( bSizer20 );
-	this->Layout();
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( HelpDlgGenerated::OnClose ) );
-	m_button8->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( HelpDlgGenerated::OnOK ), NULL, this );
+    m_bpButtonErrors = new ToggleButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), wxBU_AUTODRAW );
+    bSizer154->Add( m_bpButtonErrors, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonWarnings = new ToggleButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), wxBU_AUTODRAW );
+    bSizer154->Add( m_bpButtonWarnings, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonInfo = new ToggleButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), wxBU_AUTODRAW );
+    bSizer154->Add( m_bpButtonInfo, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    bSizer153->Add( bSizer154, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_textCtrlInfo = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_DONTWRAP|wxTE_MULTILINE|wxTE_READONLY );
+    m_textCtrlInfo->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+
+    bSizer153->Add( m_textCtrlInfo, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    this->SetSizer( bSizer153 );
+    this->Layout();
+    bSizer153->Fit( this );
+
+    // Connect Events
+    m_bpButtonErrors->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogControlGenerated::OnErrors ), NULL, this );
+    m_bpButtonWarnings->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogControlGenerated::OnWarnings ), NULL, this );
+    m_bpButtonInfo->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogControlGenerated::OnInfo ), NULL, this );
 }
 
-HelpDlgGenerated::~HelpDlgGenerated()
+LogControlGenerated::~LogControlGenerated()
 {
-	// Disconnect Events
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( HelpDlgGenerated::OnClose ) );
-	m_button8->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( HelpDlgGenerated::OnOK ), NULL, this );
-	
+    // Disconnect Events
+    m_bpButtonErrors->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogControlGenerated::OnErrors ), NULL, this );
+    m_bpButtonWarnings->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogControlGenerated::OnWarnings ), NULL, this );
+    m_bpButtonInfo->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogControlGenerated::OnInfo ), NULL, this );
+
 }
 
 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 );
-	
-	wxBoxSizer* bSizer31;
-	bSizer31 = new wxBoxSizer( wxVERTICAL );
-	
-	
-	bSizer31->Add( 0, 5, 0, 0, 5 );
-	
-	m_panel5 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxSIMPLE_BORDER|wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer36;
-	bSizer36 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmap11 = new wxStaticBitmap( m_panel5, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 404,55 ), 0 );
-	bSizer36->Add( m_bitmap11, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_panel5->SetSizer( bSizer36 );
-	m_panel5->Layout();
-	bSizer36->Fit( m_panel5 );
-	bSizer31->Add( m_panel5, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_build = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_build->Wrap( -1 );
-	m_build->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer31->Add( m_build, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	
-	bSizer31->Add( 0, 10, 0, 0, 5 );
-	
-	wxBoxSizer* bSizer53;
-	bSizer53 = new wxBoxSizer( wxVERTICAL );
-	
-	m_panel33 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxDOUBLE_BORDER|wxTAB_TRAVERSAL );
-	m_panel33->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-	
-	bSizerCodeInfo = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText72 = new wxStaticText( m_panel33, wxID_ANY, _("Source code written in C++ utilizing:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText72->Wrap( -1 );
-	m_staticText72->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizerCodeInfo->Add( m_staticText72, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
-	
-	wxBoxSizer* bSizer167;
-	bSizer167 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer171;
-	bSizer171 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_hyperlink9 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("MinGW"), wxT("http://www.mingw.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink9->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-	
-	bSizer171->Add( m_hyperlink9, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_hyperlink10 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("Code::Blocks"), wxT("http://www.codeblocks.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink10->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-	
-	bSizer171->Add( m_hyperlink10, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_hyperlink13 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("Boost"), wxT("http://www.boost.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink13->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-	
-	bSizer171->Add( m_hyperlink13, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_hyperlink7 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("wxWidgets"), wxT("http://www.wxwidgets.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink7->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-	
-	bSizer171->Add( m_hyperlink7, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_hyperlink11 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("MS Visual C++"), wxT("http://msdn.microsoft.com/library/60k1461a.aspx"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink11->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-	
-	bSizer171->Add( m_hyperlink11, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_hyperlink16 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("Artistic Style"), wxT("http://astyle.sourceforge.net"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink16->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-	
-	bSizer171->Add( m_hyperlink16, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	bSizer167->Add( bSizer171, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM, 5 );
-	
-	wxBoxSizer* bSizer172;
-	bSizer172 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_hyperlink8 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("Loki"), wxT("http://sourceforge.net/projects/loki-lib"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink8->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-	
-	bSizer172->Add( m_hyperlink8, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_hyperlink15 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("zenXML"), wxT("http://sourceforge.net/projects/zenxml/"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink15->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-	
-	bSizer172->Add( m_hyperlink15, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_hyperlink12 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("Google Test"), wxT("http://code.google.com/p/googletest"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink12->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-	
-	bSizer172->Add( m_hyperlink12, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_hyperlink18 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("Unicode NSIS"), wxT("http://www.scratchpaper.com"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink18->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-	
-	bSizer172->Add( m_hyperlink18, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_hyperlink14 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("wxFormBuilder"), wxT("http://wxformbuilder.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink14->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-	
-	bSizer172->Add( m_hyperlink14, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	bSizer167->Add( bSizer172, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	bSizerCodeInfo->Add( bSizer167, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_hyperlink21 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("- ZenJu -"), wxT("mailto:zhnmju123@gmx.de"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink21->SetFont( wxFont( 10, 74, 93, 92, false, wxT("Segoe Print") ) );
-	m_hyperlink21->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-	m_hyperlink21->SetToolTip( _("zhnmju123@gmx.de") );
-	
-	bSizerCodeInfo->Add( m_hyperlink21, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_panel33->SetSizer( bSizerCodeInfo );
-	m_panel33->Layout();
-	bSizerCodeInfo->Fit( m_panel33 );
-	bSizer53->Add( m_panel33, 0, wxBOTTOM|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	m_scrolledWindowTranslators = new wxScrolledWindow( this, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxDOUBLE_BORDER|wxHSCROLL|wxVSCROLL );
-	m_scrolledWindowTranslators->SetScrollRate( 5, 5 );
-	m_scrolledWindowTranslators->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-	m_scrolledWindowTranslators->SetMinSize( wxSize( -1,180 ) );
-	
-	bSizerTranslators = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText54 = new wxStaticText( m_scrolledWindowTranslators, wxID_ANY, _("Big thanks for localizing FreeFileSync goes out to:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText54->Wrap( -1 );
-	m_staticText54->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizerTranslators->Add( m_staticText54, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxBOTTOM, 5 );
-	
-	
-	bSizerTranslators->Add( 0, 5, 0, 0, 5 );
-	
-	fgSizerTranslators = new wxFlexGridSizer( 50, 3, 5, 20 );
-	fgSizerTranslators->SetFlexibleDirection( wxBOTH );
-	fgSizerTranslators->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	bSizerTranslators->Add( fgSizerTranslators, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_scrolledWindowTranslators->SetSizer( bSizerTranslators );
-	m_scrolledWindowTranslators->Layout();
-	bSizerTranslators->Fit( m_scrolledWindowTranslators );
-	bSizer53->Add( m_scrolledWindowTranslators, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxBOTTOM, 5 );
-	
-	bSizer31->Add( bSizer53, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT|wxEXPAND, 25 );
-	
-	m_staticline3 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer31->Add( m_staticline3, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
-	
-	m_staticText131 = new wxStaticText( this, wxID_ANY, _("Feedback and suggestions are welcome at:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText131->Wrap( -1 );
-	m_staticText131->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer31->Add( m_staticText131, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_staticline12 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer31->Add( m_staticline12, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
-	
-	wxBoxSizer* bSizer156;
-	bSizer156 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmap9 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 );
-	m_bitmap9->SetToolTip( _("FreeFileSync at Sourceforge") );
-	
-	bSizer156->Add( m_bitmap9, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-	
-	m_hyperlink1 = new wxHyperlinkCtrl( this, wxID_ANY, _("Homepage"), wxT("http://sourceforge.net/projects/freefilesync/"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink1->SetFont( wxFont( 10, 70, 90, 92, true, wxEmptyString ) );
-	m_hyperlink1->SetToolTip( _("http://sourceforge.net/projects/freefilesync/") );
-	
-	bSizer156->Add( m_hyperlink1, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer156->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_hyperlink3 = new wxHyperlinkCtrl( this, wxID_ANY, _("If you like FFS"), wxT("https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=zhnmju123%40gmx%2ede&no_shipping=0&no_note=1&tax=0&currency_code=EUR&lc=EN&bn=PP%2dDonationsBF&charset=UTF%2d8"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink3->SetFont( wxFont( 10, 70, 90, 92, true, wxEmptyString ) );
-	m_hyperlink3->SetToolTip( _("https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=zhnmju123%40gmx%2ede&no_shipping=0&no_note=1&tax=0&currency_code=EUR&lc=EN&bn=PP%2dDonationsBF&charset=UTF%2d8") );
-	
-	bSizer156->Add( m_hyperlink3, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_animationControl1 = new wxAnimationCtrl( this, wxID_ANY, wxNullAnimation, wxDefaultPosition, wxSize( -1,-1 ), wxAC_DEFAULT_STYLE ); 
-	m_animationControl1->SetToolTip( _("Donate with PayPal") );
-	m_animationControl1->SetMinSize( wxSize( 48,48 ) );
-	
-	bSizer156->Add( m_animationControl1, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-	
-	bSizer31->Add( bSizer156, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxRIGHT|wxLEFT, 10 );
-	
-	wxBoxSizer* bSizer158;
-	bSizer158 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmap10 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 );
-	m_bitmap10->SetToolTip( _("Email") );
-	
-	bSizer158->Add( m_bitmap10, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-	
-	m_hyperlink2 = new wxHyperlinkCtrl( this, wxID_ANY, _("Email"), wxT("mailto:zhnmju123@gmx.de"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink2->SetFont( wxFont( 10, 70, 90, 92, true, wxEmptyString ) );
-	m_hyperlink2->SetToolTip( _("zhnmju123@gmx.de") );
-	
-	bSizer158->Add( m_hyperlink2, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer158->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_hyperlink6 = new wxHyperlinkCtrl( this, wxID_ANY, _("Report translation error"), wxT("http://sourceforge.net/projects/freefilesync/forums/forum/976976"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink6->SetFont( wxFont( 10, 70, 90, 92, true, wxEmptyString ) );
-	m_hyperlink6->SetToolTip( _("http://sourceforge.net/projects/freefilesync/forums/forum/976976") );
-	
-	bSizer158->Add( m_hyperlink6, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bitmapTransl = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 );
-	m_bitmapTransl->SetToolTip( _("Report translation error") );
-	
-	bSizer158->Add( m_bitmapTransl, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-	
-	bSizer31->Add( bSizer158, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxRIGHT|wxLEFT, 10 );
-	
-	m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer31->Add( m_staticline2, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
-	
-	wxStaticBoxSizer* sbSizer14;
-	sbSizer14 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Published under the GNU General Public License:") ), wxHORIZONTAL );
-	
-	
-	sbSizer14->Add( 0, 0, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bitmap13 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 88,31 ), 0 );
-	sbSizer14->Add( m_bitmap13, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_hyperlink5 = new wxHyperlinkCtrl( this, wxID_ANY, _("http://www.gnu.org/licenses/gpl.html"), wxT("http://www.gnu.org/licenses/gpl.html"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	sbSizer14->Add( m_hyperlink5, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	sbSizer14->Add( 0, 0, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer31->Add( sbSizer14, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
-	
-	m_buttonOkay = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( 100,32 ), 0 );
-	m_buttonOkay->SetDefault(); 
-	m_buttonOkay->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer31->Add( m_buttonOkay, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
-	
-	this->SetSizer( bSizer31 );
-	this->Layout();
-	bSizer31->Fit( this );
-	
-	this->Centre( wxBOTH );
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( AboutDlgGenerated::OnClose ) );
-	m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::OnOK ), NULL, this );
+    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+
+    wxBoxSizer* bSizer31;
+    bSizer31 = new wxBoxSizer( wxVERTICAL );
+
+
+    bSizer31->Add( 0, 5, 0, 0, 5 );
+
+    m_panel5 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxSIMPLE_BORDER|wxTAB_TRAVERSAL );
+    m_panel5->SetBackgroundColour( wxColour( 255, 255, 255 ) );
+
+    wxBoxSizer* bSizer36;
+    bSizer36 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmap11 = new wxStaticBitmap( m_panel5, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 404,55 ), 0 );
+    bSizer36->Add( m_bitmap11, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_panel5->SetSizer( bSizer36 );
+    m_panel5->Layout();
+    bSizer36->Fit( m_panel5 );
+    bSizer31->Add( m_panel5, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_build = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_build->Wrap( -1 );
+    m_build->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer31->Add( m_build, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+
+    bSizer31->Add( 0, 10, 0, 0, 5 );
+
+    wxBoxSizer* bSizer53;
+    bSizer53 = new wxBoxSizer( wxVERTICAL );
+
+    m_panel33 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxDOUBLE_BORDER|wxTAB_TRAVERSAL );
+    m_panel33->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+
+    bSizerCodeInfo = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText72 = new wxStaticText( m_panel33, wxID_ANY, _("Source code written in C++ utilizing:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText72->Wrap( -1 );
+    m_staticText72->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizerCodeInfo->Add( m_staticText72, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+    wxBoxSizer* bSizer167;
+    bSizer167 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer171;
+    bSizer171 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_hyperlink9 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("MinGW"), wxT("http://www.mingw.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink9->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+
+    bSizer171->Add( m_hyperlink9, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    m_hyperlink11 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("MS Visual C++"), wxT("http://msdn.microsoft.com/library/60k1461a.aspx"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink11->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+
+    bSizer171->Add( m_hyperlink11, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    m_hyperlink10 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("Code::Blocks"), wxT("http://www.codeblocks.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink10->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+
+    bSizer171->Add( m_hyperlink10, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    m_hyperlink13 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("Boost"), wxT("http://www.boost.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink13->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+
+    bSizer171->Add( m_hyperlink13, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    m_hyperlink7 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("wxWidgets"), wxT("http://www.wxwidgets.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink7->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+
+    bSizer171->Add( m_hyperlink7, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    m_hyperlink16 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("Artistic Style"), wxT("http://astyle.sourceforge.net"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink16->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+
+    bSizer171->Add( m_hyperlink16, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    bSizer167->Add( bSizer171, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM, 5 );
+
+    wxBoxSizer* bSizer172;
+    bSizer172 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_hyperlink8 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("Loki"), wxT("http://sourceforge.net/projects/loki-lib"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink8->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+
+    bSizer172->Add( m_hyperlink8, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    m_hyperlink15 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("zenXML"), wxT("http://sourceforge.net/projects/zenxml/"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink15->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+
+    bSizer172->Add( m_hyperlink15, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    m_hyperlink12 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("Google Test"), wxT("http://code.google.com/p/googletest"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink12->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+
+    bSizer172->Add( m_hyperlink12, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    m_hyperlink18 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("Unicode NSIS"), wxT("http://www.scratchpaper.com"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink18->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+
+    bSizer172->Add( m_hyperlink18, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    m_hyperlink14 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("wxFormBuilder"), wxT("http://wxformbuilder.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink14->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+
+    bSizer172->Add( m_hyperlink14, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    bSizer167->Add( bSizer172, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    bSizerCodeInfo->Add( bSizer167, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_hyperlink21 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("- ZenJu -"), wxT("mailto:zhnmju123@gmx.de"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink21->SetFont( wxFont( 10, 74, 93, 92, false, wxT("Segoe Print") ) );
+    m_hyperlink21->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+    m_hyperlink21->SetToolTip( _("zhnmju123@gmx.de") );
+
+    bSizerCodeInfo->Add( m_hyperlink21, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_panel33->SetSizer( bSizerCodeInfo );
+    m_panel33->Layout();
+    bSizerCodeInfo->Fit( m_panel33 );
+    bSizer53->Add( m_panel33, 0, wxBOTTOM|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+    m_scrolledWindowTranslators = new wxScrolledWindow( this, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxDOUBLE_BORDER|wxHSCROLL|wxVSCROLL );
+    m_scrolledWindowTranslators->SetScrollRate( 5, 5 );
+    m_scrolledWindowTranslators->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+    m_scrolledWindowTranslators->SetMinSize( wxSize( -1,180 ) );
+
+    bSizerTranslators = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText54 = new wxStaticText( m_scrolledWindowTranslators, wxID_ANY, _("Big thanks for localizing FreeFileSync goes out to:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText54->Wrap( -1 );
+    m_staticText54->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizerTranslators->Add( m_staticText54, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxBOTTOM, 5 );
+
+
+    bSizerTranslators->Add( 0, 5, 0, 0, 5 );
+
+    fgSizerTranslators = new wxFlexGridSizer( 50, 3, 5, 20 );
+    fgSizerTranslators->SetFlexibleDirection( wxBOTH );
+    fgSizerTranslators->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    bSizerTranslators->Add( fgSizerTranslators, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_scrolledWindowTranslators->SetSizer( bSizerTranslators );
+    m_scrolledWindowTranslators->Layout();
+    bSizerTranslators->Fit( m_scrolledWindowTranslators );
+    bSizer53->Add( m_scrolledWindowTranslators, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxBOTTOM, 5 );
+
+    bSizer31->Add( bSizer53, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT|wxEXPAND, 25 );
+
+    m_staticline3 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer31->Add( m_staticline3, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
+
+    m_staticText131 = new wxStaticText( this, wxID_ANY, _("Feedback and suggestions are welcome at:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText131->Wrap( -1 );
+    m_staticText131->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer31->Add( m_staticText131, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_staticline12 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer31->Add( m_staticline12, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
+
+    wxBoxSizer* bSizer156;
+    bSizer156 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmap9 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 );
+    m_bitmap9->SetToolTip( _("FreeFileSync at Sourceforge") );
+
+    bSizer156->Add( m_bitmap9, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+
+    m_hyperlink1 = new wxHyperlinkCtrl( this, wxID_ANY, _("Homepage"), wxT("http://sourceforge.net/projects/freefilesync/"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink1->SetFont( wxFont( 10, 70, 90, 92, true, wxEmptyString ) );
+    m_hyperlink1->SetToolTip( _("http://sourceforge.net/projects/freefilesync/") );
+
+    bSizer156->Add( m_hyperlink1, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer156->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_hyperlink3 = new wxHyperlinkCtrl( this, wxID_ANY, _("If you like FFS"), wxT("https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=zhnmju123@gmx.de&lc=US&currency_code=EUR"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink3->SetFont( wxFont( 10, 70, 90, 92, true, wxEmptyString ) );
+    m_hyperlink3->SetToolTip( _("https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=zhnmju123@gmx.de&lc=US&currency_code=EUR") );
+
+    bSizer156->Add( m_hyperlink3, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_animationControl1 = new wxAnimationCtrl( this, wxID_ANY, wxNullAnimation, wxDefaultPosition, wxSize( -1,-1 ), wxAC_DEFAULT_STYLE );
+    m_animationControl1->SetToolTip( _("Donate with PayPal") );
+    m_animationControl1->SetMinSize( wxSize( 48,48 ) );
+
+    bSizer156->Add( m_animationControl1, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+
+    bSizer31->Add( bSizer156, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxRIGHT|wxLEFT, 10 );
+
+    wxBoxSizer* bSizer158;
+    bSizer158 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmap10 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 );
+    m_bitmap10->SetToolTip( _("Email") );
+
+    bSizer158->Add( m_bitmap10, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+
+    m_hyperlink2 = new wxHyperlinkCtrl( this, wxID_ANY, _("Email"), wxT("mailto:zhnmju123@gmx.de"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink2->SetFont( wxFont( 10, 70, 90, 92, true, wxEmptyString ) );
+    m_hyperlink2->SetToolTip( _("zhnmju123@gmx.de") );
+
+    bSizer158->Add( m_hyperlink2, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer158->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_hyperlink6 = new wxHyperlinkCtrl( this, wxID_ANY, _("Report translation error"), wxT("http://sourceforge.net/projects/freefilesync/forums/forum/976976"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink6->SetFont( wxFont( 10, 70, 90, 92, true, wxEmptyString ) );
+    m_hyperlink6->SetToolTip( _("http://sourceforge.net/projects/freefilesync/forums/forum/976976") );
+
+    bSizer158->Add( m_hyperlink6, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bitmapTransl = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 );
+    m_bitmapTransl->SetToolTip( _("Report translation error") );
+
+    bSizer158->Add( m_bitmapTransl, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+
+    bSizer31->Add( bSizer158, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxRIGHT|wxLEFT, 10 );
+
+    m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer31->Add( m_staticline2, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
+
+    wxStaticBoxSizer* sbSizer14;
+    sbSizer14 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Published under the GNU General Public License:") ), wxHORIZONTAL );
+
+
+    sbSizer14->Add( 0, 0, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bitmap13 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 88,31 ), 0 );
+    sbSizer14->Add( m_bitmap13, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_hyperlink5 = new wxHyperlinkCtrl( this, wxID_ANY, _("http://www.gnu.org/licenses/gpl.html"), wxT("http://www.gnu.org/licenses/gpl.html"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    sbSizer14->Add( m_hyperlink5, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    sbSizer14->Add( 0, 0, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer31->Add( sbSizer14, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
+
+    m_buttonOkay = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( 100,32 ), 0 );
+    m_buttonOkay->SetDefault();
+    m_buttonOkay->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer31->Add( m_buttonOkay, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+
+    this->SetSizer( bSizer31 );
+    this->Layout();
+    bSizer31->Fit( this );
+
+    this->Centre( wxBOTH );
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( AboutDlgGenerated::OnClose ) );
+    m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::OnOK ), NULL, this );
 }
 
 AboutDlgGenerated::~AboutDlgGenerated()
 {
-	// Disconnect Events
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( AboutDlgGenerated::OnClose ) );
-	m_buttonOkay->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::OnOK ), NULL, this );
-	
+    // Disconnect Events
+    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( AboutDlgGenerated::OnClose ) );
+    m_buttonOkay->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::OnOK ), NULL, this );
+
 }
 
 ErrorDlgGenerated::ErrorDlgGenerated( 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 );
-	
-	
-	bSizer24->Add( 0, 10, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer26;
-	bSizer26 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmap10 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 );
-	bSizer26->Add( m_bitmap10, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_textCtrl8 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE|wxTE_READONLY );
-	m_textCtrl8->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-	
-	bSizer26->Add( m_textCtrl8, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
-	
-	bSizer24->Add( bSizer26, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	m_checkBoxIgnoreErrors = new wxCheckBox( this, wxID_ANY, _("Ignore subsequent errors"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_checkBoxIgnoreErrors->SetToolTip( _("Hide further error messages during the current process") );
-	
-	bSizer24->Add( m_checkBoxIgnoreErrors, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP, 10 );
-	
-	
-	bSizer24->Add( 0, 5, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer25;
-	bSizer25 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_buttonIgnore = new wxButton( this, wxID_OK, _("&Ignore"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_buttonIgnore->SetDefault(); 
-	m_buttonIgnore->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer25->Add( m_buttonIgnore, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
-	
-	m_buttonRetry = new wxButton( this, wxID_RETRY, _("&Retry"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_buttonRetry->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer25->Add( m_buttonRetry, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
-	
-	m_buttonAbort = new wxButton( this, wxID_CANCEL, _("&Abort"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_buttonAbort->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer25->Add( m_buttonAbort, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
-	
-	
-	bSizer25->Add( 5, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer24->Add( bSizer25, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	this->SetSizer( bSizer24 );
-	this->Layout();
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( ErrorDlgGenerated::OnClose ) );
-	m_buttonIgnore->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ErrorDlgGenerated::OnIgnore ), NULL, this );
-	m_buttonRetry->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ErrorDlgGenerated::OnRetry ), NULL, this );
-	m_buttonAbort->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ErrorDlgGenerated::OnAbort ), NULL, this );
+    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+
+    wxBoxSizer* bSizer24;
+    bSizer24 = new wxBoxSizer( wxVERTICAL );
+
+
+    bSizer24->Add( 0, 10, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer26;
+    bSizer26 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmap10 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 );
+    bSizer26->Add( m_bitmap10, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_textCtrl8 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE|wxTE_READONLY );
+    m_textCtrl8->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+
+    bSizer26->Add( m_textCtrl8, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
+
+    bSizer24->Add( bSizer26, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+    m_checkBoxIgnoreErrors = new wxCheckBox( this, wxID_ANY, _("Ignore subsequent errors"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_checkBoxIgnoreErrors->SetToolTip( _("Hide further error messages during the current process") );
+
+    bSizer24->Add( m_checkBoxIgnoreErrors, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP, 10 );
+
+
+    bSizer24->Add( 0, 5, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer25;
+    bSizer25 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_buttonIgnore = new wxButton( this, wxID_OK, _("&Ignore"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_buttonIgnore->SetDefault();
+    m_buttonIgnore->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer25->Add( m_buttonIgnore, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+    m_buttonRetry = new wxButton( this, wxID_RETRY, _("&Retry"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_buttonRetry->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer25->Add( m_buttonRetry, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+    m_buttonAbort = new wxButton( this, wxID_CANCEL, _("&Abort"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_buttonAbort->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer25->Add( m_buttonAbort, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+
+    bSizer25->Add( 5, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer24->Add( bSizer25, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    this->SetSizer( bSizer24 );
+    this->Layout();
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( ErrorDlgGenerated::OnClose ) );
+    m_buttonIgnore->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ErrorDlgGenerated::OnIgnore ), NULL, this );
+    m_buttonRetry->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ErrorDlgGenerated::OnRetry ), NULL, this );
+    m_buttonAbort->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ErrorDlgGenerated::OnAbort ), NULL, this );
 }
 
 ErrorDlgGenerated::~ErrorDlgGenerated()
 {
-	// Disconnect Events
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( ErrorDlgGenerated::OnClose ) );
-	m_buttonIgnore->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ErrorDlgGenerated::OnIgnore ), NULL, this );
-	m_buttonRetry->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ErrorDlgGenerated::OnRetry ), NULL, this );
-	m_buttonAbort->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ErrorDlgGenerated::OnAbort ), NULL, this );
-	
+    // Disconnect Events
+    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( ErrorDlgGenerated::OnClose ) );
+    m_buttonIgnore->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ErrorDlgGenerated::OnIgnore ), NULL, this );
+    m_buttonRetry->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ErrorDlgGenerated::OnRetry ), NULL, this );
+    m_buttonAbort->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ErrorDlgGenerated::OnAbort ), NULL, this );
+
 }
 
 WarningDlgGenerated::WarningDlgGenerated( 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 );
-	
-	
-	bSizer24->Add( 0, 10, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer26;
-	bSizer26 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmap10 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 );
-	bSizer26->Add( m_bitmap10, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_textCtrl8 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE|wxTE_READONLY );
-	m_textCtrl8->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-	
-	bSizer26->Add( m_textCtrl8, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
-	
-	bSizer24->Add( bSizer26, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	m_checkBoxDontShowAgain = new wxCheckBox( this, wxID_ANY, _("Do not show this dialog again"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer24->Add( m_checkBoxDontShowAgain, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP, 10 );
-	
-	
-	bSizer24->Add( 0, 5, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer25;
-	bSizer25 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_buttonIgnore = new wxButton( this, wxID_IGNORE, _("&Ignore"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_buttonIgnore->SetDefault(); 
-	m_buttonIgnore->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer25->Add( m_buttonIgnore, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
-	
-	m_buttonSwitch = new wxButton( this, wxID_MORE, _("&Switch"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_buttonSwitch->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer25->Add( m_buttonSwitch, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
-	
-	m_buttonAbort = new wxButton( this, wxID_CANCEL, _("&Abort"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_buttonAbort->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer25->Add( m_buttonAbort, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
-	
-	
-	bSizer25->Add( 5, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer24->Add( bSizer25, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	this->SetSizer( bSizer24 );
-	this->Layout();
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( WarningDlgGenerated::OnClose ) );
-	m_buttonIgnore->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarningDlgGenerated::OnIgnore ), NULL, this );
-	m_buttonSwitch->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarningDlgGenerated::OnSwitch ), NULL, this );
-	m_buttonAbort->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarningDlgGenerated::OnAbort ), NULL, this );
+    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+
+    wxBoxSizer* bSizer24;
+    bSizer24 = new wxBoxSizer( wxVERTICAL );
+
+
+    bSizer24->Add( 0, 10, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer26;
+    bSizer26 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmap10 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 );
+    bSizer26->Add( m_bitmap10, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_textCtrl8 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE|wxTE_READONLY );
+    m_textCtrl8->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+
+    bSizer26->Add( m_textCtrl8, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
+
+    bSizer24->Add( bSizer26, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+    m_checkBoxDontShowAgain = new wxCheckBox( this, wxID_ANY, _("Do not show this dialog again"), wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer24->Add( m_checkBoxDontShowAgain, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP, 10 );
+
+
+    bSizer24->Add( 0, 5, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer25;
+    bSizer25 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_buttonIgnore = new wxButton( this, wxID_IGNORE, _("&Ignore"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_buttonIgnore->SetDefault();
+    m_buttonIgnore->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer25->Add( m_buttonIgnore, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+    m_buttonSwitch = new wxButton( this, wxID_MORE, _("&Switch"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_buttonSwitch->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer25->Add( m_buttonSwitch, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+    m_buttonAbort = new wxButton( this, wxID_CANCEL, _("&Abort"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_buttonAbort->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer25->Add( m_buttonAbort, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+
+    bSizer25->Add( 5, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer24->Add( bSizer25, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    this->SetSizer( bSizer24 );
+    this->Layout();
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( WarningDlgGenerated::OnClose ) );
+    m_buttonIgnore->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarningDlgGenerated::OnIgnore ), NULL, this );
+    m_buttonSwitch->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarningDlgGenerated::OnSwitch ), NULL, this );
+    m_buttonAbort->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarningDlgGenerated::OnAbort ), NULL, this );
 }
 
 WarningDlgGenerated::~WarningDlgGenerated()
 {
-	// Disconnect Events
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( WarningDlgGenerated::OnClose ) );
-	m_buttonIgnore->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarningDlgGenerated::OnIgnore ), NULL, this );
-	m_buttonSwitch->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarningDlgGenerated::OnSwitch ), NULL, this );
-	m_buttonAbort->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarningDlgGenerated::OnAbort ), NULL, this );
-	
+    // Disconnect Events
+    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( WarningDlgGenerated::OnClose ) );
+    m_buttonIgnore->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarningDlgGenerated::OnIgnore ), NULL, this );
+    m_buttonSwitch->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarningDlgGenerated::OnSwitch ), NULL, this );
+    m_buttonAbort->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarningDlgGenerated::OnAbort ), NULL, this );
+
 }
 
 QuestionDlgGenerated::QuestionDlgGenerated( 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 );
-	
-	
-	bSizer24->Add( 0, 10, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer26;
-	bSizer26 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmap10 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 );
-	bSizer26->Add( m_bitmap10, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_textCtrl8 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE|wxTE_READONLY );
-	m_textCtrl8->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-	
-	bSizer26->Add( m_textCtrl8, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
-	
-	bSizer24->Add( bSizer26, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	m_checkBoxDontAskAgain = new wxCheckBox( this, wxID_ANY, _("Do not show this dialog again"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer24->Add( m_checkBoxDontAskAgain, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP, 10 );
-	
-	
-	bSizer24->Add( 0, 5, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer25;
-	bSizer25 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_buttonYes = new wxButton( this, wxID_YES, _("&Yes"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_buttonYes->SetDefault(); 
-	m_buttonYes->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer25->Add( m_buttonYes, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
-	
-	m_buttonNo = new wxButton( this, wxID_NO, _("&No"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_buttonNo->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer25->Add( m_buttonNo, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
-	
-	m_buttonCancel = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_buttonCancel->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer25->Add( m_buttonCancel, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
-	
-	
-	bSizer25->Add( 5, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer24->Add( bSizer25, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	this->SetSizer( bSizer24 );
-	this->Layout();
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( QuestionDlgGenerated::OnClose ) );
-	m_buttonYes->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( QuestionDlgGenerated::OnYes ), NULL, this );
-	m_buttonNo->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( QuestionDlgGenerated::OnNo ), NULL, this );
-	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( QuestionDlgGenerated::OnCancel ), NULL, this );
+    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+
+    wxBoxSizer* bSizer24;
+    bSizer24 = new wxBoxSizer( wxVERTICAL );
+
+
+    bSizer24->Add( 0, 10, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer26;
+    bSizer26 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmap10 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 );
+    bSizer26->Add( m_bitmap10, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_textCtrl8 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE|wxTE_READONLY );
+    m_textCtrl8->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+
+    bSizer26->Add( m_textCtrl8, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
+
+    bSizer24->Add( bSizer26, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+    m_checkBoxDontAskAgain = new wxCheckBox( this, wxID_ANY, _("Do not show this dialog again"), wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer24->Add( m_checkBoxDontAskAgain, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP, 10 );
+
+
+    bSizer24->Add( 0, 5, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer25;
+    bSizer25 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_buttonYes = new wxButton( this, wxID_YES, _("&Yes"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_buttonYes->SetDefault();
+    m_buttonYes->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer25->Add( m_buttonYes, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+    m_buttonNo = new wxButton( this, wxID_NO, _("&No"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_buttonNo->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer25->Add( m_buttonNo, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+    m_buttonCancel = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_buttonCancel->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer25->Add( m_buttonCancel, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+
+    bSizer25->Add( 5, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer24->Add( bSizer25, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    this->SetSizer( bSizer24 );
+    this->Layout();
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( QuestionDlgGenerated::OnClose ) );
+    m_checkBoxDontAskAgain->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( QuestionDlgGenerated::OnCheckBoxDontShowAgain ), NULL, this );
+    m_buttonYes->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( QuestionDlgGenerated::OnYes ), NULL, this );
+    m_buttonNo->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( QuestionDlgGenerated::OnNo ), NULL, this );
+    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( QuestionDlgGenerated::OnCancel ), NULL, this );
 }
 
 QuestionDlgGenerated::~QuestionDlgGenerated()
 {
-	// Disconnect Events
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( QuestionDlgGenerated::OnClose ) );
-	m_buttonYes->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( QuestionDlgGenerated::OnYes ), NULL, this );
-	m_buttonNo->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( QuestionDlgGenerated::OnNo ), NULL, this );
-	m_buttonCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( QuestionDlgGenerated::OnCancel ), NULL, this );
-	
+    // Disconnect Events
+    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( QuestionDlgGenerated::OnClose ) );
+    m_checkBoxDontAskAgain->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( QuestionDlgGenerated::OnCheckBoxDontShowAgain ), NULL, this );
+    m_buttonYes->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( QuestionDlgGenerated::OnYes ), NULL, this );
+    m_buttonNo->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( QuestionDlgGenerated::OnNo ), NULL, this );
+    m_buttonCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( QuestionDlgGenerated::OnCancel ), NULL, this );
+
 }
 
 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( wxDefaultSize, wxDefaultSize );
-	
-	wxBoxSizer* bSizer24;
-	bSizer24 = new wxBoxSizer( wxVERTICAL );
-	
-	
-	bSizer24->Add( 0, 10, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer41;
-	bSizer41 = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizer41->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_bitmap12 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), 0 );
-	bSizer41->Add( m_bitmap12, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticTextHeader = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextHeader->Wrap( -1 );
-	m_staticTextHeader->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer41->Add( m_staticTextHeader, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	
-	bSizer41->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	bSizer24->Add( bSizer41, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer99;
-	bSizer99 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_checkBoxDeleteBothSides = new wxCheckBox( this, wxID_ANY, _("Delete on both sides"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_checkBoxDeleteBothSides->SetToolTip( _("Delete on both sides even if the file is selected on one side only") );
-	
-	bSizer99->Add( m_checkBoxDeleteBothSides, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer99->Add( 0, 0, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_checkBoxUseRecycler = new wxCheckBox( this, wxID_ANY, _("Use Recycle Bin"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_checkBoxUseRecycler->SetValue(true); 
-	bSizer99->Add( m_checkBoxUseRecycler, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer24->Add( bSizer99, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 10 );
-	
-	m_textCtrlMessage = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_DONTWRAP|wxTE_MULTILINE|wxTE_READONLY );
-	m_textCtrlMessage->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-	
-	bSizer24->Add( m_textCtrlMessage, 1, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer25;
-	bSizer25 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_buttonOK = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_buttonOK->SetDefault(); 
-	m_buttonOK->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer25->Add( m_buttonOK, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
-	
-	m_buttonCancel = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_buttonCancel->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer25->Add( m_buttonCancel, 0, wxALL, 5 );
-	
-	bSizer24->Add( bSizer25, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	this->SetSizer( bSizer24 );
-	this->Layout();
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DeleteDlgGenerated::OnClose ) );
-	m_checkBoxDeleteBothSides->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnDelOnBothSides ), NULL, this );
-	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( wxDefaultSize, wxDefaultSize );
+
+    wxBoxSizer* bSizer24;
+    bSizer24 = new wxBoxSizer( wxVERTICAL );
+
+
+    bSizer24->Add( 0, 10, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer41;
+    bSizer41 = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizer41->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_bitmap12 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), 0 );
+    bSizer41->Add( m_bitmap12, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticTextHeader = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextHeader->Wrap( -1 );
+    m_staticTextHeader->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer41->Add( m_staticTextHeader, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+
+    bSizer41->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    bSizer24->Add( bSizer41, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer99;
+    bSizer99 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_checkBoxDeleteBothSides = new wxCheckBox( this, wxID_ANY, _("Delete on both sides"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_checkBoxDeleteBothSides->SetToolTip( _("Delete on both sides even if the file is selected on one side only") );
+
+    bSizer99->Add( m_checkBoxDeleteBothSides, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer99->Add( 0, 0, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_checkBoxUseRecycler = new wxCheckBox( this, wxID_ANY, _("Use Recycle Bin"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_checkBoxUseRecycler->SetValue(true);
+    bSizer99->Add( m_checkBoxUseRecycler, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer24->Add( bSizer99, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 10 );
+
+    m_textCtrlMessage = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_DONTWRAP|wxTE_MULTILINE|wxTE_READONLY );
+    m_textCtrlMessage->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+
+    bSizer24->Add( m_textCtrlMessage, 1, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer25;
+    bSizer25 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_buttonOK = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_buttonOK->SetDefault();
+    m_buttonOK->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer25->Add( m_buttonOK, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+    m_buttonCancel = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_buttonCancel->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer25->Add( m_buttonCancel, 0, wxALL, 5 );
+
+    bSizer24->Add( bSizer25, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    this->SetSizer( bSizer24 );
+    this->Layout();
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DeleteDlgGenerated::OnClose ) );
+    m_checkBoxDeleteBothSides->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnDelOnBothSides ), NULL, this );
+    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()
 {
-	// Disconnect Events
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DeleteDlgGenerated::OnClose ) );
-	m_checkBoxDeleteBothSides->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnDelOnBothSides ), NULL, this );
-	m_checkBoxUseRecycler->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnUseRecycler ), NULL, this );
-	m_buttonOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnOK ), NULL, this );
-	m_buttonCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnCancel ), NULL, this );
-	
+    // Disconnect Events
+    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DeleteDlgGenerated::OnClose ) );
+    m_checkBoxDeleteBothSides->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnDelOnBothSides ), NULL, this );
+    m_checkBoxUseRecycler->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnUseRecycler ), NULL, this );
+    m_buttonOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnOK ), NULL, this );
+    m_buttonCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnCancel ), NULL, this );
+
 }
 
 FilterDlgGenerated::FilterDlgGenerated( 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( 370,380 ), wxDefaultSize );
-	
-	wxBoxSizer* bSizer21;
-	bSizer21 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer86;
-	bSizer86 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmap26 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), 0 );
-	bSizer86->Add( m_bitmap26, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_panel8 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER|wxTAB_TRAVERSAL );
-	m_panel8->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DLIGHT ) );
-	
-	wxBoxSizer* bSizer72;
-	bSizer72 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticTexHeader = new wxStaticText( m_panel8, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTexHeader->Wrap( -1 );
-	m_staticTexHeader->SetFont( wxFont( 16, 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer72->Add( m_staticTexHeader, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
-	
-	m_panel8->SetSizer( bSizer72 );
-	m_panel8->Layout();
-	bSizer72->Fit( m_panel8 );
-	bSizer86->Add( m_panel8, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	
-	bSizer86->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer21->Add( bSizer86, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM, 5 );
-	
-	wxBoxSizer* bSizer70;
-	bSizer70 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText44 = new wxStaticText( this, wxID_ANY, _("Only files/directories that match all filter settings will be selected for synchronization.\nNote: The name filter must be specified relative(!) to main synchronization directories."), wxDefaultPosition, wxSize( 550,-1 ), wxALIGN_CENTRE );
-	m_staticText44->Wrap( 550 );
-	bSizer70->Add( m_staticText44, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonHelp = new wxBitmapButton( this, wxID_HELP, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	m_bpButtonHelp->SetToolTip( _("Help") );
-	
-	bSizer70->Add( m_bpButtonHelp, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
-	bSizer21->Add( bSizer70, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 10 );
-	
-	
-	bSizer21->Add( 0, 5, 0, 0, 5 );
-	
-	m_panel13 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer69;
-	bSizer69 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticline10 = new wxStaticLine( m_panel13, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer69->Add( m_staticline10, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
-	
-	wxBoxSizer* bSizer52;
-	bSizer52 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText45 = new wxStaticText( m_panel13, wxID_ANY, _("Hints:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText45->Wrap( -1 );
-	m_staticText45->SetFont( wxFont( 10, 70, 90, 92, true, wxEmptyString ) );
-	
-	bSizer52->Add( m_staticText45, 0, wxBOTTOM, 5 );
-	
-	m_staticText83 = new wxStaticText( m_panel13, wxID_ANY, _("1. Enter relative file or directory names separated by ';' or a new line."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText83->Wrap( -1 );
-	bSizer52->Add( m_staticText83, 0, 0, 5 );
-	
-	m_staticText84 = new wxStaticText( m_panel13, wxID_ANY, _("2. Use wildcard characters '*' and '?'."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText84->Wrap( -1 );
-	bSizer52->Add( m_staticText84, 0, 0, 5 );
-	
-	m_staticText85 = new wxStaticText( m_panel13, wxID_ANY, _("3. Exclude files directly on main grid via context menu."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText85->Wrap( -1 );
-	bSizer52->Add( m_staticText85, 0, 0, 5 );
-	
-	bSizer69->Add( bSizer52, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 10 );
-	
-	wxStaticBoxSizer* sbSizer21;
-	sbSizer21 = new wxStaticBoxSizer( new wxStaticBox( m_panel13, wxID_ANY, _("Example") ), wxVERTICAL );
-	
-	wxBoxSizer* bSizer66;
-	bSizer66 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText181 = new wxStaticText( m_panel13, wxID_ANY, _("Include: *.doc;*.zip;*.exe\nExclude: \\stuff\\temp\\*"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText181->Wrap( -1 );
-	bSizer66->Add( m_staticText181, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticText1811 = new wxStaticText( m_panel13, wxID_ANY, _("Synchronize all .doc, .zip and .exe files except everything in subfolder \"temp\"."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText1811->Wrap( 250 );
-	m_staticText1811->SetFont( wxFont( 8, 70, 93, 90, false, wxEmptyString ) );
-	
-	bSizer66->Add( m_staticText1811, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
-	sbSizer21->Add( bSizer66, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 5 );
-	
-	bSizer69->Add( sbSizer21, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxRIGHT|wxLEFT, 5 );
-	
-	m_panel13->SetSizer( bSizer69 );
-	m_panel13->Layout();
-	bSizer69->Fit( m_panel13 );
-	bSizer21->Add( m_panel13, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxEXPAND, 5 );
-	
-	
-	bSizer21->Add( 0, 0, 0, 0, 5 );
-	
-	wxBoxSizer* bSizer159;
-	bSizer159 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer166;
-	bSizer166 = new wxBoxSizer( wxVERTICAL );
-	
-	wxStaticBoxSizer* sbSizer8;
-	sbSizer8 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Include") ), wxHORIZONTAL );
-	
-	m_bitmapInclude = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), 0 );
-	sbSizer8->Add( m_bitmapInclude, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxRIGHT, 5 );
-	
-	m_textCtrlInclude = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE );
-	sbSizer8->Add( m_textCtrlInclude, 1, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	bSizer166->Add( sbSizer8, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	wxStaticBoxSizer* sbSizer26;
-	sbSizer26 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Exclude") ), wxHORIZONTAL );
-	
-	m_bitmapExclude = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), 0 );
-	sbSizer26->Add( m_bitmapExclude, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_textCtrlExclude = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE );
-	sbSizer26->Add( m_textCtrlExclude, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	bSizer166->Add( sbSizer26, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	bSizer159->Add( bSizer166, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	
-	bSizer159->Add( 5, 0, 0, 0, 5 );
-	
-	wxBoxSizer* bSizer160;
-	bSizer160 = new wxBoxSizer( wxVERTICAL );
-	
-	wxStaticBoxSizer* sbSizer25;
-	sbSizer25 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Date") ), wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer169;
-	bSizer169 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapFilterDate = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 34,34 ), 0 );
-	bSizer169->Add( m_bitmapFilterDate, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	wxBoxSizer* bSizer165;
-	bSizer165 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText103 = new wxStaticText( this, wxID_ANY, _("Select time span:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText103->Wrap( -1 );
-	bSizer165->Add( m_staticText103, 0, 0, 5 );
-	
-	wxBoxSizer* bSizer164;
-	bSizer164 = new wxBoxSizer( wxVERTICAL );
-	
-	m_spinCtrlTimespan = new wxSpinCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
-	bSizer164->Add( m_spinCtrlTimespan, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	wxArrayString m_choiceUnitTimespanChoices;
-	m_choiceUnitTimespan = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitTimespanChoices, 0 );
-	m_choiceUnitTimespan->SetSelection( 0 );
-	bSizer164->Add( m_choiceUnitTimespan, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer165->Add( bSizer164, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP, 5 );
-	
-	bSizer169->Add( bSizer165, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	sbSizer25->Add( bSizer169, 0, 0, 5 );
-	
-	bSizer160->Add( sbSizer25, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	wxStaticBoxSizer* sbSizer81;
-	sbSizer81 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Size") ), wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer170;
-	bSizer170 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapFilterSize = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 32,32 ), 0 );
-	bSizer170->Add( m_bitmapFilterSize, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxRIGHT, 5 );
-	
-	wxBoxSizer* bSizer158;
-	bSizer158 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText101 = new wxStaticText( this, wxID_ANY, _("Minimum file size:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText101->Wrap( -1 );
-	bSizer158->Add( m_staticText101, 0, 0, 5 );
-	
-	wxBoxSizer* bSizer162;
-	bSizer162 = new wxBoxSizer( wxVERTICAL );
-	
-	m_spinCtrlMinSize = new wxSpinCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
-	bSizer162->Add( m_spinCtrlMinSize, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	wxArrayString m_choiceUnitMinSizeChoices;
-	m_choiceUnitMinSize = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitMinSizeChoices, 0 );
-	m_choiceUnitMinSize->SetSelection( 0 );
-	bSizer162->Add( m_choiceUnitMinSize, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer158->Add( bSizer162, 0, wxBOTTOM, 5 );
-	
-	m_staticText102 = new wxStaticText( this, wxID_ANY, _("Maximum file size:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText102->Wrap( -1 );
-	bSizer158->Add( m_staticText102, 0, 0, 5 );
-	
-	wxBoxSizer* bSizer163;
-	bSizer163 = new wxBoxSizer( wxVERTICAL );
-	
-	m_spinCtrlMaxSize = new wxSpinCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
-	bSizer163->Add( m_spinCtrlMaxSize, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	wxArrayString m_choiceUnitMaxSizeChoices;
-	m_choiceUnitMaxSize = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitMaxSizeChoices, 0 );
-	m_choiceUnitMaxSize->SetSelection( 0 );
-	bSizer163->Add( m_choiceUnitMaxSize, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer158->Add( bSizer163, 0, wxTOP, 5 );
-	
-	bSizer170->Add( bSizer158, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	sbSizer81->Add( bSizer170, 0, 0, 5 );
-	
-	bSizer160->Add( sbSizer81, 1, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	bSizer159->Add( bSizer160, 0, wxEXPAND, 5 );
-	
-	bSizer21->Add( bSizer159, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
-	
-	wxBoxSizer* bSizer22;
-	bSizer22 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_button9 = new wxButton( this, wxID_DEFAULT, _("&Default"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_button9->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer22->Add( m_button9, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer22->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_button10 = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_button10->SetDefault(); 
-	m_button10->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer22->Add( m_button10, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_button17 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_button17->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer22->Add( m_button17, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	bSizer21->Add( bSizer22, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxBOTTOM|wxEXPAND, 5 );
-	
-	this->SetSizer( bSizer21 );
-	this->Layout();
-	bSizer21->Fit( this );
-	
-	this->Centre( wxBOTH );
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( FilterDlgGenerated::OnClose ) );
-	m_bpButtonHelp->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnHelp ), NULL, this );
-	m_textCtrlInclude->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateNameFilter ), NULL, this );
-	m_textCtrlExclude->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateNameFilter ), NULL, this );
-	m_choiceUnitTimespan->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateChoice ), NULL, this );
-	m_choiceUnitMinSize->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateChoice ), NULL, this );
-	m_choiceUnitMaxSize->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateChoice ), NULL, this );
-	m_button9->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnDefault ), NULL, this );
-	m_button10->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnApply ), NULL, this );
-	m_button17->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnCancel ), NULL, this );
+    this->SetSizeHints( wxSize( 370,380 ), wxDefaultSize );
+
+    wxBoxSizer* bSizer21;
+    bSizer21 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer86;
+    bSizer86 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmap26 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), 0 );
+    bSizer86->Add( m_bitmap26, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    m_panel8 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER|wxTAB_TRAVERSAL );
+    m_panel8->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DLIGHT ) );
+
+    wxBoxSizer* bSizer72;
+    bSizer72 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticTexHeader = new wxStaticText( m_panel8, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTexHeader->Wrap( -1 );
+    m_staticTexHeader->SetFont( wxFont( 16, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer72->Add( m_staticTexHeader, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+
+    m_panel8->SetSizer( bSizer72 );
+    m_panel8->Layout();
+    bSizer72->Fit( m_panel8 );
+    bSizer86->Add( m_panel8, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+
+    bSizer86->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer21->Add( bSizer86, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM, 5 );
+
+    wxBoxSizer* bSizer70;
+    bSizer70 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText44 = new wxStaticText( this, wxID_ANY, _("Only files/directories that match all filter settings will be selected for synchronization.\nNote: The name filter must be specified relative(!) to main synchronization directories."), wxDefaultPosition, wxSize( 550,-1 ), wxALIGN_CENTRE );
+    m_staticText44->Wrap( 550 );
+    bSizer70->Add( m_staticText44, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonHelp = new wxBitmapButton( this, wxID_HELP, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    m_bpButtonHelp->SetToolTip( _("Help") );
+
+    bSizer70->Add( m_bpButtonHelp, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+
+    bSizer21->Add( bSizer70, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 10 );
+
+
+    bSizer21->Add( 0, 5, 0, 0, 5 );
+
+    m_panel13 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer69;
+    bSizer69 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticline10 = new wxStaticLine( m_panel13, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer69->Add( m_staticline10, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
+
+    wxBoxSizer* bSizer52;
+    bSizer52 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText45 = new wxStaticText( m_panel13, wxID_ANY, _("Hints:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText45->Wrap( -1 );
+    m_staticText45->SetFont( wxFont( 10, 70, 90, 92, true, wxEmptyString ) );
+
+    bSizer52->Add( m_staticText45, 0, wxBOTTOM, 5 );
+
+    m_staticText83 = new wxStaticText( m_panel13, wxID_ANY, _("1. Enter relative file or directory names separated by ';' or a new line."), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText83->Wrap( -1 );
+    bSizer52->Add( m_staticText83, 0, 0, 5 );
+
+    m_staticText84 = new wxStaticText( m_panel13, wxID_ANY, _("2. Use wildcard characters '*' and '?'."), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText84->Wrap( -1 );
+    bSizer52->Add( m_staticText84, 0, 0, 5 );
+
+    m_staticText85 = new wxStaticText( m_panel13, wxID_ANY, _("3. Exclude files directly on main grid via context menu."), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText85->Wrap( -1 );
+    bSizer52->Add( m_staticText85, 0, 0, 5 );
+
+    bSizer69->Add( bSizer52, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 10 );
+
+    wxStaticBoxSizer* sbSizer21;
+    sbSizer21 = new wxStaticBoxSizer( new wxStaticBox( m_panel13, wxID_ANY, _("Example") ), wxVERTICAL );
+
+    wxBoxSizer* bSizer66;
+    bSizer66 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText181 = new wxStaticText( m_panel13, wxID_ANY, _("Include: *.doc;*.zip;*.exe\nExclude: \\stuff\\temp\\*"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText181->Wrap( -1 );
+    bSizer66->Add( m_staticText181, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticText1811 = new wxStaticText( m_panel13, wxID_ANY, _("Synchronize all .doc, .zip and .exe files except everything in subfolder \"temp\"."), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText1811->Wrap( 250 );
+    m_staticText1811->SetFont( wxFont( 8, 70, 93, 90, false, wxEmptyString ) );
+
+    bSizer66->Add( m_staticText1811, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+
+    sbSizer21->Add( bSizer66, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 5 );
+
+    bSizer69->Add( sbSizer21, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxRIGHT|wxLEFT, 5 );
+
+    m_panel13->SetSizer( bSizer69 );
+    m_panel13->Layout();
+    bSizer69->Fit( m_panel13 );
+    bSizer21->Add( m_panel13, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxEXPAND, 5 );
+
+
+    bSizer21->Add( 0, 0, 0, 0, 5 );
+
+    wxBoxSizer* bSizer159;
+    bSizer159 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer166;
+    bSizer166 = new wxBoxSizer( wxVERTICAL );
+
+    wxStaticBoxSizer* sbSizer8;
+    sbSizer8 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Include") ), wxHORIZONTAL );
+
+    m_bitmapInclude = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), 0 );
+    sbSizer8->Add( m_bitmapInclude, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxRIGHT, 5 );
+
+    m_textCtrlInclude = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE );
+    sbSizer8->Add( m_textCtrlInclude, 1, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+    bSizer166->Add( sbSizer8, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    wxStaticBoxSizer* sbSizer26;
+    sbSizer26 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Exclude") ), wxHORIZONTAL );
+
+    m_bitmapExclude = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), 0 );
+    sbSizer26->Add( m_bitmapExclude, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    m_textCtrlExclude = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE );
+    sbSizer26->Add( m_textCtrlExclude, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    bSizer166->Add( sbSizer26, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+    bSizer159->Add( bSizer166, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+
+    bSizer159->Add( 5, 0, 0, 0, 5 );
+
+    wxBoxSizer* bSizer160;
+    bSizer160 = new wxBoxSizer( wxVERTICAL );
+
+    wxStaticBoxSizer* sbSizer25;
+    sbSizer25 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Date") ), wxHORIZONTAL );
+
+    wxBoxSizer* bSizer169;
+    bSizer169 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapFilterDate = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 34,34 ), 0 );
+    bSizer169->Add( m_bitmapFilterDate, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    wxBoxSizer* bSizer165;
+    bSizer165 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText103 = new wxStaticText( this, wxID_ANY, _("Select time span"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText103->Wrap( -1 );
+    bSizer165->Add( m_staticText103, 0, 0, 5 );
+
+    wxBoxSizer* bSizer164;
+    bSizer164 = new wxBoxSizer( wxVERTICAL );
+
+    wxArrayString m_choiceUnitTimespanChoices;
+    m_choiceUnitTimespan = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitTimespanChoices, 0 );
+    m_choiceUnitTimespan->SetSelection( 0 );
+    bSizer164->Add( m_choiceUnitTimespan, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_spinCtrlTimespan = new wxSpinCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
+    m_spinCtrlTimespan->Hide();
+
+    bSizer164->Add( m_spinCtrlTimespan, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer165->Add( bSizer164, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer169->Add( bSizer165, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    sbSizer25->Add( bSizer169, 0, 0, 5 );
+
+    bSizer160->Add( sbSizer25, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+    wxStaticBoxSizer* sbSizer81;
+    sbSizer81 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Size") ), wxHORIZONTAL );
+
+    wxBoxSizer* bSizer170;
+    bSizer170 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapFilterSize = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 32,32 ), 0 );
+    bSizer170->Add( m_bitmapFilterSize, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxRIGHT, 5 );
+
+    wxBoxSizer* bSizer158;
+    bSizer158 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText101 = new wxStaticText( this, wxID_ANY, _("Minimum file size"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText101->Wrap( -1 );
+    bSizer158->Add( m_staticText101, 0, 0, 5 );
+
+    wxBoxSizer* bSizer162;
+    bSizer162 = new wxBoxSizer( wxVERTICAL );
+
+    m_spinCtrlMinSize = new wxSpinCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
+    bSizer162->Add( m_spinCtrlMinSize, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    wxArrayString m_choiceUnitMinSizeChoices;
+    m_choiceUnitMinSize = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitMinSizeChoices, 0 );
+    m_choiceUnitMinSize->SetSelection( 0 );
+    bSizer162->Add( m_choiceUnitMinSize, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer158->Add( bSizer162, 0, wxBOTTOM, 5 );
+
+    m_staticText102 = new wxStaticText( this, wxID_ANY, _("Maximum file size"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText102->Wrap( -1 );
+    bSizer158->Add( m_staticText102, 0, 0, 5 );
+
+    wxBoxSizer* bSizer163;
+    bSizer163 = new wxBoxSizer( wxVERTICAL );
+
+    m_spinCtrlMaxSize = new wxSpinCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
+    bSizer163->Add( m_spinCtrlMaxSize, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    wxArrayString m_choiceUnitMaxSizeChoices;
+    m_choiceUnitMaxSize = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitMaxSizeChoices, 0 );
+    m_choiceUnitMaxSize->SetSelection( 0 );
+    bSizer163->Add( m_choiceUnitMaxSize, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer158->Add( bSizer163, 0, wxTOP, 5 );
+
+    bSizer170->Add( bSizer158, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    sbSizer81->Add( bSizer170, 0, 0, 5 );
+
+    bSizer160->Add( sbSizer81, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+    bSizer159->Add( bSizer160, 0, wxEXPAND, 5 );
+
+    bSizer21->Add( bSizer159, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
+
+    wxBoxSizer* bSizer22;
+    bSizer22 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_button9 = new wxButton( this, wxID_DEFAULT, _("&Default"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_button9->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer22->Add( m_button9, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer22->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_button10 = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_button10->SetDefault();
+    m_button10->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer22->Add( m_button10, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+    m_button17 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_button17->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer22->Add( m_button17, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    bSizer21->Add( bSizer22, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxBOTTOM|wxEXPAND, 5 );
+
+    this->SetSizer( bSizer21 );
+    this->Layout();
+    bSizer21->Fit( this );
+
+    this->Centre( wxBOTH );
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( FilterDlgGenerated::OnClose ) );
+    m_bpButtonHelp->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnHelp ), NULL, this );
+    m_textCtrlInclude->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateNameFilter ), NULL, this );
+    m_textCtrlExclude->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateNameFilter ), NULL, this );
+    m_choiceUnitTimespan->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateChoice ), NULL, this );
+    m_choiceUnitMinSize->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateChoice ), NULL, this );
+    m_choiceUnitMaxSize->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateChoice ), NULL, this );
+    m_button9->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnDefault ), NULL, this );
+    m_button10->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnApply ), NULL, this );
+    m_button17->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnCancel ), NULL, this );
 }
 
 FilterDlgGenerated::~FilterDlgGenerated()
 {
-	// Disconnect Events
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( FilterDlgGenerated::OnClose ) );
-	m_bpButtonHelp->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnHelp ), NULL, this );
-	m_textCtrlInclude->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateNameFilter ), NULL, this );
-	m_textCtrlExclude->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateNameFilter ), NULL, this );
-	m_choiceUnitTimespan->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateChoice ), NULL, this );
-	m_choiceUnitMinSize->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateChoice ), NULL, this );
-	m_choiceUnitMaxSize->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateChoice ), NULL, this );
-	m_button9->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnDefault ), NULL, this );
-	m_button10->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnApply ), NULL, this );
-	m_button17->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnCancel ), NULL, this );
-	
+    // Disconnect Events
+    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( FilterDlgGenerated::OnClose ) );
+    m_bpButtonHelp->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnHelp ), NULL, this );
+    m_textCtrlInclude->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateNameFilter ), NULL, this );
+    m_textCtrlExclude->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateNameFilter ), NULL, this );
+    m_choiceUnitTimespan->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateChoice ), NULL, this );
+    m_choiceUnitMinSize->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateChoice ), NULL, this );
+    m_choiceUnitMaxSize->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateChoice ), NULL, this );
+    m_button9->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnDefault ), NULL, this );
+    m_button10->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnApply ), NULL, this );
+    m_button17->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnCancel ), NULL, this );
+
 }
 
 CustomizeColsDlgGenerated::CustomizeColsDlgGenerated( 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* bSizer96;
-	bSizer96 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer99;
-	bSizer99 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxArrayString m_checkListColumnsChoices;
-	m_checkListColumns = new wxCheckListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_checkListColumnsChoices, 0 );
-	bSizer99->Add( m_checkListColumns, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	wxBoxSizer* bSizer98;
-	bSizer98 = new wxBoxSizer( wxVERTICAL );
-	
-	m_bpButton29 = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	m_bpButton29->SetToolTip( _("Move column up") );
-	
-	bSizer98->Add( m_bpButton29, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-	
-	m_bpButton30 = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	m_bpButton30->SetToolTip( _("Move column down") );
-	
-	bSizer98->Add( m_bpButton30, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	bSizer99->Add( bSizer98, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer96->Add( bSizer99, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	wxBoxSizer* bSizer97;
-	bSizer97 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_button9 = new wxButton( this, wxID_DEFAULT, _("&Default"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_button9->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer97->Add( m_button9, 0, wxALL, 5 );
-	
-	
-	bSizer97->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_button28 = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_button28->SetDefault(); 
-	m_button28->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer97->Add( m_button28, 0, wxALL, 5 );
-	
-	m_button29 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_button29->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer97->Add( m_button29, 0, wxALL, 5 );
-	
-	bSizer96->Add( bSizer97, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-	
-	this->SetSizer( bSizer96 );
-	this->Layout();
-	bSizer96->Fit( this );
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CustomizeColsDlgGenerated::OnClose ) );
-	m_bpButton29->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnMoveUp ), NULL, this );
-	m_bpButton30->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnMoveDown ), NULL, this );
-	m_button9->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnDefault ), NULL, this );
-	m_button28->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnOkay ), NULL, this );
-	m_button29->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnCancel ), NULL, this );
+    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+
+    wxBoxSizer* bSizer96;
+    bSizer96 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer99;
+    bSizer99 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxArrayString m_checkListColumnsChoices;
+    m_checkListColumns = new wxCheckListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_checkListColumnsChoices, 0 );
+    bSizer99->Add( m_checkListColumns, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    wxBoxSizer* bSizer98;
+    bSizer98 = new wxBoxSizer( wxVERTICAL );
+
+    m_bpButton29 = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    m_bpButton29->SetToolTip( _("Move column up") );
+
+    bSizer98->Add( m_bpButton29, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+
+    m_bpButton30 = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    m_bpButton30->SetToolTip( _("Move column down") );
+
+    bSizer98->Add( m_bpButton30, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+    bSizer99->Add( bSizer98, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer96->Add( bSizer99, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    wxBoxSizer* bSizer97;
+    bSizer97 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_button9 = new wxButton( this, wxID_DEFAULT, _("&Default"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_button9->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer97->Add( m_button9, 0, wxALL, 5 );
+
+
+    bSizer97->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_button28 = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_button28->SetDefault();
+    m_button28->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer97->Add( m_button28, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+    m_button29 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_button29->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer97->Add( m_button29, 0, wxALL, 5 );
+
+    bSizer96->Add( bSizer97, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+
+    this->SetSizer( bSizer96 );
+    this->Layout();
+    bSizer96->Fit( this );
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CustomizeColsDlgGenerated::OnClose ) );
+    m_bpButton29->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnMoveUp ), NULL, this );
+    m_bpButton30->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnMoveDown ), NULL, this );
+    m_button9->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnDefault ), NULL, this );
+    m_button28->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnOkay ), NULL, this );
+    m_button29->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnCancel ), NULL, this );
 }
 
 CustomizeColsDlgGenerated::~CustomizeColsDlgGenerated()
 {
-	// Disconnect Events
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CustomizeColsDlgGenerated::OnClose ) );
-	m_bpButton29->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnMoveUp ), NULL, this );
-	m_bpButton30->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnMoveDown ), NULL, this );
-	m_button9->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnDefault ), NULL, this );
-	m_button28->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnOkay ), NULL, this );
-	m_button29->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnCancel ), NULL, this );
-	
+    // Disconnect Events
+    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CustomizeColsDlgGenerated::OnClose ) );
+    m_bpButton29->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnMoveUp ), NULL, this );
+    m_bpButton30->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnMoveDown ), NULL, this );
+    m_button9->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnDefault ), NULL, this );
+    m_button28->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnOkay ), NULL, this );
+    m_button29->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnCancel ), NULL, this );
+
 }
 
 GlobalSettingsDlgGenerated::GlobalSettingsDlgGenerated( 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( 280,230 ), wxDefaultSize );
-	
-	wxBoxSizer* bSizer95;
-	bSizer95 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer86;
-	bSizer86 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapSettings = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), 0 );
-	bSizer86->Add( m_bitmapSettings, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-	
-	
-	bSizer86->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_panel8 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER|wxTAB_TRAVERSAL );
-	m_panel8->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DLIGHT ) );
-	
-	wxBoxSizer* bSizer72;
-	bSizer72 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText56 = new wxStaticText( m_panel8, wxID_ANY, _("Global settings"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText56->Wrap( -1 );
-	m_staticText56->SetFont( wxFont( 16, 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer72->Add( m_staticText56, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
-	
-	m_panel8->SetSizer( bSizer72 );
-	m_panel8->Layout();
-	bSizer72->Fit( m_panel8 );
-	bSizer86->Add( m_panel8, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	bSizer95->Add( bSizer86, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	bSizer95->Add( 0, 10, 0, 0, 5 );
-	
-	wxStaticBoxSizer* sbSizer23;
-	sbSizer23 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxEmptyString ), wxVERTICAL );
-	
-	m_checkBoxTransCopy = new wxCheckBox( this, wxID_ANY, _("Transactional File Copy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_checkBoxTransCopy->SetToolTip( _("Write files to a temporary (*.ffs_tmp) first and rename them. This guarantees a consistent state even in situations of fatal error.") );
-	
-	sbSizer23->Add( m_checkBoxTransCopy, 0, wxALL|wxEXPAND, 5 );
-	
-	m_checkBoxCopyLocked = new wxCheckBox( this, wxID_ANY, _("Copy locked files"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_checkBoxCopyLocked->SetToolTip( _("Copy shared or locked files using Volume Shadow Copy Service\n(Requires Administrator rights)") );
-	
-	sbSizer23->Add( m_checkBoxCopyLocked, 0, wxALL|wxEXPAND, 5 );
-	
-	m_checkBoxCopyPermissions = new wxCheckBox( this, wxID_ANY, _("Copy filesystem permissions"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_checkBoxCopyPermissions->SetToolTip( _("Transfer file and directory permissions\n(Requires Administrator rights)") );
-	
-	sbSizer23->Add( m_checkBoxCopyPermissions, 0, wxALL|wxEXPAND, 5 );
-	
-	m_staticline10 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	sbSizer23->Add( m_staticline10, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxTOP|wxBOTTOM, 5 );
-	
-	wxBoxSizer* bSizer101;
-	bSizer101 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText100 = new wxStaticText( this, wxID_ANY, _("Hidden dialogs:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText100->Wrap( -1 );
-	bSizer101->Add( m_staticText100, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer101->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_buttonResetDialogs = new wxButtonWithImage( this, wxID_ANY, _("Reset"), wxDefaultPosition, wxSize( 80,-1 ), 0 );
-	m_buttonResetDialogs->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	m_buttonResetDialogs->SetToolTip( _("Show hidden dialogs") );
-	
-	bSizer101->Add( m_buttonResetDialogs, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	sbSizer23->Add( bSizer101, 0, wxEXPAND, 5 );
-	
-	bSizer95->Add( sbSizer23, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-	
-	
-	bSizer95->Add( 0, 10, 0, 0, 5 );
-	
-	wxStaticBoxSizer* sbSizer26;
-	sbSizer26 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("External applications") ), wxHORIZONTAL );
-	
-	
-	sbSizer26->Add( 5, 0, 0, 0, 5 );
-	
-	m_gridCustomCommand = new wxGrid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	
-	// Grid
-	m_gridCustomCommand->CreateGrid( 5, 2 );
-	m_gridCustomCommand->EnableEditing( true );
-	m_gridCustomCommand->EnableGridLines( true );
-	m_gridCustomCommand->EnableDragGridSize( false );
-	m_gridCustomCommand->SetMargins( 0, 0 );
-	
-	// Columns
-	m_gridCustomCommand->SetColSize( 0, 129 );
-	m_gridCustomCommand->SetColSize( 1, 179 );
-	m_gridCustomCommand->EnableDragColMove( false );
-	m_gridCustomCommand->EnableDragColSize( true );
-	m_gridCustomCommand->SetColLabelSize( 20 );
-	m_gridCustomCommand->SetColLabelValue( 0, _("Description") );
-	m_gridCustomCommand->SetColLabelValue( 1, _("Command line") );
-	m_gridCustomCommand->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
-	// Rows
-	m_gridCustomCommand->EnableDragRowSize( false );
-	m_gridCustomCommand->SetRowLabelSize( 0 );
-	m_gridCustomCommand->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
-	// Label Appearance
-	
-	// Cell Defaults
-	m_gridCustomCommand->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
-	sbSizer26->Add( m_gridCustomCommand, 1, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer157;
-	bSizer157 = new wxBoxSizer( wxVERTICAL );
-	
-	m_bpButtonAddRow = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
-	bSizer157->Add( m_bpButtonAddRow, 0, 0, 5 );
-	
-	m_bpButtonRemoveRow = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
-	bSizer157->Add( m_bpButtonRemoveRow, 0, 0, 5 );
-	
-	sbSizer26->Add( bSizer157, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	sbSizer26->Add( 5, 0, 0, 0, 5 );
-	
-	bSizer95->Add( sbSizer26, 1, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer97;
-	bSizer97 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_button9 = new wxButton( this, wxID_DEFAULT, _("&Default"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_button9->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer97->Add( m_button9, 0, wxALL, 5 );
-	
-	
-	bSizer97->Add( 0, 0, 1, 0, 5 );
-	
-	m_buttonOkay = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_buttonOkay->SetDefault(); 
-	m_buttonOkay->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer97->Add( m_buttonOkay, 0, wxALL, 5 );
-	
-	m_button29 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_button29->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer97->Add( m_button29, 0, wxALL, 5 );
-	
-	bSizer95->Add( bSizer97, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	this->SetSizer( bSizer95 );
-	this->Layout();
-	bSizer95->Fit( this );
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( GlobalSettingsDlgGenerated::OnClose ) );
-	m_buttonResetDialogs->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnResetDialogs ), NULL, this );
-	m_bpButtonAddRow->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnAddRow ), NULL, this );
-	m_bpButtonRemoveRow->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnRemoveRow ), NULL, this );
-	m_button9->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnDefault ), NULL, this );
-	m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnOkay ), NULL, this );
-	m_button29->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnCancel ), NULL, this );
+    this->SetSizeHints( wxSize( 280,230 ), wxDefaultSize );
+
+    wxBoxSizer* bSizer95;
+    bSizer95 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer86;
+    bSizer86 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapSettings = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), 0 );
+    bSizer86->Add( m_bitmapSettings, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+
+
+    bSizer86->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_panel8 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER|wxTAB_TRAVERSAL );
+    m_panel8->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DLIGHT ) );
+
+    wxBoxSizer* bSizer72;
+    bSizer72 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText56 = new wxStaticText( m_panel8, wxID_ANY, _("Global settings"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText56->Wrap( -1 );
+    m_staticText56->SetFont( wxFont( 16, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer72->Add( m_staticText56, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+
+    m_panel8->SetSizer( bSizer72 );
+    m_panel8->Layout();
+    bSizer72->Fit( m_panel8 );
+    bSizer86->Add( m_panel8, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    bSizer95->Add( bSizer86, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    bSizer95->Add( 0, 10, 0, 0, 5 );
+
+    wxStaticBoxSizer* sbSizer23;
+    sbSizer23 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxEmptyString ), wxVERTICAL );
+
+    m_checkBoxTransCopy = new wxCheckBox( this, wxID_ANY, _("Transactional file copy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_checkBoxTransCopy->SetToolTip( _("Write files to a temporary (*.ffs_tmp) first and rename them. This guarantees a consistent state even in situations of fatal error.") );
+
+    sbSizer23->Add( m_checkBoxTransCopy, 0, wxALL|wxEXPAND, 5 );
+
+    m_checkBoxCopyLocked = new wxCheckBox( this, wxID_ANY, _("Copy locked files"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_checkBoxCopyLocked->SetToolTip( _("Copy shared or locked files using Volume Shadow Copy Service\n(Requires Administrator rights)") );
+
+    sbSizer23->Add( m_checkBoxCopyLocked, 0, wxALL|wxEXPAND, 5 );
+
+    m_checkBoxCopyPermissions = new wxCheckBox( this, wxID_ANY, _("Copy file access permissions"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_checkBoxCopyPermissions->SetToolTip( _("Transfer file and directory permissions\n(Requires Administrator rights)") );
+
+    sbSizer23->Add( m_checkBoxCopyPermissions, 0, wxALL|wxEXPAND, 5 );
+
+    m_staticline10 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    sbSizer23->Add( m_staticline10, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxTOP|wxBOTTOM, 5 );
+
+    wxBoxSizer* bSizer101;
+    bSizer101 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText100 = new wxStaticText( this, wxID_ANY, _("Hidden dialogs:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText100->Wrap( -1 );
+    bSizer101->Add( m_staticText100, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer101->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_buttonResetDialogs = new wxButtonWithImage( this, wxID_ANY, _("Reset"), wxDefaultPosition, wxSize( 80,-1 ), 0 );
+    m_buttonResetDialogs->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+    m_buttonResetDialogs->SetToolTip( _("Show hidden dialogs") );
+
+    bSizer101->Add( m_buttonResetDialogs, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+
+    sbSizer23->Add( bSizer101, 0, wxEXPAND, 5 );
+
+    bSizer95->Add( sbSizer23, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+
+
+    bSizer95->Add( 0, 10, 0, 0, 5 );
+
+    wxStaticBoxSizer* sbSizer26;
+    sbSizer26 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("External applications") ), wxHORIZONTAL );
+
+
+    sbSizer26->Add( 5, 0, 0, 0, 5 );
+
+    m_gridCustomCommand = new wxGrid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+
+    // Grid
+    m_gridCustomCommand->CreateGrid( 5, 2 );
+    m_gridCustomCommand->EnableEditing( true );
+    m_gridCustomCommand->EnableGridLines( true );
+    m_gridCustomCommand->EnableDragGridSize( false );
+    m_gridCustomCommand->SetMargins( 0, 0 );
+
+    // Columns
+    m_gridCustomCommand->SetColSize( 0, 129 );
+    m_gridCustomCommand->SetColSize( 1, 179 );
+    m_gridCustomCommand->EnableDragColMove( false );
+    m_gridCustomCommand->EnableDragColSize( true );
+    m_gridCustomCommand->SetColLabelSize( 20 );
+    m_gridCustomCommand->SetColLabelValue( 0, _("Description") );
+    m_gridCustomCommand->SetColLabelValue( 1, _("Command line") );
+    m_gridCustomCommand->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
+
+    // Rows
+    m_gridCustomCommand->EnableDragRowSize( false );
+    m_gridCustomCommand->SetRowLabelSize( 0 );
+    m_gridCustomCommand->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
+
+    // Label Appearance
+
+    // Cell Defaults
+    m_gridCustomCommand->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+    sbSizer26->Add( m_gridCustomCommand, 1, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer157;
+    bSizer157 = new wxBoxSizer( wxVERTICAL );
+
+    m_bpButtonAddRow = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
+    bSizer157->Add( m_bpButtonAddRow, 0, 0, 5 );
+
+    m_bpButtonRemoveRow = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
+    bSizer157->Add( m_bpButtonRemoveRow, 0, 0, 5 );
+
+    sbSizer26->Add( bSizer157, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    sbSizer26->Add( 5, 0, 0, 0, 5 );
+
+    bSizer95->Add( sbSizer26, 1, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer97;
+    bSizer97 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_button9 = new wxButton( this, wxID_DEFAULT, _("&Default"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_button9->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer97->Add( m_button9, 0, wxALL, 5 );
+
+
+    bSizer97->Add( 0, 0, 1, 0, 5 );
+
+    m_buttonOkay = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_buttonOkay->SetDefault();
+    m_buttonOkay->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer97->Add( m_buttonOkay, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+    m_button29 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_button29->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer97->Add( m_button29, 0, wxALL, 5 );
+
+    bSizer95->Add( bSizer97, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+    this->SetSizer( bSizer95 );
+    this->Layout();
+    bSizer95->Fit( this );
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( GlobalSettingsDlgGenerated::OnClose ) );
+    m_buttonResetDialogs->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnResetDialogs ), NULL, this );
+    m_bpButtonAddRow->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnAddRow ), NULL, this );
+    m_bpButtonRemoveRow->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnRemoveRow ), NULL, this );
+    m_button9->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnDefault ), NULL, this );
+    m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnOkay ), NULL, this );
+    m_button29->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnCancel ), NULL, this );
 }
 
 GlobalSettingsDlgGenerated::~GlobalSettingsDlgGenerated()
 {
-	// Disconnect Events
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( GlobalSettingsDlgGenerated::OnClose ) );
-	m_buttonResetDialogs->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnResetDialogs ), NULL, this );
-	m_bpButtonAddRow->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnAddRow ), NULL, this );
-	m_bpButtonRemoveRow->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnRemoveRow ), NULL, this );
-	m_button9->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnDefault ), NULL, this );
-	m_buttonOkay->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnOkay ), NULL, this );
-	m_button29->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnCancel ), NULL, this );
-	
+    // Disconnect Events
+    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( GlobalSettingsDlgGenerated::OnClose ) );
+    m_buttonResetDialogs->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnResetDialogs ), NULL, this );
+    m_bpButtonAddRow->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnAddRow ), NULL, this );
+    m_bpButtonRemoveRow->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnRemoveRow ), NULL, this );
+    m_button9->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnDefault ), NULL, this );
+    m_buttonOkay->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnOkay ), NULL, this );
+    m_button29->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnCancel ), NULL, this );
+
 }
 
 SyncPreviewDlgGenerated::SyncPreviewDlgGenerated( 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* bSizer134;
-	bSizer134 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer158;
-	bSizer158 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_buttonStartSync = new wxButtonWithImage( this, wxID_ANY, _("Start"), wxDefaultPosition, wxSize( -1,40 ), 0 );
-	m_buttonStartSync->SetDefault(); 
-	m_buttonStartSync->SetFont( wxFont( 14, 70, 90, 92, false, wxT("Arial Black") ) );
-	m_buttonStartSync->SetToolTip( _("Start synchronization") );
-	
-	bSizer158->Add( m_buttonStartSync, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticline16 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-	bSizer158->Add( m_staticline16, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
-	
-	wxStaticBoxSizer* sbSizer28;
-	sbSizer28 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Variant") ), wxVERTICAL );
-	
-	m_staticTextVariant = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextVariant->Wrap( -1 );
-	m_staticTextVariant->SetFont( wxFont( 10, 70, 90, 92, false, wxT("Arial Black") ) );
-	
-	sbSizer28->Add( m_staticTextVariant, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	bSizer158->Add( sbSizer28, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	bSizer134->Add( bSizer158, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	m_staticline14 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer134->Add( m_staticline14, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer141;
-	bSizer141 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxStaticBoxSizer* sbSizer161;
-	sbSizer161 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Statistics") ), wxVERTICAL );
-	
-	wxBoxSizer* bSizer157;
-	bSizer157 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxFlexGridSizer* fgSizer5;
-	fgSizer5 = new wxFlexGridSizer( 4, 2, 0, 5 );
-	fgSizer5->SetFlexibleDirection( wxHORIZONTAL );
-	fgSizer5->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	
-	fgSizer5->Add( 0, 0, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_staticText94 = new wxStaticText( this, wxID_ANY, _("Left"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText94->Wrap( -1 );
-	m_staticText94->SetFont( wxFont( 9, 70, 90, 92, false, wxEmptyString ) );
-	
-	fgSizer5->Add( m_staticText94, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bitmapCreate = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_bitmapCreate->SetToolTip( _("Number of files and directories that will be created") );
-	
-	fgSizer5->Add( m_bitmapCreate, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_textCtrlCreateL = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY|wxTE_RIGHT );
-	m_textCtrlCreateL->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
-	m_textCtrlCreateL->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-	m_textCtrlCreateL->SetToolTip( _("Number of files and directories that will be created") );
-	
-	fgSizer5->Add( m_textCtrlCreateL, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bitmapUpdate = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_bitmapUpdate->SetToolTip( _("Number of files that will be overwritten") );
-	
-	fgSizer5->Add( m_bitmapUpdate, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_textCtrlUpdateL = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY|wxTE_RIGHT );
-	m_textCtrlUpdateL->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
-	m_textCtrlUpdateL->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-	m_textCtrlUpdateL->SetToolTip( _("Number of files that will be overwritten") );
-	
-	fgSizer5->Add( m_textCtrlUpdateL, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bitmapDelete = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_bitmapDelete->SetToolTip( _("Number of files and directories that will be deleted") );
-	
-	fgSizer5->Add( m_bitmapDelete, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_textCtrlDeleteL = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY|wxTE_RIGHT );
-	m_textCtrlDeleteL->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
-	m_textCtrlDeleteL->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-	m_textCtrlDeleteL->SetToolTip( _("Number of files and directories that will be deleted") );
-	
-	fgSizer5->Add( m_textCtrlDeleteL, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer157->Add( fgSizer5, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-	
-	wxFlexGridSizer* fgSizer51;
-	fgSizer51 = new wxFlexGridSizer( 3, 1, 0, 5 );
-	fgSizer51->SetFlexibleDirection( wxHORIZONTAL );
-	fgSizer51->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	m_staticText95 = new wxStaticText( this, wxID_ANY, _("Right"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText95->Wrap( -1 );
-	m_staticText95->SetFont( wxFont( 9, 70, 90, 92, false, wxEmptyString ) );
-	
-	fgSizer51->Add( m_staticText95, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_textCtrlCreateR = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY|wxTE_RIGHT );
-	m_textCtrlCreateR->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
-	m_textCtrlCreateR->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-	m_textCtrlCreateR->SetToolTip( _("Number of files and directories that will be created") );
-	
-	fgSizer51->Add( m_textCtrlCreateR, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_textCtrlUpdateR = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY|wxTE_RIGHT );
-	m_textCtrlUpdateR->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
-	m_textCtrlUpdateR->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-	m_textCtrlUpdateR->SetToolTip( _("Number of files that will be overwritten") );
-	
-	fgSizer51->Add( m_textCtrlUpdateR, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_textCtrlDeleteR = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY|wxTE_RIGHT );
-	m_textCtrlDeleteR->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
-	m_textCtrlDeleteR->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-	m_textCtrlDeleteR->SetToolTip( _("Number of files and directories that will be deleted") );
-	
-	fgSizer51->Add( m_textCtrlDeleteR, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer157->Add( fgSizer51, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	sbSizer161->Add( bSizer157, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	sbSizer161->Add( 0, 10, 0, 0, 5 );
-	
-	wxBoxSizer* bSizer156;
-	bSizer156 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapData = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_bitmapData->SetToolTip( _("Total amount of data that will be transferred") );
-	
-	bSizer156->Add( m_bitmapData, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxRIGHT, 5 );
-	
-	
-	bSizer156->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_textCtrlData = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_CENTRE|wxTE_READONLY );
-	m_textCtrlData->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
-	m_textCtrlData->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-	m_textCtrlData->SetToolTip( _("Total amount of data that will be transferred") );
-	
-	bSizer156->Add( m_textCtrlData, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer156->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	sbSizer161->Add( bSizer156, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-	
-	bSizer141->Add( sbSizer161, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
-	
-	bSizer134->Add( bSizer141, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_staticline12 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer134->Add( m_staticline12, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
-	
-	wxBoxSizer* bSizer142;
-	bSizer142 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_checkBoxDontShowAgain = new wxCheckBox( this, wxID_ANY, _("Do not show this dialog again"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer142->Add( m_checkBoxDontShowAgain, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer142->Add( 10, 0, 1, 0, 5 );
-	
-	m_button16 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_button16->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer142->Add( m_button16, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	bSizer134->Add( bSizer142, 0, wxEXPAND, 5 );
-	
-	this->SetSizer( bSizer134 );
-	this->Layout();
-	bSizer134->Fit( this );
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SyncPreviewDlgGenerated::OnClose ) );
-	m_buttonStartSync->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncPreviewDlgGenerated::OnStartSync ), NULL, this );
-	m_button16->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncPreviewDlgGenerated::OnCancel ), NULL, this );
+    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+
+    wxBoxSizer* bSizer134;
+    bSizer134 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer158;
+    bSizer158 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_buttonStartSync = new wxButtonWithImage( this, wxID_ANY, _("Start"), wxDefaultPosition, wxSize( -1,40 ), 0 );
+    m_buttonStartSync->SetDefault();
+    m_buttonStartSync->SetFont( wxFont( 14, 70, 90, 92, false, wxT("Arial Black") ) );
+    m_buttonStartSync->SetToolTip( _("Start synchronization") );
+
+    bSizer158->Add( m_buttonStartSync, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticline16 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    bSizer158->Add( m_staticline16, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
+
+    wxStaticBoxSizer* sbSizer28;
+    sbSizer28 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Variant") ), wxVERTICAL );
+
+    m_staticTextVariant = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextVariant->Wrap( -1 );
+    m_staticTextVariant->SetFont( wxFont( 10, 70, 90, 92, false, wxT("Arial Black") ) );
+
+    sbSizer28->Add( m_staticTextVariant, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    bSizer158->Add( sbSizer28, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+    bSizer134->Add( bSizer158, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+    m_staticline14 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer134->Add( m_staticline14, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer141;
+    bSizer141 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxStaticBoxSizer* sbSizer161;
+    sbSizer161 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Statistics") ), wxVERTICAL );
+
+    wxBoxSizer* bSizer157;
+    bSizer157 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxFlexGridSizer* fgSizer5;
+    fgSizer5 = new wxFlexGridSizer( 4, 2, 0, 5 );
+    fgSizer5->SetFlexibleDirection( wxHORIZONTAL );
+    fgSizer5->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+
+    fgSizer5->Add( 0, 0, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_staticText94 = new wxStaticText( this, wxID_ANY, _("Left"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText94->Wrap( -1 );
+    m_staticText94->SetFont( wxFont( 9, 70, 90, 92, false, wxEmptyString ) );
+
+    fgSizer5->Add( m_staticText94, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bitmapCreate = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    m_bitmapCreate->SetToolTip( _("Number of files and directories that will be created") );
+
+    fgSizer5->Add( m_bitmapCreate, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_textCtrlCreateL = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY|wxTE_RIGHT );
+    m_textCtrlCreateL->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
+    m_textCtrlCreateL->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+    m_textCtrlCreateL->SetToolTip( _("Number of files and directories that will be created") );
+
+    fgSizer5->Add( m_textCtrlCreateL, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bitmapUpdate = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    m_bitmapUpdate->SetToolTip( _("Number of files that will be overwritten") );
+
+    fgSizer5->Add( m_bitmapUpdate, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_textCtrlUpdateL = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY|wxTE_RIGHT );
+    m_textCtrlUpdateL->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
+    m_textCtrlUpdateL->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+    m_textCtrlUpdateL->SetToolTip( _("Number of files that will be overwritten") );
+
+    fgSizer5->Add( m_textCtrlUpdateL, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bitmapDelete = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    m_bitmapDelete->SetToolTip( _("Number of files and directories that will be deleted") );
+
+    fgSizer5->Add( m_bitmapDelete, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_textCtrlDeleteL = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY|wxTE_RIGHT );
+    m_textCtrlDeleteL->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
+    m_textCtrlDeleteL->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+    m_textCtrlDeleteL->SetToolTip( _("Number of files and directories that will be deleted") );
+
+    fgSizer5->Add( m_textCtrlDeleteL, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer157->Add( fgSizer5, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+
+    wxFlexGridSizer* fgSizer51;
+    fgSizer51 = new wxFlexGridSizer( 3, 1, 0, 5 );
+    fgSizer51->SetFlexibleDirection( wxHORIZONTAL );
+    fgSizer51->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    m_staticText95 = new wxStaticText( this, wxID_ANY, _("Right"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText95->Wrap( -1 );
+    m_staticText95->SetFont( wxFont( 9, 70, 90, 92, false, wxEmptyString ) );
+
+    fgSizer51->Add( m_staticText95, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_textCtrlCreateR = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY|wxTE_RIGHT );
+    m_textCtrlCreateR->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
+    m_textCtrlCreateR->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+    m_textCtrlCreateR->SetToolTip( _("Number of files and directories that will be created") );
+
+    fgSizer51->Add( m_textCtrlCreateR, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_textCtrlUpdateR = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY|wxTE_RIGHT );
+    m_textCtrlUpdateR->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
+    m_textCtrlUpdateR->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+    m_textCtrlUpdateR->SetToolTip( _("Number of files that will be overwritten") );
+
+    fgSizer51->Add( m_textCtrlUpdateR, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_textCtrlDeleteR = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY|wxTE_RIGHT );
+    m_textCtrlDeleteR->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
+    m_textCtrlDeleteR->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+    m_textCtrlDeleteR->SetToolTip( _("Number of files and directories that will be deleted") );
+
+    fgSizer51->Add( m_textCtrlDeleteR, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer157->Add( fgSizer51, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+
+    sbSizer161->Add( bSizer157, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    sbSizer161->Add( 0, 10, 0, 0, 5 );
+
+    wxBoxSizer* bSizer156;
+    bSizer156 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapData = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    m_bitmapData->SetToolTip( _("Total amount of data that will be transferred") );
+
+    bSizer156->Add( m_bitmapData, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxRIGHT, 5 );
+
+
+    bSizer156->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_textCtrlData = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_CENTRE|wxTE_READONLY );
+    m_textCtrlData->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
+    m_textCtrlData->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+    m_textCtrlData->SetToolTip( _("Total amount of data that will be transferred") );
+
+    bSizer156->Add( m_textCtrlData, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer156->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    sbSizer161->Add( bSizer156, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+
+    bSizer141->Add( sbSizer161, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+
+    bSizer134->Add( bSizer141, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_staticline12 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer134->Add( m_staticline12, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
+
+    wxBoxSizer* bSizer142;
+    bSizer142 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_checkBoxDontShowAgain = new wxCheckBox( this, wxID_ANY, _("Do not show this dialog again"), wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer142->Add( m_checkBoxDontShowAgain, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer142->Add( 10, 0, 1, 0, 5 );
+
+    m_button16 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_button16->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer142->Add( m_button16, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    bSizer134->Add( bSizer142, 0, wxEXPAND, 5 );
+
+    this->SetSizer( bSizer134 );
+    this->Layout();
+    bSizer134->Fit( this );
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SyncPreviewDlgGenerated::OnClose ) );
+    m_buttonStartSync->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncPreviewDlgGenerated::OnStartSync ), NULL, this );
+    m_button16->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncPreviewDlgGenerated::OnCancel ), NULL, this );
 }
 
 SyncPreviewDlgGenerated::~SyncPreviewDlgGenerated()
 {
-	// Disconnect Events
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SyncPreviewDlgGenerated::OnClose ) );
-	m_buttonStartSync->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncPreviewDlgGenerated::OnStartSync ), NULL, this );
-	m_button16->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncPreviewDlgGenerated::OnCancel ), NULL, this );
-	
+    // Disconnect Events
+    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SyncPreviewDlgGenerated::OnClose ) );
+    m_buttonStartSync->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncPreviewDlgGenerated::OnStartSync ), NULL, this );
+    m_button16->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncPreviewDlgGenerated::OnCancel ), NULL, this );
+
 }
 
 PopupFrameGenerated1::PopupFrameGenerated1( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxFrame( parent, id, title, pos, size, style )
 {
-	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-	
-	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 );
 }
 
 PopupFrameGenerated1::~PopupFrameGenerated1()
@@ -3853,67 +3698,130 @@ PopupFrameGenerated1::~PopupFrameGenerated1()
 
 SearchDialogGenerated::SearchDialogGenerated( 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* bSizer161;
-	bSizer161 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer166;
-	bSizer166 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer162;
-	bSizer162 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText101 = new wxStaticText( this, wxID_ANY, _("Find what:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText101->Wrap( -1 );
-	bSizer162->Add( m_staticText101, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_textCtrlSearchTxt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 220,-1 ), 0 );
-	bSizer162->Add( m_textCtrlSearchTxt, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer166->Add( bSizer162, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	
-	bSizer166->Add( 0, 10, 0, 0, 5 );
-	
-	m_checkBoxMatchCase = new wxCheckBox( this, wxID_ANY, _("Match case"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer166->Add( m_checkBoxMatchCase, 0, wxALL, 5 );
-	
-	bSizer161->Add( bSizer166, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	wxBoxSizer* bSizer97;
-	bSizer97 = new wxBoxSizer( wxVERTICAL );
-	
-	m_buttonFindNext = new wxButton( this, wxID_OK, _("&Find next"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_buttonFindNext->SetDefault(); 
-	m_buttonFindNext->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer97->Add( m_buttonFindNext, 0, wxALL|wxEXPAND, 5 );
-	
-	m_button29 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_button29->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer97->Add( m_button29, 0, wxALL|wxEXPAND, 5 );
-	
-	bSizer161->Add( bSizer97, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	this->SetSizer( bSizer161 );
-	this->Layout();
-	bSizer161->Fit( this );
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SearchDialogGenerated::OnClose ) );
-	m_textCtrlSearchTxt->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( SearchDialogGenerated::OnText ), NULL, this );
-	m_buttonFindNext->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SearchDialogGenerated::OnFindNext ), NULL, this );
-	m_button29->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SearchDialogGenerated::OnCancel ), NULL, this );
+    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+
+    wxBoxSizer* bSizer161;
+    bSizer161 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer166;
+    bSizer166 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer162;
+    bSizer162 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText101 = new wxStaticText( this, wxID_ANY, _("Find what:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText101->Wrap( -1 );
+    bSizer162->Add( m_staticText101, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_textCtrlSearchTxt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 220,-1 ), 0 );
+    bSizer162->Add( m_textCtrlSearchTxt, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer166->Add( bSizer162, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+
+    bSizer166->Add( 0, 5, 0, 0, 5 );
+
+    m_checkBoxMatchCase = new wxCheckBox( this, wxID_ANY, _("Match case"), wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer166->Add( m_checkBoxMatchCase, 0, wxALL, 5 );
+
+    bSizer161->Add( bSizer166, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer97;
+    bSizer97 = new wxBoxSizer( wxVERTICAL );
+
+    m_buttonFindNext = new wxButton( this, wxID_OK, _("&Find next"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_buttonFindNext->SetDefault();
+    m_buttonFindNext->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer97->Add( m_buttonFindNext, 0, wxEXPAND|wxTOP|wxRIGHT, 5 );
+
+    m_button29 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_button29->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer97->Add( m_button29, 0, wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+
+    bSizer161->Add( bSizer97, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    this->SetSizer( bSizer161 );
+    this->Layout();
+    bSizer161->Fit( this );
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SearchDialogGenerated::OnClose ) );
+    m_textCtrlSearchTxt->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( SearchDialogGenerated::OnText ), NULL, this );
+    m_buttonFindNext->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SearchDialogGenerated::OnFindNext ), NULL, this );
+    m_button29->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SearchDialogGenerated::OnCancel ), NULL, this );
 }
 
 SearchDialogGenerated::~SearchDialogGenerated()
 {
-	// Disconnect Events
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SearchDialogGenerated::OnClose ) );
-	m_textCtrlSearchTxt->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( SearchDialogGenerated::OnText ), NULL, this );
-	m_buttonFindNext->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SearchDialogGenerated::OnFindNext ), NULL, this );
-	m_button29->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SearchDialogGenerated::OnCancel ), NULL, this );
-	
+    // Disconnect Events
+    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SearchDialogGenerated::OnClose ) );
+    m_textCtrlSearchTxt->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( SearchDialogGenerated::OnText ), NULL, this );
+    m_buttonFindNext->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SearchDialogGenerated::OnFindNext ), NULL, this );
+    m_button29->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SearchDialogGenerated::OnCancel ), NULL, this );
+
+}
+
+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 );
+
+    wxBoxSizer* bSizer96;
+    bSizer96 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer98;
+    bSizer98 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_calendarFrom = new wxCalendarCtrl( this, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxCAL_SHOW_HOLIDAYS );
+    bSizer98->Add( m_calendarFrom, 0, wxALL, 5 );
+
+    m_calendarTo = new wxCalendarCtrl( this, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxCAL_SHOW_HOLIDAYS );
+    bSizer98->Add( m_calendarTo, 0, wxALL, 5 );
+
+    bSizer96->Add( bSizer98, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    wxBoxSizer* bSizer97;
+    bSizer97 = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizer97->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_buttonOkay = new wxButton( this, wxID_ANY, _("&OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_buttonOkay->SetDefault();
+    m_buttonOkay->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer97->Add( m_buttonOkay, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_button29 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_button29->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer97->Add( m_button29, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+
+    bSizer97->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    bSizer96->Add( bSizer97, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+    this->SetSizer( bSizer96 );
+    this->Layout();
+    bSizer96->Fit( this );
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SelectTimespanDlgGenerated::OnClose ) );
+    m_calendarFrom->Connect( wxEVT_CALENDAR_SEL_CHANGED, wxCalendarEventHandler( SelectTimespanDlgGenerated::OnChangeSelectionFrom ), NULL, this );
+    m_calendarTo->Connect( wxEVT_CALENDAR_SEL_CHANGED, wxCalendarEventHandler( SelectTimespanDlgGenerated::OnChangeSelectionTo ), NULL, this );
+    m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SelectTimespanDlgGenerated::OnOkay ), NULL, this );
+    m_button29->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SelectTimespanDlgGenerated::OnCancel ), NULL, this );
+}
+
+SelectTimespanDlgGenerated::~SelectTimespanDlgGenerated()
+{
+    // Disconnect Events
+    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SelectTimespanDlgGenerated::OnClose ) );
+    m_calendarFrom->Disconnect( wxEVT_CALENDAR_SEL_CHANGED, wxCalendarEventHandler( SelectTimespanDlgGenerated::OnChangeSelectionFrom ), NULL, this );
+    m_calendarTo->Disconnect( wxEVT_CALENDAR_SEL_CHANGED, wxCalendarEventHandler( SelectTimespanDlgGenerated::OnChangeSelectionTo ), NULL, this );
+    m_buttonOkay->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SelectTimespanDlgGenerated::OnOkay ), NULL, this );
+    m_button29->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SelectTimespanDlgGenerated::OnCancel ), NULL, this );
+
 }
diff --git a/ui/gui_generated.h b/ui/gui_generated.h
index a8e51cc9..6a755d59 100644
--- a/ui/gui_generated.h
+++ b/ui/gui_generated.h
@@ -11,11 +11,11 @@
 #include <wx/artprov.h>
 #include <wx/xrc/xmlres.h>
 #include <wx/intl.h>
-class CustomComboBox;
 class CustomGridLeft;
 class CustomGridMiddle;
 class CustomGridRight;
 class FfsDirPickerCtrl;
+class FolderHistoryBox;
 class ToggleButton;
 class wxButtonWithImage;
 
@@ -51,9 +51,9 @@ class wxButtonWithImage;
 #include <wx/gauge.h>
 #include <wx/radiobut.h>
 #include <wx/animate.h>
-#include <wx/treectrl.h>
 #include <wx/hyperlink.h>
 #include <wx/checklst.h>
+#include <wx/calctrl.h>
 
 #include "../shared/i18n.h"
 
@@ -63,970 +63,955 @@ class wxButtonWithImage;
 ///////////////////////////////////////////////////////////////////////////////
 /// Class MainDialogGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class MainDialogGenerated : public wxFrame 
+class MainDialogGenerated : public wxFrame
 {
-	private:
-	
-	protected:
-		wxMenuBar* m_menubar1;
-		wxMenu* m_menuFile;
-		wxMenuItem* m_menuItem10;
-		wxMenuItem* m_menuItem11;
-		wxMenuItem* m_menuItemSwitchView;
-		wxMenuItem* m_menuItemNew;
-		wxMenuItem* m_menuItemSave;
-		wxMenuItem* m_menuItemLoad;
-		wxMenu* m_menuAdvanced;
-		wxMenu* m_menuLanguages;
-		wxMenuItem* m_menuItemGlobSett;
-		wxMenuItem* m_menuItem7;
-		wxMenu* m_menuHelp;
-		wxMenuItem* m_menuItemCheckVer;
-		wxMenuItem* m_menuItemAbout;
-		wxBoxSizer* bSizerPanelHolder;
-		wxPanel* m_panelTopButtons;
-		wxBoxSizer* bSizerTopButtons;
-		wxStaticText* m_staticTextCmpVariant;
-		wxButtonWithImage* m_buttonCompare;
-		wxButton* m_buttonAbort;
-		wxBitmapButton* m_bpButtonCmpConfig;
-		wxStaticText* m_staticTextSyncVariant;
-		wxBitmapButton* m_bpButtonSyncConfig;
-		wxButtonWithImage* m_buttonStartSync;
-		wxPanel* m_panelDirectoryPairs;
-		wxStaticBoxSizer* sbSizerDirLeft;
-		wxPanel* m_panelTopMiddle;
-		wxBitmapButton* m_bpButtonSwapSides;
-		wxStaticBoxSizer* sbSizerDirRight;
-		wxBitmapButton* m_bpButtonAddPair;
-		wxScrolledWindow* m_scrolledWindowFolderPairs;
-		wxBoxSizer* bSizerAddFolderPairs;
-		wxPanel* m_panelGrids;
-		wxBoxSizer* bSizerGridHolder;
-		CustomGridLeft* m_gridLeft;
-		wxPanel* m_panelMiddle;
-		CustomGridMiddle* m_gridMiddle;
-		CustomGridRight* m_gridRight;
-		wxPanel* m_panelConfig;
-		wxBoxSizer* bSizerConfig;
-		wxBitmapButton* m_bpButtonSave;
-		wxBitmapButton* m_bpButtonLoad;
-		wxListBox* m_listBoxHistory;
-		wxPanel* m_panelFilter;
-		wxBitmapButton* m_bpButtonFilter;
-		wxCheckBox* m_checkBoxHideFilt;
-		wxPanel* m_panelStatistics;
-		wxBoxSizer* bSizerStatistics;
-		wxStaticBitmap* m_bitmapCreate;
-		wxTextCtrl* m_textCtrlCreate;
-		wxStaticBitmap* m_bitmapUpdate;
-		wxTextCtrl* m_textCtrlUpdate;
-		wxStaticBitmap* m_bitmapDelete;
-		wxTextCtrl* m_textCtrlDelete;
-		wxStaticBitmap* m_bitmapData;
-		wxTextCtrl* m_textCtrlData;
-		wxPanel* m_panelViewFilter;
-		wxBoxSizer* bSizerViewFilter;
-		ToggleButton* m_bpButtonSyncCreateLeft;
-		ToggleButton* m_bpButtonSyncDirOverwLeft;
-		ToggleButton* m_bpButtonSyncDeleteLeft;
-		ToggleButton* m_bpButtonLeftOnly;
-		ToggleButton* m_bpButtonLeftNewer;
-		ToggleButton* m_bpButtonEqual;
-		ToggleButton* m_bpButtonDifferent;
-		ToggleButton* m_bpButtonSyncDirNone;
-		ToggleButton* m_bpButtonRightNewer;
-		ToggleButton* m_bpButtonRightOnly;
-		ToggleButton* m_bpButtonSyncDeleteRight;
-		ToggleButton* m_bpButtonSyncDirOverwRight;
-		ToggleButton* m_bpButtonSyncCreateRight;
-		ToggleButton* m_bpButtonConflict;
-		wxPanel* m_panelStatusBar;
-		wxStaticText* m_staticTextStatusLeft;
-		wxStaticLine* m_staticline9;
-		wxStaticText* m_staticTextStatusMiddle;
-		wxStaticLine* m_staticline10;
-		wxStaticText* m_staticTextStatusRight;
-		wxStaticBitmap* m_bitmap15;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnCompare( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnStartSync( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSwitchView( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnNewConfig( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSaveConfig( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnLoadConfig( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnMenuQuit( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnMenuGlobalSettings( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnMenuBatchJob( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnMenuExportFileList( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnShowHelp( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnMenuCheckVersion( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnMenuAbout( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCmpSettings( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSyncSettings( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnDirSelected( wxFileDirPickerEvent& event ) { event.Skip(); }
-		virtual void OnSwapSides( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnAddFolderPair( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnRemoveTopFolderPair( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnLeftGridDoubleClick( wxGridEvent& event ) { event.Skip(); }
-		virtual void OnContextRim( wxGridEvent& event ) { event.Skip(); }
-		virtual void OnSortLeftGrid( wxGridEvent& event ) { event.Skip(); }
-		virtual void OnContextRimLabelLeft( wxGridEvent& event ) { event.Skip(); }
-		virtual void OnContextMiddle( wxGridEvent& event ) { event.Skip(); }
-		virtual void OnSortMiddleGrid( wxGridEvent& event ) { event.Skip(); }
-		virtual void OnContextMiddleLabel( wxGridEvent& event ) { event.Skip(); }
-		virtual void OnRightGridDoubleClick( wxGridEvent& event ) { event.Skip(); }
-		virtual void OnSortRightGrid( wxGridEvent& event ) { event.Skip(); }
-		virtual void OnContextRimLabelRight( wxGridEvent& event ) { event.Skip(); }
-		virtual void OnCfgHistoryKeyEvent( wxKeyEvent& event ) { event.Skip(); }
-		virtual void OnLoadFromHistory( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnConfigureFilter( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnHideFilteredButton( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSyncCreateLeft( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSyncDirLeft( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSyncDeleteLeft( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnLeftOnlyFiles( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnLeftNewerFiles( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnEqualFiles( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnDifferentFiles( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSyncDirNone( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnRightNewerFiles( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnRightOnlyFiles( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSyncDeleteRight( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSyncDirRight( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSyncCreateRight( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnConflictFiles( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		wxPanel* m_panelTopLeft;
-		CustomComboBox* m_directoryLeft;
-		FfsDirPickerCtrl* m_dirPickerLeft;
-		wxBitmapButton* m_bpButtonLocalFilter;
-		wxBitmapButton* m_bpButtonAltSyncCfg;
-		wxPanel* m_panelTopRight;
-		wxBitmapButton* m_bpButtonRemovePair;
-		CustomComboBox* m_directoryRight;
-		FfsDirPickerCtrl* m_dirPickerRight;
-		wxPanel* m_panelLeft;
-		wxPanel* m_panelRight;
-		
-		MainDialogGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
-		
-		~MainDialogGenerated();
-	
+private:
+
+protected:
+    wxMenuBar* m_menubar1;
+    wxMenu* m_menuFile;
+    wxMenuItem* m_menuItem10;
+    wxMenuItem* m_menuItem11;
+    wxMenuItem* m_menuItemSwitchView;
+    wxMenuItem* m_menuItemNew;
+    wxMenuItem* m_menuItemSave;
+    wxMenuItem* m_menuItemLoad;
+    wxMenu* m_menuAdvanced;
+    wxMenu* m_menuLanguages;
+    wxMenuItem* m_menuItemGlobSett;
+    wxMenuItem* m_menuItem7;
+    wxMenu* m_menuHelp;
+    wxMenuItem* m_menuItemCheckVer;
+    wxMenuItem* m_menuItemAbout;
+    wxBoxSizer* bSizerPanelHolder;
+    wxPanel* m_panelTopButtons;
+    wxBoxSizer* bSizerTopButtons;
+    wxStaticText* m_staticTextCmpVariant;
+    wxButtonWithImage* m_buttonCompare;
+    wxButton* m_buttonAbort;
+    wxBitmapButton* m_bpButtonCmpConfig;
+    wxStaticText* m_staticTextSyncVariant;
+    wxBitmapButton* m_bpButtonSyncConfig;
+    wxButtonWithImage* m_buttonStartSync;
+    wxPanel* m_panelDirectoryPairs;
+    wxStaticBoxSizer* sbSizerDirLeft;
+    wxBitmapButton* m_bpButtonAddPair;
+    wxPanel* m_panelTopMiddle;
+    wxBitmapButton* m_bpButtonSwapSides;
+    wxStaticBoxSizer* sbSizerDirRight;
+    wxScrolledWindow* m_scrolledWindowFolderPairs;
+    wxBoxSizer* bSizerAddFolderPairs;
+    wxPanel* m_panelGrids;
+    wxBoxSizer* bSizerGridHolder;
+    CustomGridLeft* m_gridLeft;
+    wxPanel* m_panelMiddle;
+    CustomGridMiddle* m_gridMiddle;
+    CustomGridRight* m_gridRight;
+    wxPanel* m_panelConfig;
+    wxBoxSizer* bSizerConfig;
+    wxBitmapButton* m_bpButtonSave;
+    wxBitmapButton* m_bpButtonLoad;
+    wxListBox* m_listBoxHistory;
+    wxPanel* m_panelFilter;
+    wxBitmapButton* m_bpButtonFilter;
+    wxCheckBox* m_checkBoxHideFilt;
+    wxPanel* m_panelStatistics;
+    wxBoxSizer* bSizerStatistics;
+    wxStaticBitmap* m_bitmapCreate;
+    wxTextCtrl* m_textCtrlCreate;
+    wxStaticBitmap* m_bitmapUpdate;
+    wxTextCtrl* m_textCtrlUpdate;
+    wxStaticBitmap* m_bitmapDelete;
+    wxTextCtrl* m_textCtrlDelete;
+    wxStaticBitmap* m_bitmapData;
+    wxTextCtrl* m_textCtrlData;
+    wxPanel* m_panelViewFilter;
+    wxBoxSizer* bSizerViewFilter;
+    ToggleButton* m_bpButtonSyncCreateLeft;
+    ToggleButton* m_bpButtonSyncDirOverwLeft;
+    ToggleButton* m_bpButtonSyncDeleteLeft;
+    ToggleButton* m_bpButtonLeftOnly;
+    ToggleButton* m_bpButtonLeftNewer;
+    ToggleButton* m_bpButtonEqual;
+    ToggleButton* m_bpButtonDifferent;
+    ToggleButton* m_bpButtonSyncDirNone;
+    ToggleButton* m_bpButtonRightNewer;
+    ToggleButton* m_bpButtonRightOnly;
+    ToggleButton* m_bpButtonSyncDeleteRight;
+    ToggleButton* m_bpButtonSyncDirOverwRight;
+    ToggleButton* m_bpButtonSyncCreateRight;
+    ToggleButton* m_bpButtonConflict;
+    wxPanel* m_panelStatusBar;
+    wxStaticText* m_staticTextStatusLeft;
+    wxStaticLine* m_staticline9;
+    wxStaticText* m_staticTextStatusMiddle;
+    wxStaticLine* m_staticline10;
+    wxStaticText* m_staticTextStatusRight;
+    wxStaticBitmap* m_bitmap15;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void OnCompare( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnStartSync( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSwitchView( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnNewConfig( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSaveConfig( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnLoadConfig( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnMenuQuit( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnMenuGlobalSettings( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnMenuBatchJob( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnMenuExportFileList( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnShowHelp( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnMenuCheckVersion( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnMenuAbout( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCmpSettings( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSyncSettings( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnAddFolderPair( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnRemoveTopFolderPair( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnDirSelected( wxFileDirPickerEvent& event ) { event.Skip(); }
+    virtual void OnSwapSides( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnLeftGridDoubleClick( wxGridEvent& event ) { event.Skip(); }
+    virtual void OnContextRim( wxGridEvent& event ) { event.Skip(); }
+    virtual void OnSortLeftGrid( wxGridEvent& event ) { event.Skip(); }
+    virtual void OnContextRimLabelLeft( wxGridEvent& event ) { event.Skip(); }
+    virtual void OnContextMiddle( wxGridEvent& event ) { event.Skip(); }
+    virtual void OnSortMiddleGrid( wxGridEvent& event ) { event.Skip(); }
+    virtual void OnContextMiddleLabel( wxGridEvent& event ) { event.Skip(); }
+    virtual void OnRightGridDoubleClick( wxGridEvent& event ) { event.Skip(); }
+    virtual void OnSortRightGrid( wxGridEvent& event ) { event.Skip(); }
+    virtual void OnContextRimLabelRight( wxGridEvent& event ) { event.Skip(); }
+    virtual void OnCfgHistoryKeyEvent( wxKeyEvent& event ) { event.Skip(); }
+    virtual void OnLoadFromHistory( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnConfigureFilter( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnHideFilteredButton( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSyncCreateLeft( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSyncDirLeft( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSyncDeleteLeft( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnLeftOnlyFiles( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnLeftNewerFiles( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnEqualFiles( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnDifferentFiles( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSyncDirNone( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnRightNewerFiles( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnRightOnlyFiles( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSyncDeleteRight( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSyncDirRight( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSyncCreateRight( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnConflictFiles( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+    wxPanel* m_panelTopLeft;
+    wxBitmapButton* m_bpButtonRemovePair;
+    FolderHistoryBox* m_directoryLeft;
+    FfsDirPickerCtrl* m_dirPickerLeft;
+    wxBitmapButton* m_bpButtonAltCompCfg;
+    wxBitmapButton* m_bpButtonLocalFilter;
+    wxBitmapButton* m_bpButtonAltSyncCfg;
+    wxPanel* m_panelTopRight;
+    FolderHistoryBox* m_directoryRight;
+    FfsDirPickerCtrl* m_dirPickerRight;
+    wxPanel* m_panelLeft;
+    wxPanel* m_panelRight;
+
+    MainDialogGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
+
+    ~MainDialogGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class FolderPairGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class FolderPairGenerated : public wxPanel 
+class FolderPairGenerated : public wxPanel
 {
-	private:
-	
-	protected:
-	
-	public:
-		wxPanel* m_panelLeft;
-		wxTextCtrl* m_directoryLeft;
-		FfsDirPickerCtrl* m_dirPickerLeft;
-		wxPanel* m_panel20;
-		wxBitmapButton* m_bpButtonLocalFilter;
-		wxBitmapButton* m_bpButtonAltSyncCfg;
-		wxPanel* m_panelRight;
-		wxBitmapButton* m_bpButtonRemovePair;
-		wxTextCtrl* m_directoryRight;
-		FfsDirPickerCtrl* m_dirPickerRight;
-		
-		FolderPairGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL ); 
-		~FolderPairGenerated();
-	
+private:
+
+protected:
+
+public:
+    wxPanel* m_panelLeft;
+    wxBitmapButton* m_bpButtonRemovePair;
+    FolderHistoryBox* m_directoryLeft;
+    FfsDirPickerCtrl* m_dirPickerLeft;
+    wxPanel* m_panel20;
+    wxBitmapButton* m_bpButtonAltCompCfg;
+    wxBitmapButton* m_bpButtonLocalFilter;
+    wxBitmapButton* m_bpButtonAltSyncCfg;
+    wxPanel* m_panelRight;
+    FolderHistoryBox* m_directoryRight;
+    FfsDirPickerCtrl* m_dirPickerRight;
+
+    FolderPairGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );
+    ~FolderPairGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
-/// Class BatchFolderPairGenerated
+/// Class BatchDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class BatchFolderPairGenerated : public wxPanel 
+class BatchDlgGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		wxPanel* m_panel32;
-		wxStaticText* m_staticText53;
-		wxStaticText* m_staticText541;
-		wxPanel* m_panelLeft;
-		wxPanel* m_panelRight;
-	
-	public:
-		wxBitmapButton* m_bpButtonRemovePair;
-		wxTextCtrl* m_directoryLeft;
-		FfsDirPickerCtrl* m_dirPickerLeft;
-		wxBitmapButton* m_bpButtonLocalFilter;
-		wxTextCtrl* m_directoryRight;
-		FfsDirPickerCtrl* m_dirPickerRight;
-		wxBitmapButton* m_bpButtonAltSyncCfg;
-		
-		BatchFolderPairGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL ); 
-		~BatchFolderPairGenerated();
-	
+private:
+
+protected:
+    wxBoxSizer* bSizer69;
+    wxStaticBitmap* m_bitmap27;
+    wxPanel* m_panel8;
+    wxStaticText* m_staticText56;
+    wxStaticText* m_staticText44;
+    wxBitmapButton* m_bpButtonHelp;
+    wxNotebook* m_notebookSettings;
+    wxPanel* m_panelOverview;
+    wxBitmapButton* m_bpButtonCmpConfig;
+    wxStaticText* m_staticTextCmpVariant;
+    wxBitmapButton* m_bpButtonFilter;
+    wxStaticText* m_staticTextSyncVariant;
+    wxBitmapButton* m_bpButtonSyncConfig;
+    wxChoice* m_choiceHandleError;
+    wxBoxSizer* sbSizerMainPair;
+    wxPanel* m_panelMainPair;
+    wxStaticText* m_staticText532;
+    wxStaticText* m_staticText5411;
+    wxBoxSizer* bSizerAddFolderPairs;
+    wxPanel* m_panelBatchSettings;
+    wxCheckBox* m_checkBoxSilent;
+    wxStaticBoxSizer* sbSizerLogfileDir;
+    wxStaticText* m_staticText96;
+    wxSpinCtrl* m_spinCtrlLogCountMax;
+    wxPanel* m_panelLogfile;
+    wxStaticText* m_staticText94;
+    wxTextCtrl* m_textCtrlLogfileDir;
+    FfsDirPickerCtrl* m_dirPickerLogfileDir;
+    wxButton* m_buttonSave;
+    wxButton* m_buttonLoad;
+    wxButton* m_button6;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void OnHelp( 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 OnChangeErrorHandling( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnAddFolderPair( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnRemoveTopFolderPair( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnChangeMaxLogCountTxt( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSaveBatchJob( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnLoadBatchJob( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+    wxScrolledWindow* m_scrolledWindow6;
+    wxBitmapButton* m_bpButtonAddPair;
+    wxBitmapButton* m_bpButtonRemovePair;
+    wxPanel* m_panelLeft;
+    FolderHistoryBox* m_directoryLeft;
+    FfsDirPickerCtrl* m_dirPickerLeft;
+    wxPanel* m_panelRight;
+    FolderHistoryBox* m_directoryRight;
+    FfsDirPickerCtrl* m_dirPickerRight;
+    wxBitmapButton* m_bpButtonAltCompCfg;
+    wxBitmapButton* m_bpButtonLocalFilter;
+    wxBitmapButton* m_bpButtonAltSyncCfg;
+
+    BatchDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Create a batch job"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+    ~BatchDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
-/// Class BatchDlgGenerated
+/// Class BatchFolderPairGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class BatchDlgGenerated : public wxDialog 
+class BatchFolderPairGenerated : public wxPanel
 {
-	private:
-	
-	protected:
-		wxBoxSizer* bSizer69;
-		wxStaticBitmap* m_bitmap27;
-		wxPanel* m_panel8;
-		wxStaticText* m_staticText56;
-		wxStaticText* m_staticText44;
-		wxBitmapButton* m_bpButtonHelp;
-		wxNotebook* m_notebookSettings;
-		wxPanel* m_panelOverview;
-		wxBitmapButton* m_bpButtonCmpConfig;
-		wxStaticText* m_staticTextCmpVariant;
-		wxBitmapButton* m_bpButtonFilter;
-		wxStaticText* m_staticTextSyncVariant;
-		wxBitmapButton* m_bpButtonSyncConfig;
-		wxBoxSizer* sbSizerMainPair;
-		wxPanel* m_panelMainPair;
-		wxStaticText* m_staticText532;
-		wxStaticText* m_staticText5411;
-		wxBoxSizer* bSizerAddFolderPairs;
-		wxChoice* m_choiceHandleError;
-		wxPanel* m_panelBatchSettings;
-		wxCheckBox* m_checkBoxSilent;
-		wxStaticBoxSizer* sbSizerLogfileDir;
-		wxStaticText* m_staticText96;
-		wxSpinCtrl* m_spinCtrlLogCountMax;
-		wxPanel* m_panelLogfile;
-		wxStaticText* m_staticText94;
-		wxTextCtrl* m_textCtrlLogfileDir;
-		FfsDirPickerCtrl* m_dirPickerLogfileDir;
-		wxButton* m_buttonSave;
-		wxButton* m_buttonLoad;
-		wxButton* m_button6;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnHelp( 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 OnAddFolderPair( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnRemoveTopFolderPair( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnChangeErrorHandling( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnChangeMaxLogCountTxt( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSaveBatchJob( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnLoadBatchJob( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		wxScrolledWindow* m_scrolledWindow6;
-		wxBitmapButton* m_bpButtonAddPair;
-		wxBitmapButton* m_bpButtonRemovePair;
-		wxPanel* m_panelLeft;
-		wxTextCtrl* m_directoryLeft;
-		FfsDirPickerCtrl* m_dirPickerLeft;
-		wxBitmapButton* m_bpButtonLocalFilter;
-		wxPanel* m_panelRight;
-		wxTextCtrl* m_directoryRight;
-		FfsDirPickerCtrl* m_dirPickerRight;
-		wxBitmapButton* m_bpButtonAltSyncCfg;
-		
-		BatchDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Create a batch job"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
-		~BatchDlgGenerated();
-	
+private:
+
+protected:
+    wxPanel* m_panel32;
+    wxStaticText* m_staticText53;
+    wxStaticText* m_staticText541;
+    wxPanel* m_panelLeft;
+    wxPanel* m_panelRight;
+
+public:
+    wxBitmapButton* m_bpButtonRemovePair;
+    FolderHistoryBox* m_directoryLeft;
+    FfsDirPickerCtrl* m_dirPickerLeft;
+    FolderHistoryBox* m_directoryRight;
+    FfsDirPickerCtrl* m_dirPickerRight;
+    wxBitmapButton* m_bpButtonAltCompCfg;
+    wxBitmapButton* m_bpButtonLocalFilter;
+    wxBitmapButton* m_bpButtonAltSyncCfg;
+
+    BatchFolderPairGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );
+    ~BatchFolderPairGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class CompareStatusGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class CompareStatusGenerated : public wxPanel 
+class CompareStatusGenerated : public wxPanel
 {
-	private:
-	
-	protected:
-		wxBoxSizer* bSizer42;
-		wxBoxSizer* bSizerFilesFound;
-		wxStaticText* m_staticText321;
-		wxStaticText* m_staticTextScanned;
-		wxBoxSizer* bSizerFilesRemaining;
-		wxStaticText* m_staticText46;
-		wxStaticText* m_staticTextFilesRemaining;
-		wxStaticText* m_staticText117;
-		wxStaticText* m_staticTextDataRemaining;
-		wxStaticText* m_staticText118;
-		wxBoxSizer* sSizerSpeed;
-		wxStaticText* m_staticText104;
-		wxStaticText* m_staticTextSpeed;
-		wxBoxSizer* sSizerTimeRemaining;
-		wxStaticText* m_staticTextTimeRemFixed;
-		wxStaticText* m_staticTextTimeRemaining;
-		wxBoxSizer* sSizerTimeElapsed;
-		wxStaticText* m_staticTextTimeElapsed;
-		wxStaticText* m_staticText30;
-		wxTextCtrl* m_textCtrlStatus;
-		wxGauge* m_gauge2;
-	
-	public:
-		
-		CompareStatusGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxRAISED_BORDER|wxTAB_TRAVERSAL ); 
-		~CompareStatusGenerated();
-	
+private:
+
+protected:
+    wxBoxSizer* bSizer42;
+    wxBoxSizer* bSizerFilesFound;
+    wxStaticText* m_staticText321;
+    wxStaticText* m_staticTextScanned;
+    wxBoxSizer* bSizerFilesRemaining;
+    wxStaticText* m_staticText46;
+    wxStaticText* m_staticTextFilesRemaining;
+    wxStaticText* m_staticText117;
+    wxStaticText* m_staticTextDataRemaining;
+    wxStaticText* m_staticText118;
+    wxBoxSizer* sSizerSpeed;
+    wxStaticText* m_staticText104;
+    wxStaticText* m_staticTextSpeed;
+    wxBoxSizer* sSizerTimeRemaining;
+    wxStaticText* m_staticTextTimeRemFixed;
+    wxStaticText* m_staticTextTimeRemaining;
+    wxBoxSizer* sSizerTimeElapsed;
+    wxStaticText* m_staticTextTimeElapsed;
+    wxStaticText* m_staticText30;
+    wxTextCtrl* m_textCtrlStatus;
+    wxGauge* m_gauge2;
+
+public:
+
+    CompareStatusGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxRAISED_BORDER|wxTAB_TRAVERSAL );
+    ~CompareStatusGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class SyncCfgDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class SyncCfgDlgGenerated : public wxDialog 
+class SyncCfgDlgGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		wxStaticText* m_staticText1;
-		wxRadioButton* m_radioBtnAutomatic;
-		wxButton* m_buttonAutomatic;
-		wxStaticText* m_staticText81;
-		wxRadioButton* m_radioBtnMirror;
-		wxButton* m_buttonOneWay;
-		wxStaticText* m_staticText8;
-		wxRadioButton* m_radioBtnUpdate;
-		wxButton* m_buttonUpdate;
-		wxStaticText* m_staticText101;
-		wxRadioButton* m_radioBtnCustom;
-		wxButton* m_buttonUpdate1;
-		wxStaticText* m_staticText9;
-		wxBoxSizer* bSizer201;
-		wxStaticBoxSizer* sbSizerErrorHandling;
-		wxChoice* m_choiceHandleError;
-		wxStaticBoxSizer* sbSizerCustDelDir;
-		wxChoice* m_choiceHandleDeletion;
-		wxPanel* m_panelCustomDeletionDir;
-		wxTextCtrl* m_textCtrlCustomDelFolder;
-		FfsDirPickerCtrl* m_dirPickerCustomDelFolder;
-		wxButton* m_buttonOK;
-		wxButton* m_button16;
-		wxStaticBitmap* m_bitmapDatabase;
-		wxBoxSizer* sbSizerSyncDirections;
-		wxStaticText* m_staticText21;
-		wxStaticText* m_staticText31;
-		wxStaticLine* m_staticline3;
-		wxBoxSizer* bSizerLeftOnly;
-		wxStaticBitmap* m_bitmapLeftOnly;
-		wxBitmapButton* m_bpButtonLeftOnly;
-		wxBoxSizer* bSizerRightOnly;
-		wxStaticBitmap* m_bitmapRightOnly;
-		wxBitmapButton* m_bpButtonRightOnly;
-		wxBoxSizer* bSizerLeftNewer;
-		wxStaticBitmap* m_bitmapLeftNewer;
-		wxBitmapButton* m_bpButtonLeftNewer;
-		wxBoxSizer* bSizerRightNewer;
-		wxStaticBitmap* m_bitmapRightNewer;
-		wxBitmapButton* m_bpButtonRightNewer;
-		wxBoxSizer* bSizerDifferent;
-		wxStaticBitmap* m_bitmapDifferent;
-		wxBitmapButton* m_bpButtonDifferent;
-		wxBoxSizer* bSizerConflict;
-		wxStaticBitmap* m_bitmapConflict;
-		wxBitmapButton* m_bpButtonConflict;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnSyncAutomatic( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSyncAutomaticDouble( wxMouseEvent& event ) { event.Skip(); }
-		virtual void OnSyncMirror( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSyncMirrorDouble( wxMouseEvent& event ) { event.Skip(); }
-		virtual void OnSyncUpdate( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSyncUpdateDouble( wxMouseEvent& event ) { event.Skip(); }
-		virtual void OnSyncCustom( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSyncCustomDouble( wxMouseEvent& event ) { event.Skip(); }
-		virtual void OnChangeErrorHandling( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnChangeDeletionHandling( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnApply( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnExLeftSideOnly( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnExRightSideOnly( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnLeftNewer( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnRightNewer( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnDifferent( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnConflict( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		SyncCfgDlgGenerated( 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 ); 
-		~SyncCfgDlgGenerated();
-	
+private:
+
+protected:
+    wxStaticText* m_staticText1;
+    wxRadioButton* m_radioBtnAutomatic;
+    wxButton* m_buttonAutomatic;
+    wxStaticText* m_staticText81;
+    wxRadioButton* m_radioBtnMirror;
+    wxButton* m_buttonOneWay;
+    wxStaticText* m_staticText8;
+    wxRadioButton* m_radioBtnUpdate;
+    wxButton* m_buttonUpdate;
+    wxStaticText* m_staticText101;
+    wxRadioButton* m_radioBtnCustom;
+    wxButton* m_buttonUpdate1;
+    wxStaticText* m_staticText9;
+    wxBoxSizer* bSizer201;
+    wxStaticBoxSizer* sbSizerErrorHandling;
+    wxChoice* m_choiceHandleError;
+    wxStaticBoxSizer* sbSizerCustDelDir;
+    wxChoice* m_choiceHandleDeletion;
+    wxPanel* m_panelCustomDeletionDir;
+    FolderHistoryBox* m_customDelFolder;
+    FfsDirPickerCtrl* m_dirPickerCustomDelFolder;
+    wxButton* m_buttonOK;
+    wxButton* m_button16;
+    wxStaticBitmap* m_bitmapDatabase;
+    wxBoxSizer* sbSizerSyncDirections;
+    wxStaticText* m_staticText21;
+    wxStaticText* m_staticText31;
+    wxStaticLine* m_staticline3;
+    wxBoxSizer* bSizerLeftOnly;
+    wxStaticBitmap* m_bitmapLeftOnly;
+    wxBitmapButton* m_bpButtonLeftOnly;
+    wxBoxSizer* bSizerRightOnly;
+    wxStaticBitmap* m_bitmapRightOnly;
+    wxBitmapButton* m_bpButtonRightOnly;
+    wxBoxSizer* bSizerLeftNewer;
+    wxStaticBitmap* m_bitmapLeftNewer;
+    wxBitmapButton* m_bpButtonLeftNewer;
+    wxBoxSizer* bSizerRightNewer;
+    wxStaticBitmap* m_bitmapRightNewer;
+    wxBitmapButton* m_bpButtonRightNewer;
+    wxBoxSizer* bSizerDifferent;
+    wxStaticBitmap* m_bitmapDifferent;
+    wxBitmapButton* m_bpButtonDifferent;
+    wxBoxSizer* bSizerConflict;
+    wxStaticBitmap* m_bitmapConflict;
+    wxBitmapButton* m_bpButtonConflict;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void OnSyncAutomatic( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSyncAutomaticDouble( wxMouseEvent& event ) { event.Skip(); }
+    virtual void OnSyncMirror( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSyncMirrorDouble( wxMouseEvent& event ) { event.Skip(); }
+    virtual void OnSyncUpdate( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSyncUpdateDouble( wxMouseEvent& event ) { event.Skip(); }
+    virtual void OnSyncCustom( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSyncCustomDouble( wxMouseEvent& event ) { event.Skip(); }
+    virtual void OnChangeErrorHandling( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnChangeDeletionHandling( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnApply( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnExLeftSideOnly( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnExRightSideOnly( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnLeftNewer( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnRightNewer( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnDifferent( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnConflict( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+
+    SyncCfgDlgGenerated( 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 );
+    ~SyncCfgDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class CmpCfgDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class CmpCfgDlgGenerated : public wxDialog 
+class CmpCfgDlgGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		wxRadioButton* m_radioBtnSizeDate;
-		wxStaticBitmap* m_bitmapByTime;
-		wxButton* m_buttonTimeSize;
-		wxRadioButton* m_radioBtnContent;
-		wxStaticBitmap* m_bitmapByContent;
-		wxButton* m_buttonContent;
-		wxStaticLine* m_staticline14;
-		wxBitmapButton* m_bpButtonHelp;
-		wxChoice* m_choiceHandleSymlinks;
-		wxButton* m_button10;
-		wxButton* m_button6;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnTimeSize( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnTimeSizeDouble( wxMouseEvent& event ) { event.Skip(); }
-		virtual void OnContent( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnContentDouble( wxMouseEvent& event ) { event.Skip(); }
-		virtual void OnShowHelp( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnChangeErrorHandling( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		CmpCfgDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Comparison settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); 
-		~CmpCfgDlgGenerated();
-	
+private:
+
+protected:
+    wxRadioButton* m_radioBtnSizeDate;
+    wxStaticBitmap* m_bitmapByTime;
+    wxButton* m_buttonTimeSize;
+    wxRadioButton* m_radioBtnContent;
+    wxStaticBitmap* m_bitmapByContent;
+    wxButton* m_buttonContent;
+    wxChoice* m_choiceHandleSymlinks;
+    wxBitmapButton* m_bpButtonHelp;
+    wxButton* m_button10;
+    wxButton* m_button6;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void OnTimeSize( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnTimeSizeDouble( wxMouseEvent& event ) { event.Skip(); }
+    virtual void OnContent( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnContentDouble( wxMouseEvent& event ) { event.Skip(); }
+    virtual void OnChangeErrorHandling( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnShowHelp( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+
+    CmpCfgDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Comparison settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+    ~CmpCfgDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class SyncStatusDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class SyncStatusDlgGenerated : public wxFrame 
+class SyncStatusDlgGenerated : public wxFrame
 {
-	private:
-	
-	protected:
-		wxStaticBitmap* m_bitmapStatus;
-		wxStaticText* m_staticTextStatus;
-		wxAnimationCtrl* m_animationControl1;
-		wxBoxSizer* bSizer31;
-		wxBoxSizer* bSizerObjectsRemaining;
-		wxStaticText* m_staticText25;
-		wxStaticText* m_staticTextRemainingObj;
-		wxStaticText* m_staticText96;
-		wxStaticText* m_staticTextDataRemaining;
-		wxStaticText* m_staticText97;
-		wxBoxSizer* bSizerObjectsProcessed;
-		wxStaticText* m_staticText251;
-		wxStaticText* m_staticTextProcessedObj;
-		wxStaticText* m_staticText98;
-		wxStaticText* m_staticTextDataProcessed;
-		wxStaticText* m_staticText99;
-		wxStaticText* m_staticText55;
-		wxStaticText* m_staticTextTimeElapsed;
-		wxBoxSizer* bSizerProgressText;
-		wxTextCtrl* m_textCtrlInfo;
-		wxBoxSizer* bSizer28;
-		wxBoxSizer* bSizerSpeed;
-		wxStaticText* m_staticText108;
-		wxStaticText* m_staticTextSpeed;
-		wxButton* m_buttonOK;
-		wxButton* m_buttonPause;
-		wxButton* m_buttonAbort;
-		wxBoxSizer* bSizerRemTime;
-		wxStaticText* m_staticText21;
-		wxStaticText* m_staticTextTimeRemaining;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnIconize( wxIconizeEvent& event ) { event.Skip(); }
-		virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnPause( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnAbort( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		wxGauge* m_gauge1;
-		
-		SyncStatusDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 638,350 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
-		
-		~SyncStatusDlgGenerated();
-	
+private:
+
+protected:
+    wxStaticBitmap* m_bitmapStatus;
+    wxStaticText* m_staticTextStatus;
+    wxAnimationCtrl* m_animationControl1;
+    wxBoxSizer* bSizer31;
+    wxBoxSizer* bSizerObjectsRemaining;
+    wxStaticText* m_staticText25;
+    wxStaticText* m_staticTextRemainingObj;
+    wxStaticText* m_staticText96;
+    wxStaticText* m_staticTextDataRemaining;
+    wxStaticText* m_staticText97;
+    wxBoxSizer* bSizerObjectsProcessed;
+    wxStaticText* m_staticText251;
+    wxStaticText* m_staticTextProcessedObj;
+    wxStaticText* m_staticText98;
+    wxStaticText* m_staticTextDataProcessed;
+    wxStaticText* m_staticText99;
+    wxStaticText* m_staticText55;
+    wxStaticText* m_staticTextTimeElapsed;
+    wxBoxSizer* bSizerProgressText;
+    wxTextCtrl* m_textCtrlInfo;
+    wxBoxSizer* bSizer28;
+    wxBoxSizer* bSizerSpeed;
+    wxStaticText* m_staticText108;
+    wxStaticText* m_staticTextSpeed;
+    wxButton* m_buttonOK;
+    wxButton* m_buttonPause;
+    wxButton* m_buttonAbort;
+    wxBoxSizer* bSizerRemTime;
+    wxStaticText* m_staticText21;
+    wxStaticText* m_staticTextTimeRemaining;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void OnIconize( wxIconizeEvent& event ) { event.Skip(); }
+    virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnPause( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnAbort( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+    wxGauge* m_gauge1;
+
+    SyncStatusDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 638,350 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
+
+    ~SyncStatusDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class LogControlGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class LogControlGenerated : public wxPanel 
+class LogControlGenerated : public wxPanel
 {
-	private:
-	
-	protected:
-		ToggleButton* m_bpButtonErrors;
-		ToggleButton* m_bpButtonWarnings;
-		ToggleButton* m_bpButtonInfo;
-		wxTextCtrl* m_textCtrlInfo;
-		
-		// 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:
-		
-		LogControlGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL ); 
-		~LogControlGenerated();
-	
-};
+private:
+
+protected:
+    ToggleButton* m_bpButtonErrors;
+    ToggleButton* m_bpButtonWarnings;
+    ToggleButton* m_bpButtonInfo;
+    wxTextCtrl* m_textCtrlInfo;
+
+    // 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:
+
+    LogControlGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );
+    ~LogControlGenerated();
 
-///////////////////////////////////////////////////////////////////////////////
-/// Class HelpDlgGenerated
-///////////////////////////////////////////////////////////////////////////////
-class HelpDlgGenerated : public wxDialog 
-{
-	private:
-	
-	protected:
-		wxStaticBitmap* m_bitmap25;
-		wxPanel* m_panel8;
-		wxStaticText* m_staticText56;
-		wxNotebook* m_notebook1;
-		wxScrolledWindow* m_scrolledWindow1;
-		wxStaticText* m_staticText59;
-		wxStaticText* m_staticText60;
-		wxStaticText* m_staticText61;
-		wxTreeCtrl* m_treeCtrl1;
-		wxStaticText* m_staticText63;
-		wxStaticText* m_staticText75;
-		wxStaticText* m_staticText76;
-		wxStaticText* m_staticText77;
-		wxStaticText* m_staticText79;
-		wxStaticText* m_staticText80;
-		wxStaticText* m_staticText78;
-		wxScrolledWindow* m_scrolledWindow5;
-		wxStaticText* m_staticText65;
-		wxStaticText* m_staticText66;
-		wxTreeCtrl* m_treeCtrl2;
-		wxStaticText* m_staticText69;
-		wxStaticText* m_staticText81;
-		wxStaticText* m_staticText82;
-		wxStaticText* m_staticText83;
-		wxStaticText* m_staticText84;
-		wxButton* m_button8;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnOK( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		HelpDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 579,543 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
-		~HelpDlgGenerated();
-	
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class AboutDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class AboutDlgGenerated : public wxDialog 
+class AboutDlgGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		wxPanel* m_panel5;
-		wxStaticBitmap* m_bitmap11;
-		wxStaticText* m_build;
-		wxPanel* m_panel33;
-		wxBoxSizer* bSizerCodeInfo;
-		wxStaticText* m_staticText72;
-		wxHyperlinkCtrl* m_hyperlink9;
-		wxHyperlinkCtrl* m_hyperlink10;
-		wxHyperlinkCtrl* m_hyperlink13;
-		wxHyperlinkCtrl* m_hyperlink7;
-		wxHyperlinkCtrl* m_hyperlink11;
-		wxHyperlinkCtrl* m_hyperlink16;
-		wxHyperlinkCtrl* m_hyperlink8;
-		wxHyperlinkCtrl* m_hyperlink15;
-		wxHyperlinkCtrl* m_hyperlink12;
-		wxHyperlinkCtrl* m_hyperlink18;
-		wxHyperlinkCtrl* m_hyperlink14;
-		wxHyperlinkCtrl* m_hyperlink21;
-		wxScrolledWindow* m_scrolledWindowTranslators;
-		wxBoxSizer* bSizerTranslators;
-		wxStaticText* m_staticText54;
-		wxFlexGridSizer* fgSizerTranslators;
-		wxStaticLine* m_staticline3;
-		wxStaticText* m_staticText131;
-		wxStaticLine* m_staticline12;
-		wxStaticBitmap* m_bitmap9;
-		wxHyperlinkCtrl* m_hyperlink1;
-		wxHyperlinkCtrl* m_hyperlink3;
-		wxAnimationCtrl* m_animationControl1;
-		wxStaticBitmap* m_bitmap10;
-		wxHyperlinkCtrl* m_hyperlink2;
-		wxHyperlinkCtrl* m_hyperlink6;
-		wxStaticBitmap* m_bitmapTransl;
-		wxStaticLine* m_staticline2;
-		wxStaticBitmap* m_bitmap13;
-		wxHyperlinkCtrl* m_hyperlink5;
-		wxButton* m_buttonOkay;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& 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 = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE ); 
-		~AboutDlgGenerated();
-	
+private:
+
+protected:
+    wxPanel* m_panel5;
+    wxStaticBitmap* m_bitmap11;
+    wxStaticText* m_build;
+    wxPanel* m_panel33;
+    wxBoxSizer* bSizerCodeInfo;
+    wxStaticText* m_staticText72;
+    wxHyperlinkCtrl* m_hyperlink9;
+    wxHyperlinkCtrl* m_hyperlink11;
+    wxHyperlinkCtrl* m_hyperlink10;
+    wxHyperlinkCtrl* m_hyperlink13;
+    wxHyperlinkCtrl* m_hyperlink7;
+    wxHyperlinkCtrl* m_hyperlink16;
+    wxHyperlinkCtrl* m_hyperlink8;
+    wxHyperlinkCtrl* m_hyperlink15;
+    wxHyperlinkCtrl* m_hyperlink12;
+    wxHyperlinkCtrl* m_hyperlink18;
+    wxHyperlinkCtrl* m_hyperlink14;
+    wxHyperlinkCtrl* m_hyperlink21;
+    wxScrolledWindow* m_scrolledWindowTranslators;
+    wxBoxSizer* bSizerTranslators;
+    wxStaticText* m_staticText54;
+    wxFlexGridSizer* fgSizerTranslators;
+    wxStaticLine* m_staticline3;
+    wxStaticText* m_staticText131;
+    wxStaticLine* m_staticline12;
+    wxStaticBitmap* m_bitmap9;
+    wxHyperlinkCtrl* m_hyperlink1;
+    wxHyperlinkCtrl* m_hyperlink3;
+    wxAnimationCtrl* m_animationControl1;
+    wxStaticBitmap* m_bitmap10;
+    wxHyperlinkCtrl* m_hyperlink2;
+    wxHyperlinkCtrl* m_hyperlink6;
+    wxStaticBitmap* m_bitmapTransl;
+    wxStaticLine* m_staticline2;
+    wxStaticBitmap* m_bitmap13;
+    wxHyperlinkCtrl* m_hyperlink5;
+    wxButton* m_buttonOkay;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& 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 = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
+    ~AboutDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class ErrorDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class ErrorDlgGenerated : public wxDialog 
+class ErrorDlgGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		wxStaticBitmap* m_bitmap10;
-		wxTextCtrl* m_textCtrl8;
-		wxCheckBox* m_checkBoxIgnoreErrors;
-		wxButton* m_buttonIgnore;
-		wxButton* m_buttonRetry;
-		wxButton* m_buttonAbort;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnIgnore( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnRetry( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnAbort( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		ErrorDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Error"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 460,250 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER ); 
-		~ErrorDlgGenerated();
-	
+private:
+
+protected:
+    wxStaticBitmap* m_bitmap10;
+    wxTextCtrl* m_textCtrl8;
+    wxCheckBox* m_checkBoxIgnoreErrors;
+    wxButton* m_buttonIgnore;
+    wxButton* m_buttonRetry;
+    wxButton* m_buttonAbort;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void OnIgnore( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnRetry( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnAbort( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+
+    ErrorDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Error"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 460,250 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER );
+    ~ErrorDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class WarningDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class WarningDlgGenerated : public wxDialog 
+class WarningDlgGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		wxTextCtrl* m_textCtrl8;
-		wxCheckBox* m_checkBoxDontShowAgain;
-		wxButton* m_buttonIgnore;
-		wxButton* m_buttonSwitch;
-		wxButton* m_buttonAbort;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnIgnore( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSwitch( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnAbort( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		wxStaticBitmap* m_bitmap10;
-		
-		WarningDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Warning"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 460,250 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER ); 
-		~WarningDlgGenerated();
-	
+private:
+
+protected:
+    wxTextCtrl* m_textCtrl8;
+    wxCheckBox* m_checkBoxDontShowAgain;
+    wxButton* m_buttonIgnore;
+    wxButton* m_buttonSwitch;
+    wxButton* m_buttonAbort;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void OnIgnore( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSwitch( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnAbort( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+    wxStaticBitmap* m_bitmap10;
+
+    WarningDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Warning"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 460,250 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER );
+    ~WarningDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class QuestionDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class QuestionDlgGenerated : public wxDialog 
+class QuestionDlgGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		wxStaticBitmap* m_bitmap10;
-		wxTextCtrl* m_textCtrl8;
-		wxCheckBox* m_checkBoxDontAskAgain;
-		wxButton* m_buttonYes;
-		wxButton* m_buttonNo;
-		wxButton* m_buttonCancel;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnYes( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnNo( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		QuestionDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Question"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 420,198 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER ); 
-		~QuestionDlgGenerated();
-	
+private:
+
+protected:
+    wxStaticBitmap* m_bitmap10;
+    wxTextCtrl* m_textCtrl8;
+    wxCheckBox* m_checkBoxDontAskAgain;
+    wxButton* m_buttonYes;
+    wxButton* m_buttonNo;
+    wxButton* m_buttonCancel;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void OnCheckBoxDontShowAgain( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnYes( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnNo( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+
+    QuestionDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Question"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 420,198 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER );
+    ~QuestionDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class DeleteDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class DeleteDlgGenerated : public wxDialog 
+class DeleteDlgGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		wxStaticBitmap* m_bitmap12;
-		wxStaticText* m_staticTextHeader;
-		wxCheckBox* m_checkBoxDeleteBothSides;
-		wxCheckBox* m_checkBoxUseRecycler;
-		wxTextCtrl* m_textCtrlMessage;
-		wxButton* m_buttonOK;
-		wxButton* m_buttonCancel;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnDelOnBothSides( wxCommandEvent& 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 = _("Confirm"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 553,336 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER ); 
-		~DeleteDlgGenerated();
-	
+private:
+
+protected:
+    wxStaticBitmap* m_bitmap12;
+    wxStaticText* m_staticTextHeader;
+    wxCheckBox* m_checkBoxDeleteBothSides;
+    wxCheckBox* m_checkBoxUseRecycler;
+    wxTextCtrl* m_textCtrlMessage;
+    wxButton* m_buttonOK;
+    wxButton* m_buttonCancel;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void OnDelOnBothSides( wxCommandEvent& 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 = _("Confirm"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 553,336 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER );
+    ~DeleteDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class FilterDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class FilterDlgGenerated : public wxDialog 
+class FilterDlgGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		wxStaticBitmap* m_bitmap26;
-		wxPanel* m_panel8;
-		wxStaticText* m_staticTexHeader;
-		wxStaticText* m_staticText44;
-		wxBitmapButton* m_bpButtonHelp;
-		wxPanel* m_panel13;
-		wxStaticLine* m_staticline10;
-		wxStaticText* m_staticText45;
-		wxStaticText* m_staticText83;
-		wxStaticText* m_staticText84;
-		wxStaticText* m_staticText85;
-		wxStaticText* m_staticText181;
-		wxStaticText* m_staticText1811;
-		wxStaticBitmap* m_bitmapInclude;
-		wxTextCtrl* m_textCtrlInclude;
-		wxStaticBitmap* m_bitmapExclude;
-		wxTextCtrl* m_textCtrlExclude;
-		wxStaticBitmap* m_bitmapFilterDate;
-		wxStaticText* m_staticText103;
-		wxSpinCtrl* m_spinCtrlTimespan;
-		wxChoice* m_choiceUnitTimespan;
-		wxStaticBitmap* m_bitmapFilterSize;
-		wxStaticText* m_staticText101;
-		wxSpinCtrl* m_spinCtrlMinSize;
-		wxChoice* m_choiceUnitMinSize;
-		wxStaticText* m_staticText102;
-		wxSpinCtrl* m_spinCtrlMaxSize;
-		wxChoice* m_choiceUnitMaxSize;
-		wxButton* m_button9;
-		wxButton* m_button10;
-		wxButton* m_button17;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnHelp( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnUpdateNameFilter( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnUpdateChoice( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnDefault( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnApply( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		FilterDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Configure filter"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
-		~FilterDlgGenerated();
-	
+private:
+
+protected:
+    wxStaticBitmap* m_bitmap26;
+    wxPanel* m_panel8;
+    wxStaticText* m_staticTexHeader;
+    wxStaticText* m_staticText44;
+    wxBitmapButton* m_bpButtonHelp;
+    wxPanel* m_panel13;
+    wxStaticLine* m_staticline10;
+    wxStaticText* m_staticText45;
+    wxStaticText* m_staticText83;
+    wxStaticText* m_staticText84;
+    wxStaticText* m_staticText85;
+    wxStaticText* m_staticText181;
+    wxStaticText* m_staticText1811;
+    wxStaticBitmap* m_bitmapInclude;
+    wxTextCtrl* m_textCtrlInclude;
+    wxStaticBitmap* m_bitmapExclude;
+    wxTextCtrl* m_textCtrlExclude;
+    wxStaticBitmap* m_bitmapFilterDate;
+    wxStaticText* m_staticText103;
+    wxChoice* m_choiceUnitTimespan;
+    wxSpinCtrl* m_spinCtrlTimespan;
+    wxStaticBitmap* m_bitmapFilterSize;
+    wxStaticText* m_staticText101;
+    wxSpinCtrl* m_spinCtrlMinSize;
+    wxChoice* m_choiceUnitMinSize;
+    wxStaticText* m_staticText102;
+    wxSpinCtrl* m_spinCtrlMaxSize;
+    wxChoice* m_choiceUnitMaxSize;
+    wxButton* m_button9;
+    wxButton* m_button10;
+    wxButton* m_button17;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void OnHelp( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnUpdateNameFilter( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnUpdateChoice( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnDefault( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnApply( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+
+    FilterDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Configure filter"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+    ~FilterDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class CustomizeColsDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class CustomizeColsDlgGenerated : public wxDialog 
+class CustomizeColsDlgGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		wxCheckListBox* m_checkListColumns;
-		wxBitmapButton* m_bpButton29;
-		wxBitmapButton* m_bpButton30;
-		wxButton* m_button9;
-		wxButton* m_button28;
-		wxButton* m_button29;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnMoveUp( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnMoveDown( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnDefault( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		CustomizeColsDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Customize columns"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); 
-		~CustomizeColsDlgGenerated();
-	
+private:
+
+protected:
+    wxCheckListBox* m_checkListColumns;
+    wxBitmapButton* m_bpButton29;
+    wxBitmapButton* m_bpButton30;
+    wxButton* m_button9;
+    wxButton* m_button28;
+    wxButton* m_button29;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void OnMoveUp( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnMoveDown( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnDefault( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+
+    CustomizeColsDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Customize columns"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+    ~CustomizeColsDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class GlobalSettingsDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class GlobalSettingsDlgGenerated : public wxDialog 
+class GlobalSettingsDlgGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		wxStaticBitmap* m_bitmapSettings;
-		wxPanel* m_panel8;
-		wxStaticText* m_staticText56;
-		wxCheckBox* m_checkBoxTransCopy;
-		wxCheckBox* m_checkBoxCopyLocked;
-		wxCheckBox* m_checkBoxCopyPermissions;
-		wxStaticLine* m_staticline10;
-		wxStaticText* m_staticText100;
-		wxButtonWithImage* m_buttonResetDialogs;
-		wxGrid* m_gridCustomCommand;
-		wxBitmapButton* m_bpButtonAddRow;
-		wxBitmapButton* m_bpButtonRemoveRow;
-		wxButton* m_button9;
-		wxButton* m_buttonOkay;
-		wxButton* m_button29;
-		
-		// 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 OnAddRow( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnRemoveRow( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnDefault( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		GlobalSettingsDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Global settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
-		~GlobalSettingsDlgGenerated();
-	
+private:
+
+protected:
+    wxStaticBitmap* m_bitmapSettings;
+    wxPanel* m_panel8;
+    wxStaticText* m_staticText56;
+    wxCheckBox* m_checkBoxTransCopy;
+    wxCheckBox* m_checkBoxCopyLocked;
+    wxCheckBox* m_checkBoxCopyPermissions;
+    wxStaticLine* m_staticline10;
+    wxStaticText* m_staticText100;
+    wxButtonWithImage* m_buttonResetDialogs;
+    wxGrid* m_gridCustomCommand;
+    wxBitmapButton* m_bpButtonAddRow;
+    wxBitmapButton* m_bpButtonRemoveRow;
+    wxButton* m_button9;
+    wxButton* m_buttonOkay;
+    wxButton* m_button29;
+
+    // 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 OnAddRow( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnRemoveRow( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnDefault( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+
+    GlobalSettingsDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Global settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+    ~GlobalSettingsDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class SyncPreviewDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class SyncPreviewDlgGenerated : public wxDialog 
+class SyncPreviewDlgGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		wxButtonWithImage* m_buttonStartSync;
-		wxStaticLine* m_staticline16;
-		wxStaticText* m_staticTextVariant;
-		wxStaticLine* m_staticline14;
-		wxStaticText* m_staticText94;
-		wxStaticBitmap* m_bitmapCreate;
-		wxTextCtrl* m_textCtrlCreateL;
-		wxStaticBitmap* m_bitmapUpdate;
-		wxTextCtrl* m_textCtrlUpdateL;
-		wxStaticBitmap* m_bitmapDelete;
-		wxTextCtrl* m_textCtrlDeleteL;
-		wxStaticText* m_staticText95;
-		wxTextCtrl* m_textCtrlCreateR;
-		wxTextCtrl* m_textCtrlUpdateR;
-		wxTextCtrl* m_textCtrlDeleteR;
-		wxStaticBitmap* m_bitmapData;
-		wxTextCtrl* m_textCtrlData;
-		wxStaticLine* m_staticline12;
-		wxCheckBox* m_checkBoxDontShowAgain;
-		wxButton* m_button16;
-		
-		// 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:
-		
-		SyncPreviewDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Synchronization Preview"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); 
-		~SyncPreviewDlgGenerated();
-	
+private:
+
+protected:
+    wxButtonWithImage* m_buttonStartSync;
+    wxStaticLine* m_staticline16;
+    wxStaticText* m_staticTextVariant;
+    wxStaticLine* m_staticline14;
+    wxStaticText* m_staticText94;
+    wxStaticBitmap* m_bitmapCreate;
+    wxTextCtrl* m_textCtrlCreateL;
+    wxStaticBitmap* m_bitmapUpdate;
+    wxTextCtrl* m_textCtrlUpdateL;
+    wxStaticBitmap* m_bitmapDelete;
+    wxTextCtrl* m_textCtrlDeleteL;
+    wxStaticText* m_staticText95;
+    wxTextCtrl* m_textCtrlCreateR;
+    wxTextCtrl* m_textCtrlUpdateR;
+    wxTextCtrl* m_textCtrlDeleteR;
+    wxStaticBitmap* m_bitmapData;
+    wxTextCtrl* m_textCtrlData;
+    wxStaticLine* m_staticline12;
+    wxCheckBox* m_checkBoxDontShowAgain;
+    wxButton* m_button16;
+
+    // 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:
+
+    SyncPreviewDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Synchronization Preview"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+    ~SyncPreviewDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class PopupFrameGenerated1
 ///////////////////////////////////////////////////////////////////////////////
-class PopupFrameGenerated1 : public wxFrame 
+class PopupFrameGenerated1 : public wxFrame
 {
-	private:
-	
-	protected:
-	
-	public:
-		wxStaticBitmap* m_bitmapLeft;
-		wxStaticText* m_staticTextMain;
-		
-		PopupFrameGenerated1( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP|wxSTATIC_BORDER );
-		
-		~PopupFrameGenerated1();
-	
+private:
+
+protected:
+
+public:
+    wxStaticBitmap* m_bitmapLeft;
+    wxStaticText* m_staticTextMain;
+
+    PopupFrameGenerated1( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP|wxSTATIC_BORDER );
+
+    ~PopupFrameGenerated1();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class SearchDialogGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class SearchDialogGenerated : public wxDialog 
+class SearchDialogGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		wxStaticText* m_staticText101;
-		wxTextCtrl* m_textCtrlSearchTxt;
-		wxCheckBox* m_checkBoxMatchCase;
-		wxButton* m_buttonFindNext;
-		wxButton* m_button29;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnText( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnFindNext( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		SearchDialogGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Find"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE ); 
-		~SearchDialogGenerated();
-	
+private:
+
+protected:
+    wxStaticText* m_staticText101;
+    wxTextCtrl* m_textCtrlSearchTxt;
+    wxCheckBox* m_checkBoxMatchCase;
+    wxButton* m_buttonFindNext;
+    wxButton* m_button29;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void OnText( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnFindNext( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+
+    SearchDialogGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Find"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
+    ~SearchDialogGenerated();
+
+};
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class SelectTimespanDlgGenerated
+///////////////////////////////////////////////////////////////////////////////
+class SelectTimespanDlgGenerated : public wxDialog
+{
+private:
+
+protected:
+    wxCalendarCtrl* m_calendarFrom;
+    wxCalendarCtrl* m_calendarTo;
+    wxButton* m_buttonOkay;
+    wxButton* m_button29;
+
+    // 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();
+
 };
 
 #endif //__GUI_GENERATED_H__
diff --git a/ui/gui_status_handler.cpp b/ui/gui_status_handler.cpp
index c940c76e..252fc80c 100644
--- a/ui/gui_status_handler.cpp
+++ b/ui/gui_status_handler.cpp
@@ -116,6 +116,13 @@ void CompareStatusHandler::updateProcessedData(int objectsProcessed, zen::Int64
 }
 
 
+void CompareStatusHandler::reportStatus(const wxString& text)
+{
+    mainDlg.compareStatus->setStatusText_NoUpdate(text);
+    requestUiRefresh(); //throw AbortThisProcess
+}
+
+
 void CompareStatusHandler::reportInfo(const wxString& text)
 {
     mainDlg.compareStatus->setStatusText_NoUpdate(text);
@@ -154,12 +161,9 @@ void CompareStatusHandler::reportFatalError(const wxString& errorMessage)
 {
     forceUiRefresh();
 
-    //show message and abort: currently there are no fatal errors during comparison that can be ignored
     bool dummy = false;
     showErrorDlg(ReturnErrorDlg::BUTTON_ABORT,
                  errorMessage, dummy);
-
-    abortThisProcess();
 }
 
 
@@ -170,7 +174,7 @@ void CompareStatusHandler::reportWarning(const wxString& warningMessage, bool& w
 
     forceUiRefresh();
 
-    //show popup and ask user how to handle warning
+    //show pop-up and ask user how to handle warning
     bool dontWarnAgain = false;
     switch (showWarningDlg(ReturnWarningDlg::BUTTON_IGNORE | ReturnWarningDlg::BUTTON_ABORT,
                            warningMessage,
@@ -223,9 +227,9 @@ SyncStatusHandler::~SyncStatusHandler()
 
     //finalize error log
     if (abortIsRequested())
-        errorLog.logMsg(_("Synchronization aborted!") + " \n" + _("You may try to synchronize remaining items again (WITHOUT having to re-compare)!"), TYPE_ERROR);
+        errorLog.logMsg(_("Synchronization aborted!"), TYPE_ERROR);
     else if (totalErrors > 0)
-        errorLog.logMsg(_("Synchronization completed with errors!") + " \n" + _("You may try to synchronize remaining items again (WITHOUT having to re-compare)!"), TYPE_WARNING);
+        errorLog.logMsg(_("Synchronization completed with errors!"), TYPE_WARNING);
     else
         errorLog.logMsg(_("Synchronization completed successfully!"), TYPE_INFO);
 
@@ -264,13 +268,18 @@ void SyncStatusHandler::updateProcessedData(int objectsProcessed, zen::Int64 dat
 }
 
 
+void SyncStatusHandler::reportStatus(const wxString& text)
+{
+    syncStatusFrame.setStatusText_NoUpdate(text); //throw ()
+    requestUiRefresh(); //throw AbortThisProccess
+}
+
+
 void SyncStatusHandler::reportInfo(const wxString& text)
 {
-    //if (currentProcess == StatusHandler::PROCESS_SYNCHRONIZING)
     errorLog.logMsg(text, TYPE_INFO);
 
     syncStatusFrame.setStatusText_NoUpdate(text); //throw ()
-
     requestUiRefresh(); //throw AbortThisProccess
 }
 
diff --git a/ui/gui_status_handler.h b/ui/gui_status_handler.h
index b7fbd9be..1e86c0cc 100644
--- a/ui/gui_status_handler.h
+++ b/ui/gui_status_handler.h
@@ -29,6 +29,7 @@ public:
 
     virtual void initNewProcess(int objectsTotal, zen::Int64 dataTotal, Process processID);
     virtual void updateProcessedData(int objectsProcessed, zen::Int64 dataProcessed);
+    virtual void reportStatus(const wxString& text);
     virtual void reportInfo(const wxString& text);
     virtual void forceUiRefresh();
 
@@ -55,6 +56,7 @@ public:
 
     virtual void initNewProcess(int objectsTotal, zen::Int64 dataTotal, Process processID);
     virtual void updateProcessedData(int objectsProcessed, zen::Int64 dataProcessed);
+    virtual void reportStatus(const wxString& text);
     virtual void reportInfo(const wxString& text);
     virtual void forceUiRefresh();
 
diff --git a/ui/main_dlg.cpp b/ui/main_dlg.cpp
index 3e973d7e..f03fd1f7 100644
--- a/ui/main_dlg.cpp
+++ b/ui/main_dlg.cpp
@@ -16,10 +16,11 @@
 #include <wx/sound.h>
 #include <wx/display.h>
 #include <wx/app.h>
+#include <wx/dcmemory.h>
 #include <boost/bind.hpp>
+#include "../shared/folder_history_box.h"
 #include "../library/custom_grid.h"
 #include "../shared/custom_button.h"
-#include "../shared/custom_combo_box.h"
 #include "../shared/dir_picker_i18n.h"
 #include "../comparison.h"
 #include "../synchronization.h"
@@ -53,8 +54,10 @@
 #include "../library/lock_holder.h"
 #include "../shared/shell_execute.h"
 #include "../shared/localization.h"
+#include "../shared/image_tools.h"
 
 using namespace zen;
+using namespace std::rel_ops;
 
 
 namespace
@@ -68,19 +71,19 @@ struct wxClientDataString : public wxClientData //we need a wxClientData derived
 }
 
 
-class DirectoryNameMainImpl : public DirectoryNameMainDlg
+class DirectoryNameMainImpl : public DirectoryName<FolderHistoryBox>
 {
 public:
     DirectoryNameMainImpl(MainDialog&      mainDlg,
                           wxWindow&        dropWindow1,
                           wxWindow&        dropWindow2,
                           wxDirPickerCtrl& dirPicker,
-                          wxComboBox&      dirName,
+                          FolderHistoryBox& dirName,
                           wxStaticBoxSizer& staticBox) :
-        DirectoryNameMainDlg(dropWindow1, dropWindow2, dirPicker, dirName, staticBox),
+        DirectoryName(dropWindow1, dirPicker, dirName, &staticBox, &dropWindow2),
         mainDlg_(mainDlg) {}
 
-    virtual bool AcceptDrop(const std::vector<wxString>& droppedFiles)
+    virtual bool acceptDrop(const std::vector<wxString>& droppedFiles)
     {
         if (droppedFiles.empty())
             return true;
@@ -88,14 +91,6 @@ public:
         switch (xmlAccess::getMergeType(droppedFiles))   //throw ()
         {
             case xmlAccess::MERGE_BATCH:
-                if (droppedFiles.size() == 1)
-                {
-                    if (showSyncBatchDlg(droppedFiles[0]) == ReturnBatchConfig::BATCH_FILE_SAVED)
-                        mainDlg_.pushStatusInformation(_("Batch file created successfully!"));
-                    return false;
-                }
-                //fall-through for multiple *.ffs_batch files!
-
             case xmlAccess::MERGE_GUI:
             case xmlAccess::MERGE_GUI_BATCH:
                 mainDlg_.loadConfiguration(droppedFiles);
@@ -106,14 +101,12 @@ public:
                 break;
         }
 
-
         //disable the sync button
         mainDlg_.syncPreview->enableSynchronization(false);
 
         //clear grids
         mainDlg_.gridDataView->clearAllRows();
         mainDlg_.updateGuiGrid();
-
         return true;
     }
 
@@ -158,12 +151,24 @@ private:
         return mainDlg.getConfig().mainCfg;
     }
 
+    virtual void OnAltCompCfgChange()
+    {
+        mainDlg.applyCompareConfig(false); //false: not global level
+    }
+
     virtual void OnAltSyncCfgChange()
     {
         mainDlg.applySyncConfig();
     }
 
+    virtual void OnAltCompCfgRemoveConfirm(wxCommandEvent& event)
+    {
+        FolderPairPanelBasic<GuiPanel>::OnAltCompCfgRemoveConfirm(event);
+        mainDlg.applyCompareConfig(false); //false: not global level
+    }
+
     virtual void OnAltSyncCfgRemoveConfirm(wxCommandEvent& event)
+
     {
         FolderPairPanelBasic<GuiPanel>::OnAltSyncCfgRemoveConfirm(event);
         mainDlg.applySyncConfig();
@@ -195,9 +200,13 @@ public:
         dirNameLeft (*m_panelLeft,  *m_dirPickerLeft,  *m_directoryLeft),
         dirNameRight(*m_panelRight, *m_dirPickerRight, *m_directoryRight) {}
 
-    void setValues(const wxString& leftDir, const wxString& rightDir, AltSyncCfgPtr syncCfg, const FilterConfig& filter)
+    void setValues(const wxString& leftDir,
+                   const wxString& rightDir,
+                   AltCompCfgPtr cmpCfg,
+                   AltSyncCfgPtr syncCfg,
+                   const FilterConfig& filter)
     {
-        setConfig(syncCfg, filter);
+        setConfig(cmpCfg, syncCfg, filter);
         dirNameLeft.setName(leftDir);
         dirNameRight.setName(rightDir);
     }
@@ -206,8 +215,8 @@ public:
 
 private:
     //support for drag and drop
-    DirectoryName dirNameLeft;
-    DirectoryName dirNameRight;
+    DirectoryName<FolderHistoryBox> dirNameLeft;
+    DirectoryName<FolderHistoryBox> dirNameRight;
 };
 
 
@@ -231,9 +240,13 @@ public:
                      *mainDialog.m_directoryRight,
                      *mainDialog.sbSizerDirRight) {}
 
-    void setValues(const wxString& leftDir, const wxString& rightDir, AltSyncCfgPtr syncCfg, const FilterConfig& filter)
+    void setValues(const wxString& leftDir,
+                   const wxString& rightDir,
+                   AltCompCfgPtr cmpCfg,
+                   AltSyncCfgPtr syncCfg,
+                   const FilterConfig& filter)
     {
-        setConfig(syncCfg, filter);
+        setConfig(cmpCfg, syncCfg, filter);
         dirNameLeft.setName(leftDir);
         dirNameRight.setName(rightDir);
     }
@@ -394,8 +407,6 @@ MainDialog::MainDialog(const xmlAccess::XmlGuiConfig& guiCfg,
 
 MainDialog::~MainDialog()
 {
-    //keep non-inline destructor for std::auto_ptr to work with forward declaration
-
     cleanUp(true); //do NOT include any other code here! cleanUp() is re-used when switching languages
 
     auiMgr.UnInit();
@@ -406,6 +417,12 @@ void MainDialog::init(const xmlAccess::XmlGuiConfig guiCfg,
                       xmlAccess::XmlGlobalSettings& settings,
                       bool startComparison)
 {
+    folderHistoryLeft  = std::make_shared<FolderHistory>();  //make sure it is always bound
+    folderHistoryRight = std::make_shared<FolderHistory>(); //
+
+    m_directoryLeft ->init(folderHistoryLeft);
+    m_directoryRight->init(folderHistoryRight);
+
     wxWindowUpdateLocker dummy(this); //avoid display distortion
 
     //--------- avoid mirroring this dialog in RTL languages like Hebrew or Arabic --------------------
@@ -508,35 +525,35 @@ void MainDialog::init(const xmlAccess::XmlGuiConfig guiCfg,
     setConfig(guiCfg);
 
     //set icons for this dialog
-    m_buttonCompare->setBitmapFront(GlobalResources::instance().getImage(wxT("compare")));
-    m_bpButtonSyncConfig->SetBitmapLabel(GlobalResources::instance().getImage(wxT("syncConfig")));
-    m_bpButtonCmpConfig->SetBitmapLabel(GlobalResources::instance().getImage(wxT("cmpConfig")));
-    m_bpButtonSave->SetBitmapLabel(GlobalResources::instance().getImage(wxT("save")));
-    m_bpButtonLoad->SetBitmapLabel(GlobalResources::instance().getImage(wxT("load")));
-    m_bpButtonAddPair->SetBitmapLabel(GlobalResources::instance().getImage(wxT("addFolderPair")));
-    m_bitmap15->SetBitmap(GlobalResources::instance().getImage(wxT("statusEdge")));
-
-    m_bitmapCreate->SetBitmap(GlobalResources::instance().getImage(wxT("create")));
-    m_bitmapUpdate->SetBitmap(GlobalResources::instance().getImage(wxT("update")));
-    m_bitmapDelete->SetBitmap(GlobalResources::instance().getImage(wxT("delete")));
-    m_bitmapData  ->SetBitmap(GlobalResources::instance().getImage(wxT("data")));
+    m_buttonCompare->setBitmapFront(GlobalResources::getImage(wxT("compare")));
+    m_bpButtonSyncConfig->SetBitmapLabel(GlobalResources::getImage(wxT("syncConfig")));
+    m_bpButtonCmpConfig->SetBitmapLabel(GlobalResources::getImage(wxT("cmpConfig")));
+    m_bpButtonSave->SetBitmapLabel(GlobalResources::getImage(wxT("save")));
+    m_bpButtonLoad->SetBitmapLabel(GlobalResources::getImage(wxT("load")));
+    m_bpButtonAddPair->SetBitmapLabel(GlobalResources::getImage(wxT("addFolderPair")));
+    m_bitmap15->SetBitmap(GlobalResources::getImage(wxT("statusEdge")));
+
+    m_bitmapCreate->SetBitmap(GlobalResources::getImage(wxT("create")));
+    m_bitmapUpdate->SetBitmap(GlobalResources::getImage(wxT("update")));
+    m_bitmapDelete->SetBitmap(GlobalResources::getImage(wxT("delete")));
+    m_bitmapData  ->SetBitmap(GlobalResources::getImage(wxT("data")));
 
     m_panelTopButtons->Layout(); //wxButtonWithImage size might have changed
 
     //menu icons: workaround for wxWidgets: small hack to update menu items: actually this is a wxWidgets bug (affects Windows- and Linux-build)
     MenuItemUpdater updateMenuFile(m_menuFile);
-    updateMenuFile.addForUpdate(m_menuItem10,   GlobalResources::instance().getImage(wxT("compareSmall")));
-    updateMenuFile.addForUpdate(m_menuItem11,   GlobalResources::instance().getImage(wxT("syncSmall")));
-    updateMenuFile.addForUpdate(m_menuItemNew,  GlobalResources::instance().getImage(wxT("newSmall")));
-    updateMenuFile.addForUpdate(m_menuItemSave, GlobalResources::instance().getImage(wxT("saveSmall")));
-    updateMenuFile.addForUpdate(m_menuItemLoad, GlobalResources::instance().getImage(wxT("loadSmall")));
+    updateMenuFile.addForUpdate(m_menuItem10,   GlobalResources::getImage(wxT("compareSmall")));
+    updateMenuFile.addForUpdate(m_menuItem11,   GlobalResources::getImage(wxT("syncSmall")));
+    updateMenuFile.addForUpdate(m_menuItemNew,  GlobalResources::getImage(wxT("newSmall")));
+    updateMenuFile.addForUpdate(m_menuItemSave, GlobalResources::getImage(wxT("saveSmall")));
+    updateMenuFile.addForUpdate(m_menuItemLoad, GlobalResources::getImage(wxT("loadSmall")));
 
     MenuItemUpdater updateMenuAdv(m_menuAdvanced);
-    updateMenuAdv.addForUpdate(m_menuItemGlobSett, GlobalResources::instance().getImage(wxT("settingsSmall")));
-    updateMenuAdv.addForUpdate(m_menuItem7, GlobalResources::instance().getImage(wxT("batchSmall")));
+    updateMenuAdv.addForUpdate(m_menuItemGlobSett, GlobalResources::getImage(wxT("settingsSmall")));
+    updateMenuAdv.addForUpdate(m_menuItem7, GlobalResources::getImage(wxT("batchSmall")));
 
     MenuItemUpdater updateMenuHelp(m_menuHelp);
-    updateMenuHelp.addForUpdate(m_menuItemAbout, GlobalResources::instance().getImage(wxT("aboutSmall")));
+    updateMenuHelp.addForUpdate(m_menuItemAbout, GlobalResources::getImage(wxT("aboutSmall")));
 
 #ifdef FFS_LINUX
     if (!zen::isPortableVersion()) //disable update check for Linux installer-based version -> handled by .deb
@@ -548,7 +565,7 @@ void MainDialog::init(const xmlAccess::XmlGuiConfig guiCfg,
                   [&](const zen::ExistingTranslations::Entry& entry)
     {
         wxMenuItem* newItem = new wxMenuItem(m_menuLanguages, wxID_ANY, entry.languageName, wxEmptyString, wxITEM_NORMAL );
-        newItem->SetBitmap(GlobalResources::instance().getImage(entry.languageFlag));
+        newItem->SetBitmap(GlobalResources::getImage(entry.languageFlag));
 
         //map menu item IDs with language IDs: evaluated when processing event handler
         languageMenuItemMap.insert(std::map<MenuItemID, LanguageID>::value_type(newItem->GetId(), entry.languageID));
@@ -609,6 +626,8 @@ void MainDialog::init(const xmlAccess::XmlGuiConfig guiCfg,
 
     //asynchronous call to wxWindow::Layout(): fix superfluous frame on right and bottom when FFS is started in fullscreen mode
     Connect(wxEVT_IDLE, wxIdleEventHandler(MainDialog::OnLayoutWindowAsync), NULL, this);
+    wxCommandEvent evtDummy;       //call once before OnLayoutWindowAsync()
+    OnResizeFolderPairs(evtDummy); //
 
     //----------------------------------------------------------------------------------------------------------------------------------------------------------------
     //some convenience: if FFS is started with a *.ffs_gui file as commandline parameter AND all directories contained exist, comparison shall be started right off
@@ -680,7 +699,7 @@ void MainDialog::readGlobalSettings()
 
 
     //set column attributes
-    m_gridLeft->setColumnAttributes(globalSettings->gui.columnAttribLeft);
+    m_gridLeft ->setColumnAttributes(globalSettings->gui.columnAttribLeft);
     m_gridRight->setColumnAttributes(globalSettings->gui.columnAttribRight);
 
     //load list of last used configuration files
@@ -689,17 +708,28 @@ void MainDialog::readGlobalSettings()
     addFileToCfgHistory(cfgFileNames);
 
     //load list of last used folders
-    std::for_each(globalSettings->gui.folderHistoryLeft.rbegin(),
-                  globalSettings->gui.folderHistoryLeft.rend(),
-                  boost::bind(&MainDialog::addLeftFolderToHistory, this, _1));
-
-    std::for_each(globalSettings->gui.folderHistoryRight.rbegin(),
-                  globalSettings->gui.folderHistoryRight.rend(),
-                  boost::bind(&MainDialog::addRightFolderToHistory, this, _1));
+    *folderHistoryLeft  = FolderHistory(globalSettings->gui.folderHistoryLeft,  globalSettings->gui.folderHistMax);
+    *folderHistoryRight = FolderHistory(globalSettings->gui.folderHistoryRight, globalSettings->gui.folderHistMax);
 
     //show/hide file icons
-    m_gridLeft->enableFileIcons(globalSettings->gui.showFileIconsLeft);
-    m_gridRight->enableFileIcons(globalSettings->gui.showFileIconsRight);
+    const IconBuffer::IconSize sz = [&]() -> IconBuffer::IconSize
+    {
+        switch (globalSettings->gui.iconSize)
+        {
+            case xmlAccess::ICON_SIZE_SMALL:
+                return IconBuffer::SIZE_SMALL;
+            case xmlAccess::ICON_SIZE_MEDIUM:
+                return IconBuffer::SIZE_MEDIUM;
+            case xmlAccess::ICON_SIZE_LARGE:
+                return IconBuffer::SIZE_LARGE;
+        }
+        return IconBuffer::SIZE_SMALL;
+    }();
+
+    std::shared_ptr<IconBuffer> iconBuffer = std::make_shared<IconBuffer>(sz);
+    m_gridLeft  ->setIconManager(iconBuffer);
+    m_gridMiddle->setIconManager(iconBuffer);
+    m_gridRight ->setIconManager(iconBuffer);
 
     //------------------------------------------------------------------------------------------------
     //wxAuiManager erroneously loads panel captions, we don't want that
@@ -737,15 +767,8 @@ void MainDialog::writeGlobalSettings()
     globalSettings->gui.lastUsedConfigFiles = activeConfigFiles;
 
     //write list of last used folders
-    globalSettings->gui.folderHistoryLeft.clear();
-    const wxArrayString leftFolderHistory = m_directoryLeft->GetStrings();
-    for (unsigned i = 0; i < leftFolderHistory.GetCount(); ++i)
-        globalSettings->gui.folderHistoryLeft.push_back(leftFolderHistory[i]);
-
-    globalSettings->gui.folderHistoryRight.clear();
-    const wxArrayString rightFolderHistory = m_directoryRight->GetStrings();
-    for (unsigned i = 0; i < rightFolderHistory.GetCount(); ++i)
-        globalSettings->gui.folderHistoryRight.push_back(rightFolderHistory[i]);
+    globalSettings->gui.folderHistoryLeft  = folderHistoryLeft ->getList();
+    globalSettings->gui.folderHistoryRight = folderHistoryRight->getList();
 
     globalSettings->gui.guiPerspectiveLast = auiMgr.SavePerspective();
 }
@@ -1007,9 +1030,10 @@ void MainDialog::deleteSelectedFiles(const std::set<size_t>& viewSelectionLeft,
                 //handle errors when deleting files/folders
                 ManualDeletionHandler statusHandler(this);
 
-                zen::deleteFromGridAndHD(gridDataView->getDataTentative(),
-                                         compRefLeft,
+                zen::deleteFromGridAndHD(compRefLeft,
                                          compRefRight,
+                                         gridDataView->getDataTentative(),
+                                         extractDirectionCfg(getConfig().mainCfg),
                                          globalSettings->gui.deleteOnBothSides,
                                          globalSettings->gui.useRecyclerForManualDeletion,
                                          statusHandler);
@@ -1176,7 +1200,7 @@ void MainDialog::disableAllElements(bool enableAbort)
         //show abort button
         m_buttonAbort->Enable();
         m_buttonAbort->Show();
-        m_buttonAbort->SetFocus();
+        if (m_buttonAbort->IsShownOnScreen()) m_buttonAbort->SetFocus();
         m_buttonCompare->Disable();
         m_buttonCompare->Hide();
         m_bpButtonCmpConfig ->Disable();
@@ -1293,8 +1317,12 @@ void MainDialog::OnResizeFolderPairs(wxEvent& event)
 {
     //adapt left-shift display distortion caused by scrollbars for multiple folder pairs
     const int width = m_panelTopLeft->GetSize().GetWidth();
-    for (std::vector<DirectoryPair*>::iterator i = additionalFolderPairs.begin(); i != additionalFolderPairs.end(); ++i)
-        (*i)->m_panelLeft->SetMinSize(wxSize(width, -1));
+    std::for_each(additionalFolderPairs.begin(), additionalFolderPairs.end(),
+                  [&](DirectoryPair* dirPair)
+    {
+        dirPair->m_panelLeft->SetMinSize(wxSize(width, -1));
+
+    });
 
     event.Skip();
 }
@@ -1635,6 +1663,14 @@ struct SelectedExtension : public wxObject
     Zstring extension;
 };
 
+
+struct CtxtSelectionIconSize : public wxObject
+{
+    CtxtSelectionIconSize(xmlAccess::FileIconSize sz) : iconSize(sz) {}
+    xmlAccess::FileIconSize iconSize;
+};
+
+
 typedef std::vector<std::pair<Zstring, bool> > FilterObjList; //relative name |-> "is directory flag"
 
 struct FilterObjContainer : public wxObject
@@ -1694,21 +1730,21 @@ void MainDialog::OnContextRim(wxGridEvent& event)
             //CONTEXT_SYNC_DIR_LEFT
             wxMenuItem* menuItemSyncDirLeft = new wxMenuItem(contextMenu.get(), wxID_ANY, wxString(_("Set direction:")) +
                                                              wxT(" <-") + wxT("\tAlt - Left")); //Linux needs a direction, "<-", because it has no context menu icons!
-            menuItemSyncDirLeft->SetBitmap(getSyncOpImage(fsObj->testSyncOperation(true, SYNC_DIR_LEFT)));
+            menuItemSyncDirLeft->SetBitmap(getSyncOpImage(fsObj->testSyncOperation(SYNC_DIR_LEFT)));
             contextMenu->Append(menuItemSyncDirLeft);
             contextMenu->Connect(menuItemSyncDirLeft->GetId(),  wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainDialog::OnContextSyncDirLeft),      NULL, this);
 
             //CONTEXT_SYNC_DIR_NONE
             wxMenuItem* menuItemSyncDirNone = new wxMenuItem(contextMenu.get(), wxID_ANY, wxString(_("Set direction:")) +
                                                              wxT(" -") + wxT("\tAlt - Up"));
-            menuItemSyncDirNone->SetBitmap(getSyncOpImage(fsObj->testSyncOperation(true, SYNC_DIR_NONE)));
+            menuItemSyncDirNone->SetBitmap(getSyncOpImage(fsObj->testSyncOperation(SYNC_DIR_NONE)));
             contextMenu->Append(menuItemSyncDirNone);
             contextMenu->Connect(menuItemSyncDirNone->GetId(),  wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainDialog::OnContextSyncDirNone),      NULL, this);
 
             //CONTEXT_SYNC_DIR_RIGHT
             wxMenuItem* menuItemSyncDirRight = new wxMenuItem(contextMenu.get(), wxID_ANY, wxString(_("Set direction:")) +
                                                               wxT(" ->") + wxT("\tAlt - Right"));
-            menuItemSyncDirRight->SetBitmap(getSyncOpImage(fsObj->testSyncOperation(true, SYNC_DIR_RIGHT)));
+            menuItemSyncDirRight->SetBitmap(getSyncOpImage(fsObj->testSyncOperation(SYNC_DIR_RIGHT)));
             contextMenu->Append(menuItemSyncDirRight);
             contextMenu->Connect(menuItemSyncDirRight->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainDialog::OnContextSyncDirRight),     NULL, this);
 
@@ -1723,12 +1759,12 @@ void MainDialog::OnContextRim(wxGridEvent& event)
         if (fsObj->isActive())
         {
             menuItemInExcl = new wxMenuItem(contextMenu.get(), wxID_ANY, wxString(_("Exclude temporarily")) + wxT("\tSpace"));
-            menuItemInExcl->SetBitmap(GlobalResources::instance().getImage(wxT("checkboxFalse")));
+            menuItemInExcl->SetBitmap(GlobalResources::getImage(wxT("checkboxFalse")));
         }
         else
         {
             menuItemInExcl = new wxMenuItem(contextMenu.get(), wxID_ANY, wxString(_("Include temporarily")) + wxT("\tSpace"));
-            menuItemInExcl->SetBitmap(GlobalResources::instance().getImage(wxT("checkboxTrue")));
+            menuItemInExcl->SetBitmap(GlobalResources::getImage(wxT("checkboxTrue")));
         }
 
         contextMenu->Append(menuItemInExcl);
@@ -1787,7 +1823,7 @@ void MainDialog::OnContextRim(wxGridEvent& event)
 
             //add context menu item
             wxMenuItem* menuItemExclExt = new wxMenuItem(contextMenu.get(), wxID_ANY, wxString(_("Exclude via filter:")) + " " + "*." + extension);
-            menuItemExclExt->SetBitmap(GlobalResources::instance().getImage(wxT("filterSmall")));
+            menuItemExclExt->SetBitmap(GlobalResources::getImage(wxT("filterSmall")));
             contextMenu->Append(menuItemExclExt);
 
             //connect event
@@ -1809,7 +1845,7 @@ void MainDialog::OnContextRim(wxGridEvent& event)
 
     if (menuItemExclObj != NULL)
     {
-        menuItemExclObj->SetBitmap(GlobalResources::instance().getImage(wxT("filterSmall")));
+        menuItemExclObj->SetBitmap(GlobalResources::getImage(wxT("filterSmall")));
         contextMenu->Append(menuItemExclObj);
 
         //connect event
@@ -1891,7 +1927,7 @@ void MainDialog::OnContextExcludeExtension(wxCommandEvent& event)
         updateFilterButtons();
 
         //do not fully apply filter, just exclude new items
-        std::for_each(gridDataView->getDataTentative().begin(), gridDataView->getDataTentative().end(),
+        std::for_each(begin(gridDataView->getDataTentative()), end(gridDataView->getDataTentative()),
         [&](BaseDirMapping& baseMap) { addHardFiltering(baseMap, newExclude); });
 
         //applyFiltering(getConfig().mainCfg, gridDataView->getDataTentative());
@@ -1899,8 +1935,8 @@ void MainDialog::OnContextExcludeExtension(wxCommandEvent& event)
 
         if (currentCfg.hideFilteredElements)
         {
-            m_gridLeft->  ClearSelection();
-            m_gridRight-> ClearSelection();
+            m_gridLeft  ->ClearSelection();
+            m_gridRight ->ClearSelection();
             m_gridMiddle->ClearSelection();
         }
     }
@@ -1934,7 +1970,7 @@ void MainDialog::OnContextExcludeObject(wxCommandEvent& event)
             updateFilterButtons();
 
             //do not fully apply filter, just exclude new items
-            std::for_each(gridDataView->getDataTentative().begin(), gridDataView->getDataTentative().end(),
+            std::for_each(begin(gridDataView->getDataTentative()), end(gridDataView->getDataTentative()),
             [&](BaseDirMapping& baseMap) { addHardFiltering(baseMap, newExclude); });
 
             //applyFiltering(getConfig().mainCfg, gridDataView->getDataTentative());
@@ -1942,8 +1978,8 @@ void MainDialog::OnContextExcludeObject(wxCommandEvent& event)
 
             if (currentCfg.hideFilteredElements)
             {
-                m_gridLeft->ClearSelection();
-                m_gridRight->ClearSelection();
+                m_gridLeft  ->ClearSelection();
+                m_gridRight ->ClearSelection();
                 m_gridMiddle->ClearSelection();
             }
         }
@@ -2001,6 +2037,13 @@ void MainDialog::OnContextRimLabelLeft(wxGridEvent& event)
     contextMenu->Append(menuItemCustomize);
     contextMenu->Connect(menuItemCustomize->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainDialog::OnContextCustColumnLeft), NULL, this);
 
+    if (m_gridLeft->getTypeAtPos(event.GetCol()) == xmlAccess::DATE)
+    {
+        wxMenuItem* menuItemSelectTs = new wxMenuItem(contextMenu.get(), wxID_ANY, _("Select time span..."));
+        contextMenu->Append(menuItemSelectTs);
+        contextMenu->Connect(menuItemSelectTs->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainDialog::OnContextSelectTimeSpan), NULL, this);
+    }
+
     contextMenu->AppendSeparator();
 
     wxMenuItem* itemAutoAdjust = new wxMenuItem(contextMenu.get(), wxID_ANY, _("Auto-adjust columns"), wxEmptyString, wxITEM_CHECK);
@@ -2008,6 +2051,28 @@ void MainDialog::OnContextRimLabelLeft(wxGridEvent& event)
     itemAutoAdjust->Check(globalSettings->gui.autoAdjustColumnsLeft);
     contextMenu->Connect(itemAutoAdjust->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainDialog::OnContextAutoAdjustLeft), NULL, this);
 
+    //if (m_gridLeft->getTypeAtPos(event.GetCol()) == xmlAccess::FILENAME)
+    {
+        contextMenu->AppendSeparator();
+
+        wxMenuItem* header = contextMenu->Append(wxID_ANY, _("Icon size:"));
+        header->Enable(false);
+
+        auto addSizeEntry = [&](const wxString& label, xmlAccess::FileIconSize sz)
+        {
+            wxMenuItem* newItem = contextMenu->Append(wxID_ANY, label, wxEmptyString, wxITEM_RADIO);
+            contextMenu->Connect(newItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainDialog::OnContextSetIconSize),
+                                 new CtxtSelectionIconSize(sz), //ownership passed!
+                                 this);
+
+            if (globalSettings->gui.iconSize == sz)
+                newItem->Check();
+        };
+        addSizeEntry(_("Small" ), xmlAccess::ICON_SIZE_SMALL);
+        addSizeEntry(_("Medium"), xmlAccess::ICON_SIZE_MEDIUM);
+        addSizeEntry(_("Large" ), xmlAccess::ICON_SIZE_LARGE);
+    }
+
     PopupMenu(contextMenu.get()); //show context menu
 }
 
@@ -2020,6 +2085,13 @@ void MainDialog::OnContextRimLabelRight(wxGridEvent& event)
     contextMenu->Append(menuItemCustomize);
     contextMenu->Connect(menuItemCustomize->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainDialog::OnContextCustColumnRight), NULL, this);
 
+    if (m_gridRight->getTypeAtPos(event.GetCol()) == xmlAccess::DATE)
+    {
+        wxMenuItem* menuItemSelectTs = new wxMenuItem(contextMenu.get(), wxID_ANY, _("Select time span..."));
+        contextMenu->Append(menuItemSelectTs);
+        contextMenu->Connect(menuItemSelectTs->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainDialog::OnContextSelectTimeSpan), NULL, this);
+    }
+
     contextMenu->AppendSeparator();
 
     wxMenuItem* itemAutoAdjust = new wxMenuItem(contextMenu.get(), wxID_ANY, _("Auto-adjust columns"), wxEmptyString, wxITEM_CHECK);
@@ -2027,6 +2099,27 @@ void MainDialog::OnContextRimLabelRight(wxGridEvent& event)
     itemAutoAdjust->Check(globalSettings->gui.autoAdjustColumnsRight);
     contextMenu->Connect(itemAutoAdjust->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainDialog::OnContextAutoAdjustRight), NULL, this);
 
+    //if (m_gridRight->getTypeAtPos(event.GetCol()) == xmlAccess::FILENAME)
+    {
+        contextMenu->AppendSeparator();
+
+        wxMenuItem* header = contextMenu->Append(wxID_ANY, _("Icon size:"));
+        header->Enable(false);
+
+        auto addSizeEntry = [&](const wxString& label, xmlAccess::FileIconSize sz)
+        {
+            wxMenuItem* newItem = contextMenu->Append(wxID_ANY, label, wxEmptyString, wxITEM_RADIO);
+            contextMenu->Connect(newItem->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainDialog::OnContextSetIconSize),
+                                 new CtxtSelectionIconSize(sz), //ownership passed!
+                                 this);
+            if (globalSettings->gui.iconSize == sz)
+                newItem->Check();
+        };
+        addSizeEntry(_("Small" ), xmlAccess::ICON_SIZE_SMALL);
+        addSizeEntry(_("Medium"), xmlAccess::ICON_SIZE_MEDIUM);
+        addSizeEntry(_("Large" ), xmlAccess::ICON_SIZE_LARGE);
+    }
+
     PopupMenu(contextMenu.get()); //show context menu
 }
 
@@ -2061,6 +2154,16 @@ void MainDialog::OnContextCustColumnRight(wxCommandEvent& event)
 }
 
 
+void MainDialog::OnContextSelectTimeSpan(wxCommandEvent& event)
+{
+    if (showSelectTimespanDlg(manualTimeSpanFrom, manualTimeSpanTo) == ReturnSmallDlg::BUTTON_OKAY)
+    {
+        applyTimeSpanFilter(gridDataView->getDataTentative(), manualTimeSpanFrom, manualTimeSpanTo); //overwrite current active/inactive settings
+        refreshGridAfterFilterChange(400);
+    }
+}
+
+
 void MainDialog::OnContextAutoAdjustLeft(wxCommandEvent& event)
 {
     globalSettings->gui.autoAdjustColumnsLeft = !globalSettings->gui.autoAdjustColumnsLeft;
@@ -2075,6 +2178,36 @@ void MainDialog::OnContextAutoAdjustRight(wxCommandEvent& event)
 }
 
 
+void MainDialog::OnContextSetIconSize(wxCommandEvent& event)
+{
+    CtxtSelectionIconSize* sizeObj = dynamic_cast<CtxtSelectionIconSize*>(event.m_callbackUserData);
+    if (sizeObj)
+    {
+        globalSettings->gui.iconSize = sizeObj->iconSize;
+
+        const IconBuffer::IconSize sz = [&]() -> IconBuffer::IconSize
+        {
+            switch (globalSettings->gui.iconSize)
+            {
+                case xmlAccess::ICON_SIZE_SMALL:
+                    return IconBuffer::SIZE_SMALL;
+                case xmlAccess::ICON_SIZE_MEDIUM:
+                    return IconBuffer::SIZE_MEDIUM;
+                case xmlAccess::ICON_SIZE_LARGE:
+                    return IconBuffer::SIZE_LARGE;
+            }
+            return IconBuffer::SIZE_SMALL;
+        }();
+
+        std::shared_ptr<IconBuffer> iconBuffer = std::make_shared<IconBuffer>(sz);
+
+        m_gridLeft  ->setIconManager(iconBuffer);
+        m_gridMiddle->setIconManager(iconBuffer);
+        m_gridRight ->setIconManager(iconBuffer);
+    }
+}
+
+
 void MainDialog::OnContextMiddle(wxGridEvent& event)
 {
     contextMenu.reset(new wxMenu); //re-create context menu
@@ -2106,9 +2239,9 @@ void MainDialog::OnContextMiddleLabel(wxGridEvent& event)
     contextMenu->Connect(itemCmpResult->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainDialog::OnContextComparisonView), NULL, this);
 
     if (syncPreview->previewIsEnabled())
-        itemSyncPreview->SetBitmap(GlobalResources::instance().getImage(wxT("syncViewSmall")));
+        itemSyncPreview->SetBitmap(GlobalResources::getImage(wxT("syncViewSmall")));
     else
-        itemCmpResult->SetBitmap(GlobalResources::instance().getImage(wxT("cmpViewSmall")));
+        itemCmpResult->SetBitmap(GlobalResources::getImage(wxT("cmpViewSmall")));
 
     contextMenu->Append(itemCmpResult);
     contextMenu->Append(itemSyncPreview);
@@ -2208,7 +2341,7 @@ void MainDialog::OnContextSelectCompVariant(wxMouseEvent& event)
 {
     contextMenu.reset(new wxMenu); //re-create context menu
 
-    wxMenuItem* itemSizeDate = new wxMenuItem(contextMenu.get(), wxID_ANY, _("File size and date"), L"", wxITEM_RADIO);
+    wxMenuItem* itemSizeDate = new wxMenuItem(contextMenu.get(), wxID_ANY, _("File time and size"), L"", wxITEM_RADIO);
     contextMenu->Append(itemSizeDate);
     contextMenu->Connect(itemSizeDate->GetId(),
                          wxEVT_COMMAND_MENU_SELECTED,
@@ -2227,7 +2360,7 @@ void MainDialog::OnContextSelectCompVariant(wxMouseEvent& event)
     //---------------------------------------------------------------
     xmlAccess::XmlGuiConfig cfg = getConfig();
 
-    switch (cfg.mainCfg.compareVar)
+    switch (cfg.mainCfg.cmpConfig.compareVar)
     {
         case CMP_BY_TIME_SIZE:
             itemSizeDate->Check();
@@ -2243,8 +2376,8 @@ void MainDialog::OnContextSelectCompVariant(wxMouseEvent& event)
 
 struct CtxtSelectionSyncVar : public wxObject
 {
-    CtxtSelectionSyncVar(SyncConfig::Variant var) : syncVar(var) {}
-    SyncConfig::Variant syncVar;
+    CtxtSelectionSyncVar(DirectionConfig::Variant var) : syncVar(var) {}
+    DirectionConfig::Variant syncVar;
 };
 
 
@@ -2257,7 +2390,7 @@ void MainDialog::OnContextSelectSyncVariant(wxMouseEvent& event)
     contextMenu->Connect(itemAuto->GetId(),
                          wxEVT_COMMAND_MENU_SELECTED,
                          wxCommandEventHandler(MainDialog::OnSetSyncVariant),
-                         new CtxtSelectionSyncVar(SyncConfig::AUTOMATIC), //ownership passed!
+                         new CtxtSelectionSyncVar(DirectionConfig::AUTOMATIC), //ownership passed!
                          this);
 
     wxMenuItem* itemMirror = new wxMenuItem(contextMenu.get(), wxID_ANY, _("Mirror ->>"), L"", wxITEM_RADIO);
@@ -2265,7 +2398,7 @@ void MainDialog::OnContextSelectSyncVariant(wxMouseEvent& event)
     contextMenu->Connect(itemMirror->GetId(),
                          wxEVT_COMMAND_MENU_SELECTED,
                          wxCommandEventHandler(MainDialog::OnSetSyncVariant),
-                         new CtxtSelectionSyncVar(SyncConfig::MIRROR), //ownership passed!
+                         new CtxtSelectionSyncVar(DirectionConfig::MIRROR), //ownership passed!
                          this);
 
     wxMenuItem* itemUpdate = new wxMenuItem(contextMenu.get(), wxID_ANY, _("Update ->"), L"", wxITEM_RADIO);
@@ -2273,7 +2406,7 @@ void MainDialog::OnContextSelectSyncVariant(wxMouseEvent& event)
     contextMenu->Connect(itemUpdate->GetId(),
                          wxEVT_COMMAND_MENU_SELECTED,
                          wxCommandEventHandler(MainDialog::OnSetSyncVariant),
-                         new CtxtSelectionSyncVar(SyncConfig::UPDATE), //ownership passed!
+                         new CtxtSelectionSyncVar(DirectionConfig::UPDATE), //ownership passed!
                          this);
 
     wxMenuItem* itemCustom = new wxMenuItem(contextMenu.get(), wxID_ANY, _("Custom"), L"", wxITEM_RADIO);
@@ -2281,24 +2414,24 @@ void MainDialog::OnContextSelectSyncVariant(wxMouseEvent& event)
     contextMenu->Connect(itemCustom->GetId(),
                          wxEVT_COMMAND_MENU_SELECTED,
                          wxCommandEventHandler(MainDialog::OnSetSyncVariant),
-                         new CtxtSelectionSyncVar(SyncConfig::CUSTOM), //ownership passed!
+                         new CtxtSelectionSyncVar(DirectionConfig::CUSTOM), //ownership passed!
                          this);
 
     //---------------------------------------------------------------
     xmlAccess::XmlGuiConfig cfg = getConfig();
 
-    switch (cfg.mainCfg.syncConfiguration.var)
+    switch (cfg.mainCfg.syncCfg.directionCfg.var)
     {
-        case SyncConfig::AUTOMATIC:
+        case DirectionConfig::AUTOMATIC:
             itemAuto->Check();
             break;
-        case SyncConfig::MIRROR:
+        case DirectionConfig::MIRROR:
             itemMirror->Check();
             break;
-        case SyncConfig::UPDATE:
+        case DirectionConfig::UPDATE:
             itemUpdate->Check();
             break;
-        case SyncConfig::CUSTOM:
+        case DirectionConfig::CUSTOM:
             itemCustom->Check();
             break;
     }
@@ -2312,7 +2445,7 @@ void MainDialog::OnSetCompVariant(wxCommandEvent& event)
     CtxtSelectionCmpVar* selection = dynamic_cast<CtxtSelectionCmpVar*>(event.m_callbackUserData);
     if (selection)
     {
-        currentCfg.mainCfg.compareVar = selection->compareVar;
+        currentCfg.mainCfg.cmpConfig.compareVar = selection->compareVar;
         applyCompareConfig();
     }
 }
@@ -2323,7 +2456,7 @@ void MainDialog::OnSetSyncVariant(wxCommandEvent& event)
     CtxtSelectionSyncVar* selection = dynamic_cast<CtxtSelectionSyncVar*>(event.m_callbackUserData);
     if (selection)
     {
-        currentCfg.mainCfg.syncConfiguration.var = selection->syncVar;
+        currentCfg.mainCfg.syncCfg.directionCfg.var = selection->syncVar;
         applySyncConfig();
     }
 }
@@ -2412,18 +2545,6 @@ void MainDialog::addFileToCfgHistory(const std::vector<wxString>& filenames)
 }
 
 
-void MainDialog::addLeftFolderToHistory(const wxString& leftFolder)
-{
-    m_directoryLeft->addPairToFolderHistory(leftFolder, globalSettings->gui.folderHistMax);
-}
-
-
-void MainDialog::addRightFolderToHistory(const wxString& rightFolder)
-{
-    m_directoryRight->addPairToFolderHistory(rightFolder, globalSettings->gui.folderHistMax);
-}
-
-
 void MainDialog::OnSaveConfig(wxCommandEvent& event)
 {
     trySaveConfig();
@@ -2525,12 +2646,14 @@ void MainDialog::OnLoadFromHistory(wxCommandEvent& event)
 
 bool MainDialog::saveOldConfig() //return false on user abort
 {
-    //notify user about changed settings
-    if (globalSettings->optDialogs.popupOnConfigChange &&
-        //only if check is active and non-default config file loaded
-        (activeConfigFiles.size() != 1 || activeConfigFiles[0] != lastRunConfigName()))
+    if (lastConfigurationSaved != getConfig())
     {
-        if (lastConfigurationSaved != getConfig())
+        //notify user about changed settings
+        if (!globalSettings->optDialogs.popupOnConfigChange)
+            //discard current config selection, this ensures next app start will load <last session> instead of the original non-modified config selection
+            setLastUsedConfig(std::vector<wxString>(), getConfig());
+        else if (!activeConfigFiles.empty() &&  //only if check is active and non-default config file loaded
+                 (activeConfigFiles.size() != 1 || activeConfigFiles[0] != lastRunConfigName()))
         {
             bool dontShowAgain = !globalSettings->optDialogs.popupOnConfigChange;
 
@@ -2670,18 +2793,15 @@ void MainDialog::OnClose(wxCloseEvent& event)
 
 void MainDialog::OnCheckRows(FFSCheckRowsEvent& event)
 {
-    const int lowerBound = std::min(event.rowFrom, event.rowTo);
-    const int upperBound = std::max(event.rowFrom, event.rowTo);
+    const int lowerBound = std::max(std::min(event.rowFrom, event.rowTo), 0);
+    const int upperBound = std::min(std::max(event.rowFrom, event.rowTo), static_cast<int>(gridDataView->rowsOnView()) - 1);
 
-    if (0 <= lowerBound)
-    {
-        std::set<size_t> selectedRowsOnView;
-
-        for (int i = lowerBound; i <= std::min(upperBound, int(gridDataView->rowsOnView()) - 1); ++i)
-            selectedRowsOnView.insert(i);
+    std::set<size_t> selectedRowsOnView;
+    for (int i = lowerBound; i <= upperBound; ++i)
+        selectedRowsOnView.insert(i);
 
+    if (!selectedRowsOnView.empty())
         filterRangeManually(selectedRowsOnView, event.rowFrom);
-    }
 }
 
 
@@ -2751,11 +2871,12 @@ void MainDialog::setConfig(const xmlAccess::XmlGuiConfig& newGuiCfg)
     //set first folder pair
     firstFolderPair->setValues(toWx(currentCfg.mainCfg.firstPair.leftDirectory),
                                toWx(currentCfg.mainCfg.firstPair.rightDirectory),
+                               currentCfg.mainCfg.firstPair.altCmpConfig,
                                currentCfg.mainCfg.firstPair.altSyncConfig,
                                currentCfg.mainCfg.firstPair.localFilter);
 
-    addLeftFolderToHistory( toWx(currentCfg.mainCfg.firstPair.leftDirectory));  //another hack: wxCombobox::Insert() asynchronously sends message
-    addRightFolderToHistory(toWx(currentCfg.mainCfg.firstPair.rightDirectory)); //overwriting a later wxCombobox::SetValue()!!! :(
+    folderHistoryLeft->addItem(currentCfg.mainCfg.firstPair.leftDirectory);
+    folderHistoryRight->addItem(currentCfg.mainCfg.firstPair.rightDirectory);
 
     //clear existing additional folder pairs
     clearAddFolderPairs();
@@ -2771,7 +2892,7 @@ void MainDialog::setConfig(const xmlAccess::XmlGuiConfig& newGuiCfg)
 
     //###########################################################
     //update compare variant name
-    m_staticTextCmpVariant->SetLabel(wxString(wxT("(")) + getVariantName(currentCfg.mainCfg.compareVar) + wxT(")"));
+    m_staticTextCmpVariant->SetLabel(wxString(wxT("(")) + currentCfg.mainCfg.getCompVariantName() + wxT(")"));
 
     //update sync variant name
     m_staticTextSyncVariant->SetLabel(wxString(wxT("(")) + currentCfg.mainCfg.getSyncVariantName() + wxT(")"));
@@ -2784,6 +2905,7 @@ FolderPairEnh getEnhancedPair(const DirectoryPair* panel)
 {
     return FolderPairEnh(toZ(panel->getLeftDir()),
                          toZ(panel->getRightDir()),
+                         panel->getAltCompConfig(),
                          panel->getAltSyncConfig(),
                          panel->getAltFilterConfig());
 }
@@ -2798,6 +2920,7 @@ xmlAccess::XmlGuiConfig MainDialog::getConfig() const
     //first folder pair
     guiCfg.mainCfg.firstPair = FolderPairEnh(toZ(firstFolderPair->getLeftDir()),
                                              toZ(firstFolderPair->getRightDir()),
+                                             firstFolderPair->getAltCompConfig(),
                                              firstFolderPair->getAltSyncConfig(),
                                              firstFolderPair->getAltFilterConfig());
 
@@ -2826,9 +2949,10 @@ void MainDialog::refreshGridAfterFilterChange(int delay)
     m_gridLeft  ->ForceRefresh();
     m_gridMiddle->ForceRefresh();
     m_gridRight ->ForceRefresh();
-    //m_gridLeft  ->Update();   //
-    //m_gridMiddle->Update();   //show changes resulting from ForceRefresh()
-    //m_gridRight ->Update();   //
+
+    m_gridLeft  ->Update();   //
+    m_gridMiddle->Update();   //show changes resulting from ForceRefresh() - required for last, possibly half-visible, row only
+    m_gridRight ->Update();   //
 
     if (currentCfg.hideFilteredElements)
     {
@@ -2993,78 +3117,97 @@ void MainDialog::OnSyncDirNone(wxCommandEvent& event)
 }
 
 
+inline
+wxBitmap buttonPressed(const std::string& name)
+{
+    wxBitmap background = GlobalResources::getImage(wxT("buttonPressed"));
+    return layOver(GlobalResources::getImage(utf8CvrtTo<wxString>(name)), background);
+}
+
+
+inline
+wxBitmap buttonReleased(const std::string& name)
+{
+    wxImage output = GlobalResources::getImage(utf8CvrtTo<wxString>(name)).ConvertToImage().ConvertToGreyscale(1.0/3, 1.0/3, 1.0/3); //treat all channels equally!
+    zen::move(output, 0, -1); //move image right one pixel
+
+    brighten(output, 80);
+    return output;
+}
+
+
 void MainDialog::initViewFilterButtons()
 {
     //compare result buttons
-    m_bpButtonLeftOnly->init(GlobalResources::instance().getImage(wxT("leftOnlyAct")),
+    m_bpButtonLeftOnly->init(buttonPressed("leftOnly"),
                              _("Hide files that exist on left side only"),
-                             GlobalResources::instance().getImage(wxT("leftOnlyDeact")),
+                             buttonReleased("leftOnly"),
                              _("Show files that exist on left side only"));
 
-    m_bpButtonRightOnly->init(GlobalResources::instance().getImage(wxT("rightOnlyAct")),
+    m_bpButtonRightOnly->init(buttonPressed("rightOnly"),
                               _("Hide files that exist on right side only"),
-                              GlobalResources::instance().getImage(wxT("rightOnlyDeact")),
+                              buttonReleased("rightOnly"),
                               _("Show files that exist on right side only"));
 
-    m_bpButtonLeftNewer->init(GlobalResources::instance().getImage(wxT("leftNewerAct")),
+    m_bpButtonLeftNewer->init(buttonPressed("leftNewer"),
                               _("Hide files that are newer on left"),
-                              GlobalResources::instance().getImage(wxT("leftNewerDeact")),
+                              buttonReleased("leftNewer"),
                               _("Show files that are newer on left"));
 
-    m_bpButtonRightNewer->init(GlobalResources::instance().getImage(wxT("rightNewerAct")),
+    m_bpButtonRightNewer->init(buttonPressed("rightNewer"),
                                _("Hide files that are newer on right"),
-                               GlobalResources::instance().getImage(wxT("rightNewerDeact")),
+                               buttonReleased("rightNewer"),
                                _("Show files that are newer on right"));
 
-    m_bpButtonEqual->init(GlobalResources::instance().getImage(wxT("equalAct")),
+    m_bpButtonEqual->init(buttonPressed("equal"),
                           _("Hide files that are equal"),
-                          GlobalResources::instance().getImage(wxT("equalDeact")),
+                          buttonReleased("equal"),
                           _("Show files that are equal"));
 
-    m_bpButtonDifferent->init(GlobalResources::instance().getImage(wxT("differentAct")),
+    m_bpButtonDifferent->init(buttonPressed("different"),
                               _("Hide files that are different"),
-                              GlobalResources::instance().getImage(wxT("differentDeact")),
+                              buttonReleased("different"),
                               _("Show files that are different"));
 
-    m_bpButtonConflict->init(GlobalResources::instance().getImage(wxT("conflictAct")),
+    m_bpButtonConflict->init(buttonPressed("conflict"),
                              _("Hide conflicts"),
-                             GlobalResources::instance().getImage(wxT("conflictDeact")),
+                             buttonReleased("conflict"),
                              _("Show conflicts"));
 
     //sync preview buttons
-    m_bpButtonSyncCreateLeft->init(GlobalResources::instance().getImage(wxT("syncCreateLeftAct")),
+    m_bpButtonSyncCreateLeft->init(buttonPressed("createLeft"),
                                    _("Hide files that will be created on the left side"),
-                                   GlobalResources::instance().getImage(wxT("syncCreateLeftDeact")),
+                                   buttonReleased("createLeft"),
                                    _("Show files that will be created on the left side"));
 
-    m_bpButtonSyncCreateRight->init(GlobalResources::instance().getImage(wxT("syncCreateRightAct")),
+    m_bpButtonSyncCreateRight->init(buttonPressed("createRight"),
                                     _("Hide files that will be created on the right side"),
-                                    GlobalResources::instance().getImage(wxT("syncCreateRightDeact")),
+                                    buttonReleased("createRight"),
                                     _("Show files that will be created on the right side"));
 
-    m_bpButtonSyncDeleteLeft->init(GlobalResources::instance().getImage(wxT("syncDeleteLeftAct")),
+    m_bpButtonSyncDeleteLeft->init(buttonPressed("deleteLeft"),
                                    _("Hide files that will be deleted on the left side"),
-                                   GlobalResources::instance().getImage(wxT("syncDeleteLeftDeact")),
+                                   buttonReleased("deleteLeft"),
                                    _("Show files that will be deleted on the left side"));
 
-    m_bpButtonSyncDeleteRight->init(GlobalResources::instance().getImage(wxT("syncDeleteRightAct")),
+    m_bpButtonSyncDeleteRight->init(buttonPressed("deleteRight"),
                                     _("Hide files that will be deleted on the right side"),
-                                    GlobalResources::instance().getImage(wxT("syncDeleteRightDeact")),
+                                    buttonReleased("deleteRight"),
                                     _("Show files that will be deleted on the right side"));
 
-    m_bpButtonSyncDirOverwLeft->init(GlobalResources::instance().getImage(wxT("syncDirLeftAct")),
+    m_bpButtonSyncDirOverwLeft->init(buttonPressed("updateLeft"),
                                      _("Hide files that will be overwritten on left side"),
-                                     GlobalResources::instance().getImage(wxT("syncDirLeftDeact")),
+                                     buttonReleased("updateLeft"),
                                      _("Show files that will be overwritten on left side"));
 
-    m_bpButtonSyncDirOverwRight->init(GlobalResources::instance().getImage(wxT("syncDirRightAct")),
+    m_bpButtonSyncDirOverwRight->init(buttonPressed("updateRight"),
                                       _("Hide files that will be overwritten on right side"),
-                                      GlobalResources::instance().getImage(wxT("syncDirRightDeact")),
+                                      buttonReleased("updateRight"),
                                       _("Show files that will be overwritten on right side"));
 
-    m_bpButtonSyncDirNone->init(GlobalResources::instance().getImage(wxT("syncDirNoneAct")),
+    m_bpButtonSyncDirNone->init(buttonPressed("none"),
                                 _("Hide files that won't be copied"),
-                                GlobalResources::instance().getImage(wxT("syncDirNoneDeact")),
+                                buttonReleased("none"),
                                 _("Show files that won't be copied"));
 
     //compare result buttons
@@ -3092,12 +3235,12 @@ void MainDialog::updateFilterButtons()
     //global filter: test for Null-filter
     if (isNullFilter(currentCfg.mainCfg.globalFilter))
     {
-        setBitmapLabel(*m_bpButtonFilter, GlobalResources::instance().getImage(wxT("filterOff")));
+        setBitmapLabel(*m_bpButtonFilter, GlobalResources::getImage(wxT("filterOff")));
         m_bpButtonFilter->SetToolTip(_("No filter selected"));
     }
     else
     {
-        setBitmapLabel(*m_bpButtonFilter, GlobalResources::instance().getImage(wxT("filterOn")));
+        setBitmapLabel(*m_bpButtonFilter, GlobalResources::getImage(wxT("filterOn")));
         m_bpButtonFilter->SetToolTip(_("Filter is active"));
     }
 
@@ -3140,15 +3283,13 @@ void MainDialog::OnCompare(wxCommandEvent& event)
         }
 
         //begin comparison
-        zen::CompareProcess comparison(globalSettings->fileTimeTolerance,
-                                       globalSettings->optDialogs,
-                                       statusHandler);
+        zen::CompareProcess compProc(globalSettings->fileTimeTolerance,
+                                     globalSettings->optDialogs,
+                                     statusHandler);
 
         //technical representation of comparison data
         zen::FolderComparison newCompareData;
-        comparison.startCompareProcess(cmpConfig, //call getCurrentCfg() to get current values for directory pairs!
-                                       currentCfg.mainCfg.compareVar,
-                                       newCompareData);
+        compProc.startCompareProcess(cmpConfig, newCompareData);
 
         gridDataView->setData(newCompareData); //newCompareData is invalidated after this call
 
@@ -3161,14 +3302,14 @@ void MainDialog::OnCompare(wxCommandEvent& event)
     {
         //disable the sync button
         syncPreview->enableSynchronization(false);
-        m_buttonCompare->SetFocus();
+        if (m_buttonCompare->IsShownOnScreen()) m_buttonCompare->SetFocus();
         updateGuiGrid(); //refresh grid in ANY case! (also on abort)
         return;
     }
 
     //once compare is finished enable the sync button
     syncPreview->enableSynchronization(true);
-    m_buttonStartSync->SetFocus();
+    if (m_buttonStartSync->IsShownOnScreen()) m_buttonStartSync->SetFocus();
 
     //hide sort direction indicator on GUI grids
     m_gridLeft  ->setSortMarker(CustomGrid::SortMarker(-1, CustomGrid::ASCENDING));
@@ -3184,8 +3325,8 @@ void MainDialog::OnCompare(wxCommandEvent& event)
     m_gridRight-> ClearSelection();
 
     //add to folder history after successful comparison only
-    addLeftFolderToHistory( m_directoryLeft->GetValue());
-    addRightFolderToHistory(m_directoryRight->GetValue());
+    folderHistoryLeft ->addItem(toZ(m_directoryLeft->GetValue()));
+    folderHistoryRight->addItem(toZ(m_directoryRight->GetValue()));
 
     //refresh grid in ANY case! (also on abort)
     updateGuiGrid();
@@ -3249,10 +3390,8 @@ void MainDialog::OnSwitchView(wxCommandEvent& event)
 
 void MainDialog::OnSyncSettings(wxCommandEvent& event)
 {
-    if (showSyncConfigDlg(currentCfg.mainCfg.compareVar,
-                          currentCfg.mainCfg.syncConfiguration,
-                          currentCfg.mainCfg.handleDeletion,
-                          currentCfg.mainCfg.customDeletionDirectory,
+    if (showSyncConfigDlg(currentCfg.mainCfg.cmpConfig.compareVar,
+                          currentCfg.mainCfg.syncCfg,
                           &currentCfg.handleError) == ReturnSyncConfig::BUTTON_OKAY) //optional input parameter
     {
         applySyncConfig();
@@ -3260,31 +3399,34 @@ void MainDialog::OnSyncSettings(wxCommandEvent& event)
 }
 
 
-void MainDialog::applyCompareConfig()
+void MainDialog::applyCompareConfig(bool globalLevel)
 {
     //update compare variant name
-    m_staticTextCmpVariant->SetLabel(wxString(wxT("(")) + getVariantName(currentCfg.mainCfg.compareVar) + wxT(")"));
+    m_staticTextCmpVariant->SetLabel(wxString(wxT("(")) + getConfig().mainCfg.getCompVariantName() + wxT(")"));
     m_panelTopButtons->Layout(); //adapt layout for variant text
 
-    //disable the sync button
-    syncPreview->enableSynchronization(false);
+    if (globalLevel)
+    {
+        //disable the sync button
+        syncPreview->enableSynchronization(false);
 
-    //clear grids
-    gridDataView->clearAllRows();
-    updateGuiGrid();
+        //clear grids
+        gridDataView->clearAllRows();
+        updateGuiGrid();
 
-    //convenience: change sync view
-    switch (currentCfg.mainCfg.compareVar)
-    {
-        case CMP_BY_TIME_SIZE:
-            syncPreview->enablePreview(true);
-            break;
-        case CMP_BY_CONTENT:
-            syncPreview->enablePreview(false);
-            break;
-    }
+        //convenience: change sync view
+        switch (currentCfg.mainCfg.cmpConfig.compareVar)
+        {
+            case CMP_BY_TIME_SIZE:
+                syncPreview->enablePreview(true);
+                break;
+            case CMP_BY_CONTENT:
+                syncPreview->enablePreview(false);
+                break;
+        }
 
-    m_buttonCompare->SetFocus();
+        if (m_buttonCompare->IsShownOnScreen()) m_buttonCompare->SetFocus();
+    }
 }
 
 
@@ -3294,17 +3436,13 @@ void MainDialog::OnCmpSettings(wxCommandEvent& event)
     //wxPoint windowPos = m_bpButtonCmpConfig->GetScreenPosition();
     //windowPos.x += m_bpButtonCmpConfig->GetSize().GetWidth() + 5;
 
-    CompareVariant  compareVarNew    = currentCfg.mainCfg.compareVar;
-    SymLinkHandling handleSymlinkNew = currentCfg.mainCfg.handleSymlinks;
+    CompConfig cmpConfigNew = currentCfg.mainCfg.cmpConfig;
 
-    if (zen::showCompareCfgDialog(compareVarNew,
-                                  handleSymlinkNew) == ReturnSmallDlg::BUTTON_OKAY &&
+    if (zen::showCompareCfgDialog(cmpConfigNew) == ReturnSmallDlg::BUTTON_OKAY &&
         //check if settings were changed at all
-        (compareVarNew    != currentCfg.mainCfg.compareVar ||
-         handleSymlinkNew != currentCfg.mainCfg.handleSymlinks))
+        cmpConfigNew != currentCfg.mainCfg.cmpConfig)
     {
-        currentCfg.mainCfg.compareVar     = compareVarNew;
-        currentCfg.mainCfg.handleSymlinks = handleSymlinkNew;
+        currentCfg.mainCfg.cmpConfig = cmpConfigNew;
 
         applyCompareConfig();
     }
@@ -3355,20 +3493,20 @@ void MainDialog::OnStartSync(wxCommandEvent& event)
 
         //GUI mode: place directory locks on directories isolated(!) during both comparison and synchronization
         LockHolder dummy2;
-        for (FolderComparison::const_iterator i = dataToSync.begin(); i != dataToSync.end(); ++i)
+
+        for (auto i = begin(dataToSync); i != end(dataToSync); ++i)
         {
-            dummy2.addDir(i->getBaseDir<LEFT_SIDE >(), statusHandler);
-            dummy2.addDir(i->getBaseDir<RIGHT_SIDE>(), statusHandler);
+            dummy2.addDir(i->getBaseDirPf<LEFT_SIDE >(), statusHandler);
+            dummy2.addDir(i->getBaseDirPf<RIGHT_SIDE>(), statusHandler);
         }
 
         //start synchronization and mark all elements processed
-        zen::SyncProcess synchronization(
-            globalSettings->optDialogs,
-            globalSettings->verifyFileCopy,
-            globalSettings->copyLockedFiles,
-            globalSettings->copyFilePermissions,
-			globalSettings->transactionalFileCopy,
-            statusHandler);
+        zen::SyncProcess syncProc(globalSettings->optDialogs,
+                                  globalSettings->verifyFileCopy,
+                                  globalSettings->copyLockedFiles,
+                                  globalSettings->copyFilePermissions,
+                                  globalSettings->transactionalFileCopy,
+                                  statusHandler);
 
         const std::vector<zen::FolderPairSyncCfg> syncProcessCfg = zen::extractSyncCfg(getConfig().mainCfg);
 
@@ -3376,7 +3514,7 @@ void MainDialog::OnStartSync(wxCommandEvent& event)
         if (syncProcessCfg.size() != dataToSync.size())
             throw std::logic_error("Programming Error: Contract violation!"); //should never happen: sync button is deactivated if they are not in sync
 
-        synchronization.startSynchronizationProcess(syncProcessCfg, dataToSync);
+        syncProc.startSynchronizationProcess(syncProcessCfg, dataToSync);
 
         //play (optional) sound notification after sync has completed (GUI and batch mode)
         const wxString soundFile = zen::getResourceDir() + wxT("Sync_Complete.wav");
@@ -3567,6 +3705,7 @@ void MainDialog::OnSwapSides(wxCommandEvent& event)
     //swap directory names: first pair
     firstFolderPair->setValues(firstFolderPair->getRightDir(), // swap directories
                                firstFolderPair->getLeftDir(),  //
+                               firstFolderPair->getAltCompConfig(),
                                firstFolderPair->getAltSyncConfig(),
                                firstFolderPair->getAltFilterConfig());
 
@@ -3576,6 +3715,7 @@ void MainDialog::OnSwapSides(wxCommandEvent& event)
         DirectoryPair* dirPair = *i;
         dirPair->setValues(dirPair->getRightDir(), // swap directories
                            dirPair->getLeftDir(),  //
+                           dirPair->getAltCompConfig(),
                            dirPair->getAltSyncConfig(),
                            dirPair->getAltFilterConfig());
     }
@@ -3797,31 +3937,6 @@ void MainDialog::updateGridViewData()
 }
 
 
-void MainDialog::OnAddFolderPair(wxCommandEvent& event)
-{
-    wxWindowUpdateLocker dummy(this); //avoid display distortion
-
-    std::vector<FolderPairEnh> newPairs;
-    newPairs.push_back(getConfig().mainCfg.firstPair);
-
-    addFolderPair(newPairs, true); //add pair in front of additonal pairs
-
-    //clear first pair
-    const FolderPairEnh cfgEmpty;
-    firstFolderPair->setValues(toWx(cfgEmpty.leftDirectory),
-                               toWx(cfgEmpty.rightDirectory),
-                               cfgEmpty.altSyncConfig,
-                               cfgEmpty.localFilter);
-
-    //disable the sync button
-    syncPreview->enableSynchronization(false);
-
-    //clear grids
-    gridDataView->clearAllRows();
-    applySyncConfig(); //mainly to update sync dir description text
-}
-
-
 void MainDialog::updateFilterConfig()
 {
     applyFiltering(gridDataView->getDataTentative(), getConfig().mainCfg);
@@ -3864,6 +3979,26 @@ void MainDialog::applySyncConfig()
 }
 
 
+void MainDialog::OnAddFolderPair(wxCommandEvent& event)
+{
+    wxWindowUpdateLocker dummy(this); //avoid display distortion
+
+    std::vector<FolderPairEnh> newPairs;
+    newPairs.push_back(getConfig().mainCfg.firstPair);
+
+    //clear first pair
+    const FolderPairEnh cfgEmpty;
+    firstFolderPair->setValues(toWx(cfgEmpty.leftDirectory),
+                               toWx(cfgEmpty.rightDirectory),
+                               cfgEmpty.altCmpConfig,
+                               cfgEmpty.altSyncConfig,
+                               cfgEmpty.localFilter);
+
+    //keep sequence to update GUI as last step
+    addFolderPair(newPairs, true); //add pair in front of additonal pairs
+}
+
+
 void MainDialog::OnRemoveTopFolderPair(wxCommandEvent& event)
 {
     if (additionalFolderPairs.size() > 0)
@@ -3876,18 +4011,11 @@ void MainDialog::OnRemoveTopFolderPair(wxCommandEvent& event)
         //reset first pair
         firstFolderPair->setValues(toWx(cfgSecond.leftDirectory),
                                    toWx(cfgSecond.rightDirectory),
+                                   cfgSecond.altCmpConfig,
                                    cfgSecond.altSyncConfig,
                                    cfgSecond.localFilter);
 
         removeAddFolderPair(0); //remove second folder pair (first of additional folder pairs)
-
-        //------------------------------------------------------------------
-        //disable the sync button
-        syncPreview->enableSynchronization(false);
-
-        //clear grids
-        gridDataView->clearAllRows();
-        applySyncConfig(); //mainly to update sync dir description text
     }
 }
 
@@ -3901,14 +4029,6 @@ void MainDialog::OnRemoveFolderPair(wxCommandEvent& event)
         if (eventObj == (*i)->m_bpButtonRemovePair)
         {
             removeAddFolderPair(i - additionalFolderPairs.begin());
-
-            //------------------------------------------------------------------
-            //disable the sync button
-            syncPreview->enableSynchronization(false);
-
-            //clear grids
-            gridDataView->clearAllRows();
-            applySyncConfig(); //mainly to update sync dir description text
             return;
         }
 }
@@ -3921,24 +4041,27 @@ void MainDialog::updateGuiForFolderPair()
         m_bpButtonRemovePair->Hide();
     else
         m_bpButtonRemovePair->Show();
-    m_panelTopRight->Layout();
+    m_panelTopLeft->Layout();
 
     //adapt local filter and sync cfg for first folder pair
     if (additionalFolderPairs.size() == 0 &&
+        firstFolderPair->getAltCompConfig().get() == NULL &&
         firstFolderPair->getAltSyncConfig().get() == NULL &&
         isNullFilter(firstFolderPair->getAltFilterConfig()))
     {
+        m_bpButtonAltCompCfg ->Hide();
+        m_bpButtonAltSyncCfg ->Hide();
         m_bpButtonLocalFilter->Hide();
-        m_bpButtonAltSyncCfg->Hide();
 
-        setBitmapLabel(*m_bpButtonSwapSides, GlobalResources::instance().getImage(wxT("swap")));
+        setBitmapLabel(*m_bpButtonSwapSides, GlobalResources::getImage(wxT("swap")));
     }
     else
     {
+        m_bpButtonAltCompCfg ->Show();
+        m_bpButtonAltSyncCfg ->Show();
         m_bpButtonLocalFilter->Show();
-        m_bpButtonAltSyncCfg->Show();
 
-        setBitmapLabel(*m_bpButtonSwapSides, GlobalResources::instance().getImage(wxT("swapSlim")));
+        setBitmapLabel(*m_bpButtonSwapSides, GlobalResources::getImage(wxT("swapSlim")));
     }
     m_panelTopMiddle->Layout();
 
@@ -3988,6 +4111,10 @@ void MainDialog::addFolderPair(const std::vector<FolderPairEnh>& newPairs, bool
             //add new folder pair
             DirectoryPair* newPair = new DirectoryPair(m_scrolledWindowFolderPairs, *this);
 
+            //init dropdown history
+            newPair->m_directoryLeft ->init(folderHistoryLeft);
+            newPair->m_directoryRight->init(folderHistoryRight);
+
             //set width of left folder panel
             const int width = m_panelTopLeft->GetSize().GetWidth();
             newPair->m_panelLeft->SetMinSize(wxSize(width, -1));
@@ -4010,6 +4137,7 @@ void MainDialog::addFolderPair(const std::vector<FolderPairEnh>& newPairs, bool
             //set alternate configuration
             newPair->setValues(toWx(i->leftDirectory),
                                toWx(i->rightDirectory),
+                               i->altCmpConfig,
                                i->altSyncConfig,
                                i->localFilter);
         }
@@ -4024,6 +4152,14 @@ void MainDialog::addFolderPair(const std::vector<FolderPairEnh>& newPairs, bool
     }
 
     updateGuiForFolderPair();
+
+    //disable the sync button
+    syncPreview->enableSynchronization(false);
+
+    //clear grids
+    gridDataView->clearAllRows();
+    applySyncConfig(); //mainly to update sync dir description text
+    applyCompareConfig(false); //false: not global level
 }
 
 
@@ -4039,7 +4175,7 @@ void MainDialog::removeAddFolderPair(size_t pos)
         //const int pairHeight = pairToDelete->GetSize().GetHeight();
 
         bSizerAddFolderPairs->Detach(pairToDelete); //Remove() does not work on Window*, so do it manually
-        pairToDelete->Destroy();                 //
+        pairToDelete->Destroy();                    //
         additionalFolderPairs.erase(additionalFolderPairs.begin() + pos); //remove element from vector
 
         //set size of scrolled window
@@ -4054,6 +4190,15 @@ void MainDialog::removeAddFolderPair(size_t pos)
     }
 
     updateGuiForFolderPair();
+
+    //------------------------------------------------------------------
+    //disable the sync button
+    syncPreview->enableSynchronization(false);
+
+    //clear grids
+    gridDataView->clearAllRows();
+    applySyncConfig(); //mainly to update sync dir description text
+    applyCompareConfig(false); //false: not global level
 }
 
 
@@ -4210,9 +4355,11 @@ void MainDialog::OnMenuBatchJob(wxCommandEvent& event)
     //fill batch config structure
     const xmlAccess::XmlGuiConfig currCfg = getConfig(); //get UP TO DATE config, with updated values for main and additional folders!
 
-    const xmlAccess::XmlBatchConfig batchCfg = convertGuiToBatch(currCfg);
+    const wxString referenceFile = activeConfigFiles.size() == 1 && activeConfigFiles[0] != lastRunConfigName() ? activeConfigFiles[0] : wxString();
+
+    const xmlAccess::XmlBatchConfig batchCfg = convertGuiToBatch(currCfg, referenceFile);
 
-    if (showSyncBatchDlg(batchCfg) == ReturnBatchConfig::BATCH_FILE_SAVED)
+    if (showSyncBatchDlg(referenceFile, batchCfg, folderHistoryLeft, folderHistoryRight) == ReturnBatchConfig::BATCH_FILE_SAVED)
         pushStatusInformation(_("Batch file created successfully!"));
 }
 
@@ -4240,8 +4387,8 @@ void MainDialog::OnLayoutWindowAsync(wxIdleEvent& event)
     wxWindowUpdateLocker dummy(this); //avoid display distortion
 
     //adjust folder pair distortion on startup
-    for (std::vector<DirectoryPair*>::iterator i = additionalFolderPairs.begin(); i != additionalFolderPairs.end(); ++i)
-        (*i)->Layout();
+    std::for_each(additionalFolderPairs.begin(), additionalFolderPairs.end(),
+    [](DirectoryPair* dirPair) { dirPair->Layout(); });
 
     m_panelTopButtons->Layout();
     Layout(); //strangely this layout call works if called in next idle event only
@@ -4327,12 +4474,12 @@ void MainDialog::SyncPreview::enableSynchronization(bool value)
     if (value)
     {
         mainDlg_->m_buttonStartSync->SetForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNTEXT));
-        mainDlg_->m_buttonStartSync->setBitmapFront(GlobalResources::instance().getImage(wxT("sync")));
+        mainDlg_->m_buttonStartSync->setBitmapFront(GlobalResources::getImage(wxT("sync")));
     }
     else
     {
         mainDlg_->m_buttonStartSync->SetForegroundColour(wxColor(128, 128, 128)); //Some colors seem to have problems with 16Bit color depth, well this one hasn't!
-        mainDlg_->m_buttonStartSync->setBitmapFront(GlobalResources::instance().getImage(wxT("syncDisabled")));
+        mainDlg_->m_buttonStartSync->setBitmapFront(GlobalResources::getImage(wxT("syncDisabled")));
     }
 }
 
diff --git a/ui/main_dlg.h b/ui/main_dlg.h
index 44d7ef62..2179cdf5 100644
--- a/ui/main_dlg.h
+++ b/ui/main_dlg.h
@@ -16,6 +16,7 @@
 #include <wx/aui/aui.h>
 #include "../shared/int64.h"
 
+class FolderHistory;
 class CustomGrid;
 class FFSCheckRowsEvent;
 class FFSSyncDirectionEvent;
@@ -94,9 +95,6 @@ private:
 
     void addFileToCfgHistory(const std::vector<wxString>& filenames);
 
-    void addLeftFolderToHistory(const wxString& leftFolder);
-    void addRightFolderToHistory(const wxString& rightFolder);
-
     void addFolderPair(const std::vector<zen::FolderPairEnh>& newPairs, bool addFront = false);
     void removeAddFolderPair(size_t pos);
     void clearAddFolderPairs();
@@ -129,7 +127,6 @@ private:
     void onGridLeftButtonEvent(        wxKeyEvent& event);
     void onGridRightButtonEvent(       wxKeyEvent& event);
     void onGridMiddleButtonEvent(      wxKeyEvent& event);
-    void OnContextRim(                 wxGridEvent& event);
     void OnContextRimLabelLeft(        wxGridEvent& event);
     void OnContextRimLabelRight(       wxGridEvent& event);
     void OnContextMiddle(              wxGridEvent& event);
@@ -140,7 +137,7 @@ private:
     void OnContextSelectCompVariant(      wxMouseEvent& event);
     void OnContextSelectSyncVariant(      wxMouseEvent& event);
 
-    void applyCompareConfig();
+    void applyCompareConfig(bool globalLevel = true);
 
     void OnSetCompVariant(wxCommandEvent& event);
     void OnSetSyncVariant(wxCommandEvent& event);
@@ -156,8 +153,10 @@ private:
     void OnContextSyncDirRight      (wxCommandEvent& event);
     void OnContextCustColumnLeft    (wxCommandEvent& event);
     void OnContextCustColumnRight   (wxCommandEvent& event);
+    void OnContextSelectTimeSpan    (wxCommandEvent& event);
     void OnContextAutoAdjustLeft    (wxCommandEvent& event);
     void OnContextAutoAdjustRight   (wxCommandEvent& event);
+    void OnContextSetIconSize    (wxCommandEvent& event);
     void OnContextIncludeAll        (wxCommandEvent& event);
     void OnContextExcludeAll        (wxCommandEvent& event);
     void OnContextComparisonView    (wxCommandEvent& event);
@@ -165,6 +164,7 @@ private:
     void OnContextSetLayoutReset    (wxCommandEvent& event);
     void OnContextSetLayoutShowPanel(wxCommandEvent& event);
 
+    void OnContextRim(wxGridEvent& event);
     void OnDirSelected(wxFileDirPickerEvent& event);
 
     void OnCheckRows(FFSCheckRowsEvent& event);
@@ -309,6 +309,11 @@ private:
     wxAuiManager auiMgr; //implement dockable GUI design
 
     wxString defaultPerspective;
+
+    zen::Int64 manualTimeSpanFrom, manualTimeSpanTo; //buffer manual time span selection at session level
+
+    std::shared_ptr<FolderHistory> folderHistoryLeft;  //shared by all wxComboBox dropdown controls
+    std::shared_ptr<FolderHistory> folderHistoryRight; //always bound!
 };
 
 #endif // MAINDIALOG_H
diff --git a/ui/msg_popup.cpp b/ui/msg_popup.cpp
index 900ab683..9e0e0111 100644
--- a/ui/msg_popup.cpp
+++ b/ui/msg_popup.cpp
@@ -36,7 +36,7 @@ ErrorDlg::ErrorDlg(wxWindow* parentWindow, const int activeButtons, const wxStri
     new zen::MouseMoveWindow(*this); //allow moving main dialog by clicking (nearly) anywhere...; ownership passed to "this"
 #endif
 
-    m_bitmap10->SetBitmap(GlobalResources::instance().getImage(wxT("error")));
+    m_bitmap10->SetBitmap(GlobalResources::getImage(wxT("error")));
     m_textCtrl8->SetValue(messageText);
     m_checkBoxIgnoreErrors->SetValue(ignoreNextErrors);
 
@@ -120,7 +120,7 @@ WarningDlg::WarningDlg(wxWindow* parentWindow,  int activeButtons, const wxStrin
     new zen::MouseMoveWindow(*this); //allow moving main dialog by clicking (nearly) anywhere...; ownership passed to "this"
 #endif
 
-    m_bitmap10->SetBitmap(GlobalResources::instance().getImage(wxT("warning")));
+    m_bitmap10->SetBitmap(GlobalResources::getImage(wxT("warning")));
     m_textCtrl8->SetValue(messageText);
     m_checkBoxDontShowAgain->SetValue(dontShowAgain);
 
@@ -190,6 +190,7 @@ private:
     void OnCancel(wxCommandEvent& event);
     void OnYes(wxCommandEvent& event);
     void OnNo(wxCommandEvent& event);
+    void OnCheckBoxDontShowAgain(wxCommandEvent& event);
 
     bool* dontShowAgain; //optional
 };
@@ -203,7 +204,7 @@ QuestionDlg::QuestionDlg(wxWindow* parentWindow, int activeButtons, const wxStri
     new zen::MouseMoveWindow(*this); //allow moving main dialog by clicking (nearly) anywhere...; ownership passed to "this"
 #endif
 
-    m_bitmap10->SetBitmap(GlobalResources::instance().getImage(wxT("question")));
+    m_bitmap10->SetBitmap(GlobalResources::getImage(wxT("question")));
     m_textCtrl8->SetValue(messageText);
     if (dontShowAgain)
         m_checkBoxDontAskAgain->SetValue(*dontShowAgain);
@@ -258,6 +259,12 @@ void QuestionDlg::OnNo(wxCommandEvent& event)
     EndModal(ReturnQuestionDlg::BUTTON_NO);
 }
 
+void QuestionDlg::OnCheckBoxDontShowAgain(wxCommandEvent& event)
+{
+    event.Skip();
+}
+
+
 
 ReturnQuestionDlg::ButtonPressed zen::showQuestionDlg(int activeButtons, const wxString& messageText, bool* dontShowAgain)
 {
diff --git a/ui/progress_indicator.cpp b/ui/progress_indicator.cpp
index 3cf78fbb..7da143a1 100644
--- a/ui/progress_indicator.cpp
+++ b/ui/progress_indicator.cpp
@@ -20,6 +20,7 @@
 #include "../library/error_log.h"
 #include "../shared/toggle_button.h"
 #include "../shared/taskbar.h"
+#include "../shared/image_tools.h"
 
 using namespace zen;
 
@@ -78,13 +79,12 @@ private:
     wxStopWatch timeElapsed;
 
     //gauge variables
-    int            totalObjects;
+    int        totalObjects;
     zen::Int64 totalData;      //each data element represents one byte for proper progress indicator scaling
-    int            currentObjects; //each object represents a file or directory processed
+    int        currentObjects; //each object represents a file or directory processed
     zen::Int64 currentData;
-    double         scalingFactor;  //nr of elements has to be normalized to smaller nr. because of range of int limitation
 
-    void showProgressExternally(const wxString& progressText, float percent = 0);
+    void showProgressExternally(const wxString& progressText, double fraction = 0); //between [0, 1]
 
     enum CurrentStatus
     {
@@ -97,7 +97,7 @@ private:
     std::unique_ptr<util::Taskbar> taskbar_;
 
     //remaining time
-    std::auto_ptr<Statistics> statistics;
+    std::unique_ptr<Statistics> statistics;
     long lastStatCallSpeed;   //used for calculating intervals between statistics update
     long lastStatCallRemTime; //
 };
@@ -161,7 +161,6 @@ CompareStatus::CompareStatusImpl::CompareStatusImpl(wxTopLevelWindow& parentWind
     totalData(0),
     currentObjects(0),
     currentData(0),
-    scalingFactor(0),
     status(SCANNING),
     lastStatCallSpeed(-1000000), //some big number
     lastStatCallRemTime(-1000000)
@@ -202,7 +201,6 @@ void CompareStatus::CompareStatusImpl::init()
     totalData      = 0;
     currentObjects = 0;
     currentData    = 0;
-    scalingFactor  = 0;
 
     statistics.reset();
 
@@ -231,11 +229,6 @@ void CompareStatus::CompareStatusImpl::switchToCompareBytewise(int totalObjectsT
     currentObjects = 0;
     totalObjects   = totalObjectsToProcess;
 
-    if (totalData != 0)
-        scalingFactor = GAUGE_FULL_RANGE / to<double>(totalData); //let's normalize to 50000
-    else
-        scalingFactor = 0;
-
     //set new statistics handler: 10 seconds "window" for remaining time, 5 seconds for speed
     statistics.reset(new Statistics(totalObjectsToProcess, to<double>(totalDataToProcess), windowSizeRemainingTime, windowSizeBytesPerSec));
     lastStatCallSpeed   = -1000000; //some big number
@@ -272,7 +265,7 @@ void CompareStatus::CompareStatusImpl::setStatusText_NoUpdate(const wxString& te
 }
 
 
-void CompareStatus::CompareStatusImpl::showProgressExternally(const wxString& progressText, float percent)
+void CompareStatus::CompareStatusImpl::showProgressExternally(const wxString& progressText, double fraction)
 {
     if (parentWindow_.GetTitle() != progressText)
         parentWindow_.SetTitle(progressText);
@@ -281,20 +274,16 @@ void CompareStatus::CompareStatusImpl::showProgressExternally(const wxString& pr
     using namespace util;
 
     if (taskbar_.get())
-    {
-        const size_t current = 100000 * percent / 100;
-        const size_t total   = 100000;
         switch (status)
         {
             case SCANNING:
                 taskbar_->setStatus(Taskbar::STATUS_INDETERMINATE);
                 break;
             case COMPARING_CONTENT:
+                taskbar_->setProgress(fraction);
                 taskbar_->setStatus(Taskbar::STATUS_NORMAL);
-                taskbar_->setProgress(current, total);
                 break;
         }
-    }
 }
 
 
@@ -305,7 +294,8 @@ void CompareStatus::CompareStatusImpl::updateStatusPanelNow()
     {
         //wxWindowUpdateLocker dummy(this) -> not needed
 
-        const float percent = totalData == 0 ? 0 : to<double>(currentData) * 100.0 / to<double>(totalData);
+        //add both data + obj-count, to handle "deletion-only" cases
+        const double fraction = totalData + totalObjects == 0 ? 0 : to<double>(currentData + currentObjects) / to<double>(totalData + totalObjects);
 
         //write status information to taskbar, parent title ect.
         switch (status)
@@ -314,11 +304,10 @@ void CompareStatus::CompareStatusImpl::updateStatusPanelNow()
                 showProgressExternally(toStringSep(scannedObjects) + wxT(" - ") + _("Scanning..."));
                 break;
             case COMPARING_CONTENT:
-                showProgressExternally(formatPercentage(currentData, totalData) + wxT(" - ") + _("Comparing content..."), percent);
+                showProgressExternally(formatPercentage(fraction) + wxT(" - ") + _("Comparing content..."), fraction);
                 break;
         }
 
-
         bool updateLayout = false; //avoid screen flicker by calling layout() only if necessary
 
         //remove linebreaks from currentStatusText
@@ -333,7 +322,7 @@ void CompareStatus::CompareStatusImpl::updateStatusPanelNow()
         setNewText(toStringSep(scannedObjects), *m_staticTextScanned, updateLayout);
 
         //progress indicator for "compare file content"
-        m_gauge2->SetValue(to<double>(currentData) * scalingFactor);
+        m_gauge2->SetValue(common::round(fraction * GAUGE_FULL_RANGE));
 
         //remaining files left for file comparison
         const wxString filesToCompareTmp = toStringSep(totalObjects - currentObjects);
@@ -376,6 +365,29 @@ void CompareStatus::CompareStatusImpl::updateStatusPanelNow()
 //########################################################################################
 
 
+namespace
+{
+inline
+wxBitmap buttonPressed(const std::string& name)
+{
+    wxBitmap background = GlobalResources::getImage(wxT("log button pressed"));
+    return layOver(GlobalResources::getImage(utf8CvrtTo<wxString>(name)), background);
+}
+
+
+inline
+wxBitmap buttonReleased(const std::string& name)
+{
+    wxImage output = greyScale(GlobalResources::getImage(utf8CvrtTo<wxString>(name))).ConvertToImage();
+    //GlobalResources::getImage(utf8CvrtTo<wxString>(name)).ConvertToImage().ConvertToGreyscale(1.0/3, 1.0/3, 1.0/3); //treat all channels equally!
+    //brighten(output, 30);
+
+    zen::move(output, 0, -1); //move image right one pixel
+    return output;
+}
+}
+
+
 class LogControl : public LogControlGenerated
 {
 public:
@@ -385,14 +397,14 @@ public:
         const int warningCount = log_.typeCount(TYPE_WARNING);
         const int infoCount    = log_.typeCount(TYPE_INFO);
 
-        m_bpButtonErrors->init(GlobalResources::instance().getImage(wxT("log error")),          _("Error") + wxString::Format(wxT(" (%d)"), errorCount),
-                               GlobalResources::instance().getImage(wxT("log error inactive")), _("Error") + wxString::Format(wxT(" (%d)"), errorCount));
+        m_bpButtonErrors->init(buttonPressed ("error"), _("Error") + wxString::Format(wxT(" (%d)"), errorCount),
+                               buttonReleased("error"), _("Error") + wxString::Format(wxT(" (%d)"), errorCount));
 
-        m_bpButtonWarnings->init(GlobalResources::instance().getImage(wxT("log warning")),          _("Warning") + wxString::Format(wxT(" (%d)"), warningCount),
-                                 GlobalResources::instance().getImage(wxT("log warning inactive")), _("Warning") + wxString::Format(wxT(" (%d)"), warningCount));
+        m_bpButtonWarnings->init(buttonPressed ("warning"), _("Warning") + wxString::Format(wxT(" (%d)"), warningCount),
+                                 buttonReleased("warning"), _("Warning") + wxString::Format(wxT(" (%d)"), warningCount));
 
-        m_bpButtonInfo->init(GlobalResources::instance().getImage(wxT("log info")),          _("Info") + wxString::Format(wxT(" (%d)"), infoCount),
-                             GlobalResources::instance().getImage(wxT("log info inactive")), _("Info") + wxString::Format(wxT(" (%d)"), infoCount));
+        m_bpButtonInfo->init(buttonPressed ("info"), _("Info") + wxString::Format(wxT(" (%d)"), infoCount),
+                             buttonReleased("info"), _("Info") + wxString::Format(wxT(" (%d)"), infoCount));
 
         m_bpButtonErrors  ->setActive(true);
         m_bpButtonWarnings->setActive(true);
@@ -496,7 +508,7 @@ private:
     void OnResumeFromTray(wxCommandEvent& event);
 
     bool currentProcessIsRunning();
-    void showProgressExternally(const wxString& progressText, float percent = 0); //percent may already be included in progressText
+    void showProgressExternally(const wxString& progressText, double fraction = 0); //between [0, 1]
 
     const wxString jobName_;
     wxStopWatch timeElapsed;
@@ -509,7 +521,6 @@ private:
     zen::Int64 totalData;
     int        currentObjects; //each object represents a file or directory processed
     zen::Int64 currentData;    //each data element represents one byte for proper progress indicator scaling
-    double     scalingFactor;  //nr of elements has to be normalized to smaller nr. because of range of int limitation
 
     //status variables
     size_t scannedObjects;
@@ -618,7 +629,6 @@ SyncStatus::SyncStatusImpl::SyncStatusImpl(AbortCallback& abortCb,
     totalData(0),
     currentObjects(0),
     currentData(0),
-    scalingFactor(0),
     scannedObjects(0),
     processPaused(false),
     currentStatus(SyncStatus::ABORTED),
@@ -719,11 +729,6 @@ void SyncStatus::SyncStatusImpl::resetGauge(int totalObjectsToProcess, zen::Int6
     currentObjects = 0;
     totalObjects   = totalObjectsToProcess;
 
-    if (totalData != 0)
-        scalingFactor = GAUGE_FULL_RANGE / to<double>(totalData); //let's normalize to 50000
-    else
-        scalingFactor = 0;
-
     //set new statistics handler: 10 seconds "window" for remaining time, 5 seconds for speed
     statistics.reset(new Statistics(totalObjectsToProcess, to<double>(totalDataToProcess), windowSizeRemainingTime, windowSizeBytesPerSec));
 
@@ -757,11 +762,11 @@ void SyncStatus::SyncStatusImpl::setStatusText_NoUpdate(const wxString& text)
 }
 
 
-void SyncStatus::SyncStatusImpl::showProgressExternally(const wxString& progressText, float percent)
+void SyncStatus::SyncStatusImpl::showProgressExternally(const wxString& progressText, double fraction)
 {
     //write status information to systray, if window is minimized
     if (trayIcon.get())
-        trayIcon->setToolTip(progressText, percent);
+        trayIcon->setToolTip2(progressText, fraction);
 
     wxString progressTextFmt = progressText;
     progressTextFmt.Replace(wxT("\n"), wxT(" - "));
@@ -777,15 +782,11 @@ void SyncStatus::SyncStatusImpl::showProgressExternally(const wxString& progress
             this->SetTitle(progressTextFmt);
     }
 
-
     using namespace util;
 
     //show progress on Windows 7 taskbar
     if (taskbar_.get())
     {
-        const size_t current = 100000 * percent / 100;
-        const size_t total   = 100000;
-
         switch (currentStatus)
         {
             case SyncStatus::SCANNING:
@@ -794,29 +795,58 @@ void SyncStatus::SyncStatusImpl::showProgressExternally(const wxString& progress
             case SyncStatus::FINISHED_WITH_SUCCESS:
             case SyncStatus::COMPARING_CONTENT:
             case SyncStatus::SYNCHRONIZING:
+                taskbar_->setProgress(fraction);
                 taskbar_->setStatus(Taskbar::STATUS_NORMAL);
-                taskbar_->setProgress(current, total);
                 break;
             case SyncStatus::PAUSE:
+                taskbar_->setProgress(fraction);
                 taskbar_->setStatus(Taskbar::STATUS_PAUSED);
-                taskbar_->setProgress(current, total);
                 break;
             case SyncStatus::ABORTED:
             case SyncStatus::FINISHED_WITH_ERROR:
+                taskbar_->setProgress(fraction);
                 taskbar_->setStatus(Taskbar::STATUS_ERROR);
-                taskbar_->setProgress(current, total);
                 break;
         }
     }
 }
 
+#ifdef FFS_WIN
+namespace
+{
+enum Zorder
+{
+    ZORDER_CORRECT,
+    ZORDER_WRONG,
+    ZORDER_INDEFIINTE,
+};
+
+Zorder validateZorder(const wxWindow& top, const wxWindow& bottom)
+{
+    HWND hTop    = static_cast<HWND>(top.GetHWND());
+    HWND hBottom = static_cast<HWND>(bottom.GetHWND());
+    assert(hTop && hBottom);
+
+    for (HWND hAbove = hBottom; hAbove; hAbove = ::GetNextWindow(hAbove, GW_HWNDPREV)) //GW_HWNDPREV means "to foreground"
+        if (hAbove == hTop)
+            return ZORDER_CORRECT;
+
+    for (HWND hAbove = ::GetNextWindow(hTop, GW_HWNDPREV); hAbove; hAbove = ::GetNextWindow(hAbove, GW_HWNDPREV))
+        if (hAbove == hBottom)
+            return ZORDER_WRONG;
+
+    return ZORDER_INDEFIINTE;
+}
+}
+#endif
 
 void SyncStatus::SyncStatusImpl::updateStatusDialogNow(bool allowYield)
 {
     //static RetrieveStatistics statistic;
     //statistic.writeEntry(currentData.ToDouble(), currentObjects);
 
-    const float percent = totalData == 0 ? 100.0 : to<double>(currentData) * 100.0 / to<double>(totalData);
+    //add both data + obj-count, to handle "deletion-only" cases
+    const double fraction = totalData + totalObjects == 0 ? 1 : to<double>(currentData + currentObjects) / to<double>(totalData + totalObjects);
 
     //write status information to systray, taskbar, parent title ect.
 
@@ -827,20 +857,20 @@ void SyncStatus::SyncStatusImpl::updateStatusDialogNow(bool allowYield)
             showProgressExternally(toStringSep(scannedObjects) + wxT(" - ") + _("Scanning...") + postFix);
             break;
         case SyncStatus::COMPARING_CONTENT:
-            showProgressExternally(formatPercentage(currentData, totalData) + wxT(" - ") + _("Comparing content...") + postFix, percent);
+            showProgressExternally(formatPercentage(fraction) + wxT(" - ") + _("Comparing content...") + postFix, fraction);
             break;
         case SyncStatus::SYNCHRONIZING:
-            showProgressExternally(formatPercentage(currentData, totalData) + wxT(" - ") + _("Synchronizing...") + postFix, percent);
+            showProgressExternally(formatPercentage(fraction) + wxT(" - ") + _("Synchronizing...") + postFix, fraction);
             break;
         case SyncStatus::PAUSE:
-            showProgressExternally((totalData != 0 ? formatPercentage(currentData, totalData) + wxT(" - ") : wxString()) + _("Paused") + postFix, percent);
+            showProgressExternally(formatPercentage(fraction) + wxT(" - ") + _("Paused") + postFix, fraction);
             break;
         case SyncStatus::ABORTED:
-            showProgressExternally(_("Aborted") + postFix, percent);
+            showProgressExternally(_("Aborted") + postFix, fraction);
             break;
         case SyncStatus::FINISHED_WITH_SUCCESS:
         case SyncStatus::FINISHED_WITH_ERROR:
-            showProgressExternally(_("Completed") + postFix, percent);
+            showProgressExternally(_("Completed") + postFix, fraction);
             break;
     }
 
@@ -861,8 +891,7 @@ void SyncStatus::SyncStatusImpl::updateStatusDialogNow(bool allowYield)
             case SyncStatus::FINISHED_WITH_SUCCESS:
             case SyncStatus::FINISHED_WITH_ERROR:
             case SyncStatus::ABORTED:
-                m_gauge1->SetValue(totalData == 0 ? GAUGE_FULL_RANGE :
-                                   common::round(to<double>(currentData) * scalingFactor));
+                m_gauge1->SetValue(common::round(fraction * GAUGE_FULL_RANGE));
                 break;
             case SyncStatus::PAUSE: //no change to gauge: don't switch between indeterminate/determinate modus
                 break;
@@ -912,10 +941,25 @@ void SyncStatus::SyncStatusImpl::updateStatusDialogNow(bool allowYield)
         }
     }
 
+#ifdef FFS_WIN
+    //workaround Windows 7 bug messing up z-order after temporary application hangs: https://sourceforge.net/tracker/index.php?func=detail&aid=3376523&group_id=234430&atid=1093080
+    if (mainDialog)
+        if (validateZorder(*this, *mainDialog) == ZORDER_WRONG)
+        {
+            HWND hProgress = static_cast<HWND>(GetHWND());
+
+            if (::IsWindowVisible(hProgress))
+            {
+                ::ShowWindow(hProgress, SW_HIDE); //make Windows recalculate z-order
+                ::ShowWindow(hProgress, SW_SHOW); //
+            }
+        }
+#endif
+
     if (allowYield)
     {
         //support for pause button
-        if(processPaused)
+        if (processPaused)
         {
             if (statistics.get()) statistics->pauseTimer();
 
@@ -949,37 +993,37 @@ void SyncStatus::SyncStatusImpl::setCurrentStatus(SyncStatus::SyncStatusID id)
     switch (id)
     {
         case SyncStatus::ABORTED:
-            m_bitmapStatus->SetBitmap(GlobalResources::instance().getImage(wxT("statusError")));
+            m_bitmapStatus->SetBitmap(GlobalResources::getImage(wxT("statusError")));
             m_staticTextStatus->SetLabel(_("Aborted"));
             break;
 
         case SyncStatus::FINISHED_WITH_SUCCESS:
-            m_bitmapStatus->SetBitmap(GlobalResources::instance().getImage(wxT("statusSuccess")));
+            m_bitmapStatus->SetBitmap(GlobalResources::getImage(wxT("statusSuccess")));
             m_staticTextStatus->SetLabel(_("Completed"));
             break;
 
         case SyncStatus::FINISHED_WITH_ERROR:
-            m_bitmapStatus->SetBitmap(GlobalResources::instance().getImage(wxT("statusWarning")));
+            m_bitmapStatus->SetBitmap(GlobalResources::getImage(wxT("statusWarning")));
             m_staticTextStatus->SetLabel(_("Completed"));
             break;
 
         case SyncStatus::PAUSE:
-            m_bitmapStatus->SetBitmap(GlobalResources::instance().getImage(wxT("statusPause")));
+            m_bitmapStatus->SetBitmap(GlobalResources::getImage(wxT("statusPause")));
             m_staticTextStatus->SetLabel(_("Paused"));
             break;
 
         case SyncStatus::SCANNING:
-            m_bitmapStatus->SetBitmap(GlobalResources::instance().getImage(wxT("statusScanning")));
+            m_bitmapStatus->SetBitmap(GlobalResources::getImage(wxT("statusScanning")));
             m_staticTextStatus->SetLabel(_("Scanning..."));
             break;
 
         case SyncStatus::COMPARING_CONTENT:
-            m_bitmapStatus->SetBitmap(GlobalResources::instance().getImage(wxT("statusBinaryCompare")));
+            m_bitmapStatus->SetBitmap(GlobalResources::getImage(wxT("statusBinaryCompare")));
             m_staticTextStatus->SetLabel(_("Comparing content..."));
             break;
 
         case SyncStatus::SYNCHRONIZING:
-            m_bitmapStatus->SetBitmap(GlobalResources::instance().getImage(wxT("statusSyncing")));
+            m_bitmapStatus->SetBitmap(GlobalResources::getImage(wxT("statusSyncing")));
             m_staticTextStatus->SetLabel(_("Synchronizing..."));
             break;
     }
diff --git a/ui/small_dlgs.cpp b/ui/small_dlgs.cpp
index 137b4028..f57f8324 100644
--- a/ui/small_dlgs.cpp
+++ b/ui/small_dlgs.cpp
@@ -21,6 +21,9 @@
 #include <wx/wupdlock.h>
 #include <wx/msgdlg.h>
 #include "../shared/mouse_move_dlg.h"
+#include "../shared/help_provider.h"
+#include "../shared/image_tools.h"
+#include "../shared/stl_tools.h"
 
 using namespace zen;
 
@@ -38,18 +41,18 @@ private:
 
 AboutDlg::AboutDlg(wxWindow* parent) : AboutDlgGenerated(parent)
 {
-    m_bitmap9->SetBitmap(GlobalResources::instance().getImage(wxT("website")));
-    m_bitmap10->SetBitmap(GlobalResources::instance().getImage(wxT("email")));
-    m_bitmap11->SetBitmap(GlobalResources::instance().getImage(wxT("logo")));
-    m_bitmap13->SetBitmap(GlobalResources::instance().getImage(wxT("gpl")));
-    m_bitmapTransl->SetBitmap(GlobalResources::instance().getImage(wxT("translation")));
+    m_bitmap9->SetBitmap(GlobalResources::getImage(wxT("website")));
+    m_bitmap10->SetBitmap(GlobalResources::getImage(wxT("email")));
+    m_bitmap11->SetBitmap(GlobalResources::getImage(wxT("logo")));
+    m_bitmap13->SetBitmap(GlobalResources::getImage(wxT("gpl")));
+    m_bitmapTransl->SetBitmap(GlobalResources::getImage(wxT("translation")));
 
     //create language credits
     for (std::vector<ExistingTranslations::Entry>::const_iterator i = ExistingTranslations::get().begin(); i != ExistingTranslations::get().end(); ++i)
     {
         //flag
-        wxStaticBitmap* staticBitmapFlag = new wxStaticBitmap(m_scrolledWindowTranslators, wxID_ANY, GlobalResources::instance().getImage(i->languageFlag), wxDefaultPosition, wxSize(-1,11), 0 );
-        fgSizerTranslators->Add(staticBitmapFlag, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+        wxStaticBitmap* staticBitmapFlag = new wxStaticBitmap(m_scrolledWindowTranslators, wxID_ANY, GlobalResources::getImage(i->languageFlag), wxDefaultPosition, wxSize(-1, 11), 0 );
+        fgSizerTranslators->Add(staticBitmapFlag, 0, wxALIGN_CENTER_VERTICAL | wxALIGN_CENTER_HORIZONTAL, 5 );
 
         //language name
         wxStaticText* staticTextLanguage = new wxStaticText(m_scrolledWindowTranslators, wxID_ANY, i->languageName, wxDefaultPosition, wxDefaultSize, 0 );
@@ -117,81 +120,6 @@ void zen::showAboutDialog()
 //########################################################################################
 
 
-class HelpDlg : public HelpDlgGenerated
-{
-public:
-    HelpDlg(wxWindow* parent);
-
-private:
-    void OnClose(wxCloseEvent& event);
-    void OnOK(wxCommandEvent& event);
-};
-
-
-HelpDlg::HelpDlg(wxWindow* parent) : HelpDlgGenerated(parent)
-{
-#ifdef FFS_WIN
-    new zen::MouseMoveWindow(*this); //allow moving main dialog by clicking (nearly) anywhere...; ownership passed to "this"
-#endif
-
-    m_notebook1->SetFocus();
-
-    m_bitmap25->SetBitmap(GlobalResources::instance().getImage(wxT("help")));
-
-    //populate decision trees: "compare by date"
-    wxTreeItemId treeRoot      = m_treeCtrl1->AddRoot(_("DECISION TREE"));
-    wxTreeItemId treeBothSides = m_treeCtrl1->AppendItem(treeRoot, _("file exists on both sides"));
-    wxTreeItemId treeOneSide   = m_treeCtrl1->AppendItem(treeRoot, _("on one side only"));
-
-    m_treeCtrl1->AppendItem(treeOneSide, _("- exists left only"));
-    m_treeCtrl1->AppendItem(treeOneSide, _("- exists right only"));
-
-    wxTreeItemId treeSameDate = m_treeCtrl1->AppendItem(treeBothSides, _("same date"));
-    m_treeCtrl1->AppendItem(treeSameDate, _("- equal"));
-    m_treeCtrl1->AppendItem(treeSameDate, _("- conflict (same date, different size)"));
-
-
-    wxTreeItemId treeDifferentDate = m_treeCtrl1->AppendItem(treeBothSides, _("different date"));
-    m_treeCtrl1->AppendItem(treeDifferentDate, _("- left newer"));
-    m_treeCtrl1->AppendItem(treeDifferentDate, _("- right newer"));
-
-    m_treeCtrl1->ExpandAll();
-
-    //populate decision trees: "compare by content"
-    wxTreeItemId tree2Root      = m_treeCtrl2->AddRoot(_("DECISION TREE"));
-    wxTreeItemId tree2BothSides = m_treeCtrl2->AppendItem(tree2Root, _("file exists on both sides"));
-    wxTreeItemId tree2OneSide   = m_treeCtrl2->AppendItem(tree2Root, _("on one side only"));
-
-    m_treeCtrl2->AppendItem(tree2OneSide, _("- exists left only"));
-    m_treeCtrl2->AppendItem(tree2OneSide, _("- exists right only"));
-
-    m_treeCtrl2->AppendItem(tree2BothSides, _("- equal"));
-    m_treeCtrl2->AppendItem(tree2BothSides, _("- different"));
-
-    m_treeCtrl2->ExpandAll();
-}
-
-
-void HelpDlg::OnClose(wxCloseEvent& event)
-{
-    Destroy();
-}
-
-
-void HelpDlg::OnOK(wxCommandEvent& event)
-{
-    Destroy();
-}
-
-
-void zen::showHelpDialog()
-{
-    HelpDlg helpDlg(NULL);
-    helpDlg.ShowModal();
-}
-//########################################################################################
-
-
 class FilterDlg : public FilterDlgGenerated
 {
 public:
@@ -234,10 +162,11 @@ FilterDlg::FilterDlg(wxWindow* parent,
 
     enumTimeDescr.
     add(UTIME_NONE, _("Inactive")).
-    add(UTIME_SEC,  _("Second")).
-    add(UTIME_MIN,  _("Minute")).
-    add(UTIME_HOUR, _("Hour")).
-    add(UTIME_DAY,  _("Day"));
+    //add(UTIME_LAST_X_HOURS, _("Last x hours")). //better: "Last %x hour" ?
+    add(UTIME_TODAY,        _("Today")).
+    add(UTIME_THIS_WEEK,    _("This week")).
+    add(UTIME_THIS_MONTH,   _("This month")).
+    add(UTIME_THIS_YEAR,    _("This year"));
 
     enumSizeDescr.
     add(USIZE_NONE, _("Inactive")).
@@ -245,8 +174,8 @@ FilterDlg::FilterDlg(wxWindow* parent,
     add(USIZE_KB,   _("KB")).
     add(USIZE_MB,   _("MB"));
 
-    m_bitmap26->SetBitmap(GlobalResources::instance().getImage(wxT("filterOn")));
-    m_bpButtonHelp->SetBitmapLabel(GlobalResources::instance().getImage(wxT("help")));
+    m_bitmap26->SetBitmap(GlobalResources::getImage(wxT("filterOn")));
+    m_bpButtonHelp->SetBitmapLabel(GlobalResources::getImage(wxT("help")));
 
     setFilter(filter);
 
@@ -267,30 +196,30 @@ void FilterDlg::updateGui()
 {
     FilterConfig activeCfg = getFilter();
 
-    if (!NameFilter(activeCfg.includeFilter, FilterConfig().excludeFilter).isNull())
-        m_bitmapInclude->SetBitmap(GlobalResources::instance().getImage(wxT("include")));
-    else
-        m_bitmapInclude->SetBitmap(GlobalResources::instance().getImage(wxT("include_grey")));
-
-    if (!NameFilter(FilterConfig().includeFilter, activeCfg.excludeFilter).isNull())
-        m_bitmapExclude->SetBitmap(GlobalResources::instance().getImage(wxT("exclude")));
-    else
-        m_bitmapExclude->SetBitmap(GlobalResources::instance().getImage(wxT("exclude_grey")));
-
-    if (activeCfg.unitTimeSpan != UTIME_NONE)
-        m_bitmapFilterDate->SetBitmap(GlobalResources::instance().getImage(wxT("clock")));
-    else
-        m_bitmapFilterDate->SetBitmap(GlobalResources::instance().getImage(wxT("clock_grey")));
-
-    if (activeCfg.unitSizeMin != USIZE_NONE ||
-        activeCfg.unitSizeMax != USIZE_NONE)
-        m_bitmapFilterSize->SetBitmap(GlobalResources::instance().getImage(wxT("size")));
-    else
-        m_bitmapFilterSize->SetBitmap(GlobalResources::instance().getImage(wxT("size_grey")));
-
-    m_spinCtrlTimespan->Enable(activeCfg.unitTimeSpan != UTIME_NONE);
-    m_spinCtrlMinSize ->Enable(activeCfg.unitSizeMin  != USIZE_NONE);
-    m_spinCtrlMaxSize ->Enable(activeCfg.unitSizeMax  != USIZE_NONE);
+    m_bitmapInclude->SetBitmap(
+        !NameFilter(activeCfg.includeFilter, FilterConfig().excludeFilter).isNull() ?
+        GlobalResources::getImage(wxT("include")) :
+        greyScale(GlobalResources::getImage(wxT("include"))));
+
+    m_bitmapExclude->SetBitmap(
+        !NameFilter(FilterConfig().includeFilter, activeCfg.excludeFilter).isNull() ?
+        GlobalResources::getImage(wxT("exclude")) :
+        greyScale(GlobalResources::getImage(wxT("exclude"))));
+
+    m_bitmapFilterDate->SetBitmap(
+        activeCfg.unitTimeSpan != UTIME_NONE ?
+        GlobalResources::getImage(wxT("clock")) :
+        greyScale(GlobalResources::getImage(wxT("clock"))));
+
+    m_bitmapFilterSize->SetBitmap(
+        activeCfg.unitSizeMin != USIZE_NONE ||
+        activeCfg.unitSizeMax != USIZE_NONE ?
+        GlobalResources::getImage(wxT("size")) :
+        greyScale(GlobalResources::getImage(wxT("size"))));
+
+    //m_spinCtrlTimespan->Enable(activeCfg.unitTimeSpan == UTIME_LAST_X_HOURS);
+    m_spinCtrlMinSize ->Enable(activeCfg.unitSizeMin != USIZE_NONE);
+    m_spinCtrlMaxSize ->Enable(activeCfg.unitSizeMax != USIZE_NONE);
 }
 
 
@@ -447,13 +376,13 @@ void DeleteDialog::updateGui()
     {
         header = _P("Do you really want to move the following object to the Recycle Bin?",
                     "Do you really want to move the following %x objects to the Recycle Bin?", delInfo.second);
-        m_bitmap12->SetBitmap(GlobalResources::instance().getImage(wxT("recycler")));
+        m_bitmap12->SetBitmap(GlobalResources::getImage(wxT("recycler")));
     }
     else
     {
         header = _P("Do you really want to delete the following object?",
                     "Do you really want to delete the following %x objects?", delInfo.second);
-        m_bitmap12->SetBitmap(GlobalResources::instance().getImage(wxT("deleteFile")));
+        m_bitmap12->SetBitmap(GlobalResources::getImage(wxT("deleteFile")));
     }
     header.Replace(wxT("%x"), toStringSep(delInfo.second));
     m_staticTextHeader->SetLabel(header);
@@ -536,8 +465,8 @@ CustomizeColsDlg::CustomizeColsDlg(wxWindow* parent, xmlAccess::ColumnAttributes
     new zen::MouseMoveWindow(*this); //allow moving main dialog by clicking (nearly) anywhere...; ownership passed to "this"
 #endif
 
-    m_bpButton29->SetBitmapLabel(GlobalResources::instance().getImage(wxT("moveUp")));
-    m_bpButton30->SetBitmapLabel(GlobalResources::instance().getImage(wxT("moveDown")));
+    m_bpButton29->SetBitmapLabel(GlobalResources::getImage(wxT("moveUp")));
+    m_bpButton30->SetBitmapLabel(GlobalResources::getImage(wxT("moveDown")));
 
     xmlAccess::ColumnAttributes columnSettings = attr;
 
@@ -671,11 +600,11 @@ SyncPreviewDlg::SyncPreviewDlg(wxWindow* parent,
 
     using zen::toStringSep;
 
-    m_buttonStartSync->setBitmapFront(GlobalResources::instance().getImage(wxT("startSync")));
-    m_bitmapCreate->SetBitmap(GlobalResources::instance().getImage(wxT("create")));
-    m_bitmapUpdate->SetBitmap(GlobalResources::instance().getImage(wxT("update")));
-    m_bitmapDelete->SetBitmap(GlobalResources::instance().getImage(wxT("delete")));
-    m_bitmapData->SetBitmap(GlobalResources::instance().getImage(wxT("data")));
+    m_buttonStartSync->setBitmapFront(GlobalResources::getImage(wxT("startSync")));
+    m_bitmapCreate->SetBitmap(GlobalResources::getImage(wxT("create")));
+    m_bitmapUpdate->SetBitmap(GlobalResources::getImage(wxT("update")));
+    m_bitmapDelete->SetBitmap(GlobalResources::getImage(wxT("delete")));
+    m_bitmapData->SetBitmap(GlobalResources::getImage(wxT("data")));
 
     m_staticTextVariant->SetLabel(variantName);
     m_textCtrlData->SetValue(zen::formatFilesizeToShortString(statistics.getDataToProcess()));
@@ -733,34 +662,34 @@ class CompareCfgDialog : public CmpCfgDlgGenerated
 {
 public:
     CompareCfgDialog(wxWindow* parent,
-                     zen::CompareVariant& cmpVar,
-                     SymLinkHandling& handleSymlinks);
+                     CompConfig& cmpConfig);
 
 private:
     void OnOkay(wxCommandEvent& event);
     void OnClose(wxCloseEvent& event) { EndModal(0); }
     void OnCancel(wxCommandEvent& event) { EndModal(0); }
-    void OnTimeSize(wxCommandEvent& event);
+    void OnShowHelp(wxCommandEvent& event);
+
+    void OnTimeSize(wxCommandEvent& event) { m_radioBtnSizeDate->SetValue(true); }
+    //void OnFilesize(wxCommandEvent& event) { m_radioBtnSize    ->SetValue(true); }
+    void OnContent (wxCommandEvent& event) { m_radioBtnContent ->SetValue(true); }
+
     void OnTimeSizeDouble(wxMouseEvent& event);
-    void OnContent(wxCommandEvent& event);
+    void OnFilesizeDouble(wxMouseEvent& event);
     void OnContentDouble(wxMouseEvent& event);
-    void OnShowHelp(wxCommandEvent& event);
 
     void updateView();
 
-    zen::CompareVariant& cmpVarOut;
-    SymLinkHandling& handleSymlinksOut;
+    CompConfig& cmpConfigOut;
 
     zen::EnumDescrList<SymLinkHandling>  enumDescrHandleSyml;
 };
 
 
 CompareCfgDialog::CompareCfgDialog(wxWindow* parent,
-                                   CompareVariant& cmpVar,
-                                   SymLinkHandling& handleSymlinks) :
+                                   CompConfig& cmpConfig) :
     CmpCfgDlgGenerated(parent),
-    cmpVarOut(cmpVar),
-    handleSymlinksOut(handleSymlinks)
+    cmpConfigOut(cmpConfig)
 {
 #ifdef FFS_WIN
     new zen::MouseMoveWindow(*this); //allow moving main dialog by clicking (nearly) anywhere...; ownership passed to "this"
@@ -774,11 +703,12 @@ CompareCfgDialog::CompareCfgDialog(wxWindow* parent,
     //move dialog up so that compare-config button and first config-variant are on same level
     //   Move(wxPoint(position.x, std::max(0, position.y - (m_buttonTimeSize->GetScreenPosition() - GetScreenPosition()).y)));
 
-    m_bpButtonHelp   ->SetBitmapLabel(GlobalResources::instance().getImage(wxT("help")));
-    m_bitmapByTime   ->SetBitmap     (GlobalResources::instance().getImage(wxT("clock")));
-    m_bitmapByContent->SetBitmap     (GlobalResources::instance().getImage(wxT("cmpByContent")));
+    m_bpButtonHelp   ->SetBitmapLabel(GlobalResources::getImage(wxT("help")));
+    m_bitmapByTime   ->SetBitmap     (GlobalResources::getImage(wxT("clock")));
+    //m_bitmapBySize   ->SetBitmap     (GlobalResources::getImage(wxT("size")));
+    m_bitmapByContent->SetBitmap     (GlobalResources::getImage(wxT("cmpByContent")));
 
-    switch (cmpVar)
+    switch (cmpConfig.compareVar)
     {
         case CMP_BY_TIME_SIZE:
             m_radioBtnSizeDate->SetValue(true);
@@ -790,7 +720,7 @@ CompareCfgDialog::CompareCfgDialog(wxWindow* parent,
             break;
     }
 
-    setEnumVal(enumDescrHandleSyml, *m_choiceHandleSymlinks, handleSymlinks);
+    setEnumVal(enumDescrHandleSyml, *m_choiceHandleSymlinks, cmpConfig.handleSymlinks);
 
     updateView();
 }
@@ -803,28 +733,16 @@ void CompareCfgDialog::updateView()
 void CompareCfgDialog::OnOkay(wxCommandEvent& event)
 {
     if (m_radioBtnContent->GetValue())
-        cmpVarOut = CMP_BY_CONTENT;
+        cmpConfigOut.compareVar = CMP_BY_CONTENT;
     else
-        cmpVarOut = CMP_BY_TIME_SIZE;
+        cmpConfigOut.compareVar = CMP_BY_TIME_SIZE;
 
-    handleSymlinksOut = getEnumVal(enumDescrHandleSyml, *m_choiceHandleSymlinks);
+    cmpConfigOut.handleSymlinks = getEnumVal(enumDescrHandleSyml, *m_choiceHandleSymlinks);
 
     EndModal(ReturnSmallDlg::BUTTON_OKAY);
 }
 
 
-void CompareCfgDialog::OnTimeSize(wxCommandEvent& event)
-{
-    m_radioBtnSizeDate->SetValue(true);
-}
-
-
-void CompareCfgDialog::OnContent(wxCommandEvent& event)
-{
-    m_radioBtnContent->SetValue(true);
-}
-
-
 void CompareCfgDialog::OnTimeSizeDouble(wxMouseEvent& event)
 {
     wxCommandEvent dummy;
@@ -843,15 +761,17 @@ void CompareCfgDialog::OnContentDouble(wxMouseEvent& event)
 
 void CompareCfgDialog::OnShowHelp(wxCommandEvent& event)
 {
-    HelpDlg helpDlg(this);
-    helpDlg.ShowModal();
+#ifdef FFS_WIN
+    zen::displayHelpEntry(wxT("html\\ComparisonSettings.html"));
+#elif defined FFS_LINUX
+    zen::displayHelpEntry(wxT("html/ComparisonSettings.html"));
+#endif
 }
 
 
-ReturnSmallDlg::ButtonPressed zen::showCompareCfgDialog(CompareVariant& cmpVar,
-                                                        SymLinkHandling& handleSymlinks)
+ReturnSmallDlg::ButtonPressed zen::showCompareCfgDialog(CompConfig& cmpConfig)
 {
-    CompareCfgDialog syncDlg(NULL, cmpVar, handleSymlinks);
+    CompareCfgDialog syncDlg(NULL, cmpConfig);
 
     return static_cast<ReturnSmallDlg::ButtonPressed>(syncDlg.ShowModal());
 }
@@ -887,16 +807,18 @@ GlobalSettingsDlg::GlobalSettingsDlg(wxWindow* parent, xmlAccess::XmlGlobalSetti
     new zen::MouseMoveWindow(*this); //allow moving main dialog by clicking (nearly) anywhere...; ownership passed to "this"
 #endif
 
-    m_bitmapSettings->SetBitmap(GlobalResources::instance().getImage(wxT("settings")));
-    m_buttonResetDialogs->setBitmapFront(GlobalResources::instance().getImage(wxT("warningSmall")), 5);
-    m_bpButtonAddRow->SetBitmapLabel(GlobalResources::instance().getImage(wxT("addFolderPair")));
-    m_bpButtonRemoveRow->SetBitmapLabel(GlobalResources::instance().getImage(wxT("removeFolderPair")));
+    m_bitmapSettings->SetBitmap(GlobalResources::getImage(wxT("settings")));
+    m_buttonResetDialogs->setBitmapFront(GlobalResources::getImage(wxT("warningSmall")), 5);
+    m_bpButtonAddRow->SetBitmapLabel(GlobalResources::getImage(wxT("addFolderPair")));
+    m_bpButtonRemoveRow->SetBitmapLabel(GlobalResources::getImage(wxT("removeFolderPair")));
 
     m_checkBoxCopyLocked     ->SetValue(globalSettings.copyLockedFiles);
-	m_checkBoxTransCopy      ->SetValue(globalSettings.transactionalFileCopy);
+    m_checkBoxTransCopy      ->SetValue(globalSettings.transactionalFileCopy);
     m_checkBoxCopyPermissions->SetValue(globalSettings.copyFilePermissions);
 
-#ifndef FFS_WIN
+#ifdef FFS_WIN
+    m_checkBoxCopyPermissions->SetLabel(_("Copy NTFS permissions"));
+#else
     m_checkBoxCopyLocked->Hide();
 #endif
 
@@ -921,7 +843,7 @@ void GlobalSettingsDlg::OnOkay(wxCommandEvent& event)
 {
     //write global settings only when okay-button is pressed!
     settings.copyLockedFiles       = m_checkBoxCopyLocked->GetValue();
-	settings.transactionalFileCopy = m_checkBoxTransCopy->GetValue();
+    settings.transactionalFileCopy = m_checkBoxTransCopy->GetValue();
     settings.copyFilePermissions   = m_checkBoxCopyPermissions->GetValue();
     settings.gui.externelApplications = getExtApp();
 
@@ -943,7 +865,7 @@ void GlobalSettingsDlg::OnDefault(wxCommandEvent& event)
 
     m_checkBoxCopyLocked     ->SetValue(defaultCfg.copyLockedFiles);
     m_checkBoxTransCopy      ->SetValue(defaultCfg.transactionalFileCopy);
-	m_checkBoxCopyPermissions->SetValue(defaultCfg.copyFilePermissions);
+    m_checkBoxCopyPermissions->SetValue(defaultCfg.copyFilePermissions);
     set(defaultCfg.gui.externelApplications);
 }
 
@@ -962,16 +884,21 @@ void GlobalSettingsDlg::OnClose(wxCloseEvent& event)
 
 void GlobalSettingsDlg::set(const xmlAccess::ExternalApps& extApp)
 {
+    auto extAppTmp = extApp;
+    vector_remove_if(extAppTmp, [](decltype(extAppTmp[0])& entry) { return entry.first.empty() && entry.second.empty(); });
+
+    extAppTmp.resize(extAppTmp.size() + 1); //append empty row to facilitate insertions
+
     const int rowCount = m_gridCustomCommand->GetNumberRows();
     if (rowCount > 0)
         m_gridCustomCommand->DeleteRows(0, rowCount);
 
-    m_gridCustomCommand->AppendRows(static_cast<int>(extApp.size()));
-    for (xmlAccess::ExternalApps::const_iterator i = extApp.begin(); i != extApp.end(); ++i)
+    m_gridCustomCommand->AppendRows(static_cast<int>(extAppTmp.size()));
+    for (auto iter = extAppTmp.begin(); iter != extAppTmp.end(); ++iter)
     {
-        const int row = i - extApp.begin();
-        m_gridCustomCommand->SetCellValue(row, 0, i->first);  //description
-        m_gridCustomCommand->SetCellValue(row, 1, i->second); //commandline
+        const int row = iter - extAppTmp.begin();
+        m_gridCustomCommand->SetCellValue(row, 0, iter->first);  //description
+        m_gridCustomCommand->SetCellValue(row, 1, iter->second); //commandline
     }
     Fit();
 }
@@ -981,9 +908,12 @@ xmlAccess::ExternalApps GlobalSettingsDlg::getExtApp()
 {
     xmlAccess::ExternalApps output;
     for (int i = 0; i < m_gridCustomCommand->GetNumberRows(); ++i)
-        output.push_back(
-            std::make_pair(m_gridCustomCommand->GetCellValue(i, 0),   //description
-                           m_gridCustomCommand->GetCellValue(i, 1))); //commandline
+    {
+        auto entry = std::make_pair(m_gridCustomCommand->GetCellValue(i, 0),  //description
+                                    m_gridCustomCommand->GetCellValue(i, 1)); //commandline
+        if (!entry.first.empty() || !entry.second.empty())
+            output.push_back(entry);
+    }
     return output;
 }
 
@@ -1024,3 +954,121 @@ ReturnSmallDlg::ButtonPressed zen::showGlobalSettingsDlg(xmlAccess::XmlGlobalSet
     GlobalSettingsDlg settingsDlg(NULL, globalSettings);
     return static_cast<ReturnSmallDlg::ButtonPressed>(settingsDlg.ShowModal());
 }
+//########################################################################################
+
+
+class SelectTimespanDlg : public SelectTimespanDlgGenerated
+{
+public:
+    SelectTimespanDlg(wxWindow* parent, Int64& timeFrom, Int64& timeTo);
+
+private:
+    void OnOkay(wxCommandEvent& event);
+    void OnCancel(wxCommandEvent& event) { EndModal(0); }
+    void OnClose(wxCloseEvent& event) { EndModal(0); }
+
+    virtual void OnChangeSelectionFrom(wxCalendarEvent& event)
+    {
+        if (m_calendarFrom->GetDate() > m_calendarTo->GetDate())
+            m_calendarTo->SetDate(m_calendarFrom->GetDate());
+    }
+    virtual void OnChangeSelectionTo(wxCalendarEvent& event)
+    {
+        if (m_calendarFrom->GetDate() > m_calendarTo->GetDate())
+            m_calendarFrom->SetDate(m_calendarTo->GetDate());
+    }
+
+    Int64& timeFrom_;
+    Int64& timeTo_;
+};
+
+
+wxDateTime utcToLocalDateTime(time_t utcTime)
+{
+    //wxDateTime models local(!) time (in contrast to what documentation says), but this constructor takes time_t UTC
+    return wxDateTime(utcTime);
+}
+
+time_t localDateTimeToUtc(const wxDateTime& localTime)
+{
+    return localTime.GetTicks();
+}
+
+
+SelectTimespanDlg::SelectTimespanDlg(wxWindow* parent, Int64& timeFrom, Int64& timeTo) :
+    SelectTimespanDlgGenerated(parent),
+    timeFrom_(timeFrom),
+    timeTo_(timeTo)
+{
+#ifdef FFS_WIN
+    new zen::MouseMoveWindow(*this); //allow moving main dialog by clicking (nearly) anywhere...; ownership passed to "this"
+#endif
+
+    long style = wxCAL_SHOW_HOLIDAYS;
+
+#ifdef FFS_WIN
+    DWORD firstDayOfWeek = 0;
+    if (::GetLocaleInfo(LOCALE_USER_DEFAULT,                   //__in   LCID Locale,
+                        LOCALE_IFIRSTDAYOFWEEK |               // first day of week specifier, 0-6, 0=Monday, 6=Sunday
+                        LOCALE_RETURN_NUMBER,                  //__in   LCTYPE LCType,
+                        reinterpret_cast<LPTSTR>(&firstDayOfWeek),      //__out  LPTSTR lpLCData,
+                        sizeof(firstDayOfWeek) / sizeof(TCHAR)) != 0 && //__in   int cchData
+        firstDayOfWeek == 6)
+        style |= wxCAL_SUNDAY_FIRST;
+    else //default
+#endif
+        style |= wxCAL_MONDAY_FIRST;
+
+    m_calendarFrom->SetWindowStyleFlag(style);
+    m_calendarTo  ->SetWindowStyleFlag(style);
+
+    //set default values
+    if (timeTo_ == 0)
+        timeTo_ = wxGetUTCTime(); //
+    if (timeFrom_ == 0)
+        timeFrom_ = timeTo_ - 7 * 24 * 3600; //default time span: one week from "now"
+
+    m_calendarFrom->SetDate(utcToLocalDateTime(to<time_t>(timeFrom_)));
+    m_calendarTo  ->SetDate(utcToLocalDateTime(to<time_t>(timeTo_)));
+
+    m_buttonOkay->SetFocus();
+    Fit();
+}
+
+
+void SelectTimespanDlg::OnOkay(wxCommandEvent& event)
+{
+    wxDateTime from = m_calendarFrom->GetDate();
+    wxDateTime to   = m_calendarTo  ->GetDate();
+
+    //align to full days
+    from.ResetTime();
+    to += wxTimeSpan::Day();
+    to.ResetTime(); //reset local(!) time
+    to -= wxTimeSpan::Second(); //go back to end of previous day
+
+    timeFrom_ = localDateTimeToUtc(from);
+    timeTo_   = localDateTimeToUtc(to);
+
+    /*
+    {
+        time_t current = zen::to<time_t>(timeFrom_);
+        struct tm* tdfewst = ::localtime(&current);
+        int budfk = 3;
+    }
+    {
+        time_t current = zen::to<time_t>(timeTo_);
+        struct tm* tdfewst = ::localtime(&current);
+        int budfk = 3;
+    }
+    */
+
+    EndModal(ReturnSmallDlg::BUTTON_OKAY);
+}
+
+
+ReturnSmallDlg::ButtonPressed zen::showSelectTimespanDlg(Int64& timeFrom, Int64& timeTo)
+{
+    SelectTimespanDlg timeSpanDlg(NULL, timeFrom, timeTo);
+    return static_cast<ReturnSmallDlg::ButtonPressed>(timeSpanDlg.ShowModal());
+}
diff --git a/ui/small_dlgs.h b/ui/small_dlgs.h
index 93c90445..ca497bfb 100644
--- a/ui/small_dlgs.h
+++ b/ui/small_dlgs.h
@@ -25,8 +25,6 @@ struct ReturnSmallDlg
 
 void showAboutDialog();
 
-void showHelpDialog();
-
 ReturnSmallDlg::ButtonPressed showFilterDialog(bool isGlobalFilter, FilterConfig& filter);
 
 ReturnSmallDlg::ButtonPressed showDeleteDialog(
@@ -42,11 +40,11 @@ ReturnSmallDlg::ButtonPressed showSyncPreviewDlg(
     const SyncStatistics& statistics,
     bool& dontShowAgain);
 
-ReturnSmallDlg::ButtonPressed showCompareCfgDialog(
-    CompareVariant& cmpVar,
-    SymLinkHandling& handleSymlinks);
+ReturnSmallDlg::ButtonPressed showCompareCfgDialog(CompConfig& cmpConfig);
 
 ReturnSmallDlg::ButtonPressed showGlobalSettingsDlg(xmlAccess::XmlGlobalSettings& globalSettings);
+
+ReturnSmallDlg::ButtonPressed showSelectTimespanDlg(Int64& timeFrom, Int64& timeTo);
 }
 
 #endif // SMALLDIALOGS_H_INCLUDED
diff --git a/ui/sorting.h b/ui/sorting.h
index fa4e9973..719934d8 100644
--- a/ui/sorting.h
+++ b/ui/sorting.h
@@ -53,8 +53,7 @@ struct Compare<false>
 };
 
 
-template <bool ascending, SelectedSide side>
-inline
+template <bool ascending, SelectedSide side> inline
 bool lessShortFileName(const FileSystemObject& a, const FileSystemObject& b)
 {
     //presort types: first files, then directories then empty rows
@@ -82,24 +81,18 @@ bool lessShortFileName(const FileSystemObject& a, const FileSystemObject& b)
 }
 
 
-template <bool ascending, SelectedSide side>
+template <bool ascending> //side currently unused!
 bool lessRelativeName(const FileSystemObject& a, const FileSystemObject& b)
 {
-    if (a.isEmpty<side>())
-        return false;  //empty rows always last
-    else if (b.isEmpty<side>())
-        return true;  //empty rows always last
-
     const bool isDirectoryA = isDirectoryMapping(a);
     const Zstring& relDirNameA = isDirectoryA ?
-                                 a.getRelativeName<side>() : //directory
-                                 a.getParentRelativeName();  //file or symlink
+                                 a.getObjRelativeName() : //directory
+                                 a.getObjRelativeName().BeforeLast(FILE_NAME_SEPARATOR); //returns empty string if ch not found
 
     const bool isDirectoryB = isDirectoryMapping(b);
     const Zstring& relDirNameB = isDirectoryB ?
-                                 b.getRelativeName<side>() : //directory
-                                 b.getParentRelativeName();  //file or symlink
-
+                                 b.getObjRelativeName() : //directory
+                                 b.getObjRelativeName().BeforeLast(FILE_NAME_SEPARATOR); //returns empty string if ch not found
 
     //compare relative names without filenames first
     const int rv = cmpFileName(relDirNameA, relDirNameB);
@@ -112,13 +105,12 @@ bool lessRelativeName(const FileSystemObject& a, const FileSystemObject& b)
         else if (isDirectoryA)
             return true;
 
-        return LessFilename()(a.getShortName<side>(), b.getShortName<side>());
+        return LessFilename()(a.getObjShortName(), b.getObjShortName());
     }
 }
 
 
-template <bool ascending, SelectedSide side>
-inline
+template <bool ascending, SelectedSide side> inline
 bool lessFilesize(const FileSystemObject& a, const FileSystemObject& b)
 {
     //empty rows always last
@@ -150,8 +142,7 @@ bool lessFilesize(const FileSystemObject& a, const FileSystemObject& b)
 }
 
 
-template <bool ascending, SelectedSide side>
-inline
+template <bool ascending, SelectedSide side> inline
 bool lessFiletime(const FileSystemObject& a, const FileSystemObject& b)
 {
     if (a.isEmpty<side>())
@@ -179,8 +170,7 @@ bool lessFiletime(const FileSystemObject& a, const FileSystemObject& b)
 }
 
 
-template <bool ascending, SelectedSide side>
-inline
+template <bool ascending, SelectedSide side> inline
 bool lessExtension(const FileSystemObject& a, const FileSystemObject& b)
 {
     if (a.isEmpty<side>())
@@ -201,8 +191,7 @@ bool lessExtension(const FileSystemObject& a, const FileSystemObject& b)
 }
 
 
-template <bool ascending>
-inline
+template <bool ascending> inline
 bool lessCmpResult(const FileSystemObject& a, const FileSystemObject& b)
 {
     //presort result: equal shall appear at end of list
@@ -215,8 +204,7 @@ bool lessCmpResult(const FileSystemObject& a, const FileSystemObject& b)
 }
 
 
-template <bool ascending>
-inline
+template <bool ascending> inline
 bool lessSyncDirection(const FileSystemObject& a, const FileSystemObject& b)
 {
     return Compare<ascending>().isSmallerThan(a.getSyncOperation(), b.getSyncOperation());
diff --git a/ui/switch_to_gui.cpp b/ui/switch_to_gui.cpp
index 7bd28c59..76e5b282 100644
--- a/ui/switch_to_gui.cpp
+++ b/ui/switch_to_gui.cpp
@@ -20,8 +20,8 @@ void SwitchToGui::execute() const //throw()
 {
     try
     {
-        MainDialog* frame = new MainDialog(guiCfg, globalSettings_, true);
+        MainDialog* frame = new MainDialog(guiCfg, globalSettings_, true); //toplevel window
         frame->Show();
     }
-    catch(...) {}
+    catch (...) {}
 }
diff --git a/ui/sync_cfg.cpp b/ui/sync_cfg.cpp
index 5e78e97a..d85e2bcf 100644
--- a/ui/sync_cfg.cpp
+++ b/ui/sync_cfg.cpp
@@ -15,6 +15,7 @@
 #include <memory>
 #include "../shared/wx_choice_enum.h"
 #include "../shared/dir_name.h"
+#include "../shared/image_tools.h"
 
 using namespace zen;
 using namespace xmlAccess;
@@ -26,14 +27,10 @@ class SyncCfgDialog : public SyncCfgDlgGenerated
 {
 public:
     SyncCfgDialog(wxWindow* window,
-                  zen::CompareVariant   compareVar,
-                  zen::SyncConfig&      syncConfiguration,
-                  zen::DeletionPolicy&  handleDeletion,
-                  wxString&              customDeletionDirectory,
+                  CompareVariant compareVar,
+                  SyncConfig&    syncCfg,
                   xmlAccess::OnGuiError* handleError); //optional input parameter
 
-    ~SyncCfgDialog();
-
 private:
     virtual void OnSyncAutomatic(   wxCommandEvent& event);
     virtual void OnSyncMirror(      wxCommandEvent& event);
@@ -63,24 +60,22 @@ private:
 
     const zen::CompareVariant cmpVariant;
 
-    //temporal copy of maindialog.cfg.syncConfiguration -> ownership NOT within GUI controls!
-    zen::SyncConfig currentSyncConfig;
+    //temporal copy of maindialog.cfg.directionCfg -> ownership NOT within GUI controls!
+    DirectionConfig currentDirectionCfg;
 
     //changing data
-    zen::SyncConfig&        refSyncConfiguration;
-    zen::DeletionPolicy&    refHandleDeletion;
-    wxString&                refCustomDeletionDirectory;
-    xmlAccess::OnGuiError*   refHandleError;
+    SyncConfig&            syncCfgOut;
+    xmlAccess::OnGuiError* refHandleError;
 
-    zen::DirectoryName customDelFolder;
+    DirectoryName<FolderHistoryBox> customDelFolder;
 
-    zen::EnumDescrList<zen::DeletionPolicy>  enumDelhandDescr;
-    zen::EnumDescrList<xmlAccess::OnGuiError> enumErrhandDescr;
+    EnumDescrList<zen::DeletionPolicy>  enumDelhandDescr;
+    EnumDescrList<xmlAccess::OnGuiError> enumErrhandDescr;
 };
 
 
 
-void updateConfigIcons(const SyncConfig& syncConfig,
+void updateConfigIcons(const DirectionConfig& directionCfg,
                        wxBitmapButton* buttonLeftOnly,
                        wxBitmapButton* buttonRightOnly,
                        wxBitmapButton* buttonLeftNewer,
@@ -94,22 +89,22 @@ void updateConfigIcons(const SyncConfig& syncConfig,
                        wxStaticBitmap* bitmapDifferent,
                        wxStaticBitmap* bitmapConflict) //sizer containing all sync-directions
 {
-    if (syncConfig.var != SyncConfig::AUTOMATIC) //automatic mode needs no sync-directions
+    if (directionCfg.var != DirectionConfig::AUTOMATIC) //automatic mode needs no sync-directions
     {
-        const DirectionSet dirCfg = extractDirections(syncConfig);
+        const DirectionSet dirCfg = extractDirections(directionCfg);
 
         switch (dirCfg.exLeftSideOnly)
         {
             case SYNC_DIR_RIGHT:
-                buttonLeftOnly->SetBitmapLabel(GlobalResources::instance().getImage(wxT("arrowRightCr")));
+                buttonLeftOnly->SetBitmapLabel(GlobalResources::getImage(wxT("createRight")));
                 buttonLeftOnly->SetToolTip(getDescription(SO_CREATE_NEW_RIGHT));
                 break;
             case SYNC_DIR_LEFT:
-                buttonLeftOnly->SetBitmapLabel(GlobalResources::instance().getImage(wxT("deleteLeft")));
+                buttonLeftOnly->SetBitmapLabel(GlobalResources::getImage(wxT("deleteLeft")));
                 buttonLeftOnly->SetToolTip(getDescription(SO_DELETE_LEFT));
                 break;
             case SYNC_DIR_NONE:
-                buttonLeftOnly->SetBitmapLabel(GlobalResources::instance().getImage(wxT("arrowNone")));
+                buttonLeftOnly->SetBitmapLabel(GlobalResources::getImage(wxT("none")));
                 buttonLeftOnly->SetToolTip(getDescription(SO_DO_NOTHING));
                 break;
         }
@@ -117,15 +112,15 @@ void updateConfigIcons(const SyncConfig& syncConfig,
         switch (dirCfg.exRightSideOnly)
         {
             case SYNC_DIR_RIGHT:
-                buttonRightOnly->SetBitmapLabel(GlobalResources::instance().getImage(wxT("deleteRight")));
+                buttonRightOnly->SetBitmapLabel(GlobalResources::getImage(wxT("deleteRight")));
                 buttonRightOnly->SetToolTip(getDescription(SO_DELETE_RIGHT));
                 break;
             case SYNC_DIR_LEFT:
-                buttonRightOnly->SetBitmapLabel(GlobalResources::instance().getImage(wxT("arrowLeftCr")));
+                buttonRightOnly->SetBitmapLabel(GlobalResources::getImage(wxT("createLeft")));
                 buttonRightOnly->SetToolTip(getDescription(SO_CREATE_NEW_LEFT));
                 break;
             case SYNC_DIR_NONE:
-                buttonRightOnly->SetBitmapLabel(GlobalResources::instance().getImage(wxT("arrowNone")));
+                buttonRightOnly->SetBitmapLabel(GlobalResources::getImage(wxT("none")));
                 buttonRightOnly->SetToolTip(getDescription(SO_DO_NOTHING));
                 break;
         }
@@ -133,15 +128,15 @@ void updateConfigIcons(const SyncConfig& syncConfig,
         switch (dirCfg.leftNewer)
         {
             case SYNC_DIR_RIGHT:
-                buttonLeftNewer->SetBitmapLabel(GlobalResources::instance().getImage(wxT("arrowRight")));
+                buttonLeftNewer->SetBitmapLabel(GlobalResources::getImage(wxT("updateRight")));
                 buttonLeftNewer->SetToolTip(getDescription(SO_OVERWRITE_RIGHT));
                 break;
             case SYNC_DIR_LEFT:
-                buttonLeftNewer->SetBitmapLabel(GlobalResources::instance().getImage(wxT("arrowLeft")));
+                buttonLeftNewer->SetBitmapLabel(GlobalResources::getImage(wxT("updateLeft")));
                 buttonLeftNewer->SetToolTip(getDescription(SO_OVERWRITE_LEFT));
                 break;
             case SYNC_DIR_NONE:
-                buttonLeftNewer->SetBitmapLabel(GlobalResources::instance().getImage(wxT("arrowNone")));
+                buttonLeftNewer->SetBitmapLabel(GlobalResources::getImage(wxT("none")));
                 buttonLeftNewer->SetToolTip(getDescription(SO_DO_NOTHING));
                 break;
         }
@@ -149,15 +144,15 @@ void updateConfigIcons(const SyncConfig& syncConfig,
         switch (dirCfg.rightNewer)
         {
             case SYNC_DIR_RIGHT:
-                buttonRightNewer->SetBitmapLabel(GlobalResources::instance().getImage(wxT("arrowRight")));
+                buttonRightNewer->SetBitmapLabel(GlobalResources::getImage(wxT("updateRight")));
                 buttonRightNewer->SetToolTip(getDescription(SO_OVERWRITE_RIGHT));
                 break;
             case SYNC_DIR_LEFT:
-                buttonRightNewer->SetBitmapLabel(GlobalResources::instance().getImage(wxT("arrowLeft")));
+                buttonRightNewer->SetBitmapLabel(GlobalResources::getImage(wxT("updateLeft")));
                 buttonRightNewer->SetToolTip(getDescription(SO_OVERWRITE_LEFT));
                 break;
             case SYNC_DIR_NONE:
-                buttonRightNewer->SetBitmapLabel(GlobalResources::instance().getImage(wxT("arrowNone")));
+                buttonRightNewer->SetBitmapLabel(GlobalResources::getImage(wxT("none")));
                 buttonRightNewer->SetToolTip(getDescription(SO_DO_NOTHING));
                 break;
         }
@@ -165,15 +160,15 @@ void updateConfigIcons(const SyncConfig& syncConfig,
         switch (dirCfg.different)
         {
             case SYNC_DIR_RIGHT:
-                buttonDifferent->SetBitmapLabel(GlobalResources::instance().getImage(wxT("arrowRight")));
+                buttonDifferent->SetBitmapLabel(GlobalResources::getImage(wxT("updateRight")));
                 buttonDifferent->SetToolTip(getDescription(SO_OVERWRITE_RIGHT));
                 break;
             case SYNC_DIR_LEFT:
-                buttonDifferent->SetBitmapLabel(GlobalResources::instance().getImage(wxT("arrowLeft")));
+                buttonDifferent->SetBitmapLabel(GlobalResources::getImage(wxT("updateLeft")));
                 buttonDifferent->SetToolTip(getDescription(SO_OVERWRITE_LEFT));
                 break;
             case SYNC_DIR_NONE:
-                buttonDifferent->SetBitmapLabel(GlobalResources::instance().getImage(wxT("arrowNone")));
+                buttonDifferent->SetBitmapLabel(GlobalResources::getImage(wxT("none")));
                 buttonDifferent->SetToolTip(getDescription(SO_DO_NOTHING));
                 break;
         }
@@ -181,15 +176,15 @@ void updateConfigIcons(const SyncConfig& syncConfig,
         switch (dirCfg.conflict)
         {
             case SYNC_DIR_RIGHT:
-                buttonConflict->SetBitmapLabel(GlobalResources::instance().getImage(wxT("arrowRight")));
+                buttonConflict->SetBitmapLabel(GlobalResources::getImage(wxT("updateRight")));
                 buttonConflict->SetToolTip(getDescription(SO_OVERWRITE_RIGHT));
                 break;
             case SYNC_DIR_LEFT:
-                buttonConflict->SetBitmapLabel(GlobalResources::instance().getImage(wxT("arrowLeft")));
+                buttonConflict->SetBitmapLabel(GlobalResources::getImage(wxT("updateLeft")));
                 buttonConflict->SetToolTip(getDescription(SO_OVERWRITE_LEFT));
                 break;
             case SYNC_DIR_NONE:
-                buttonConflict->SetBitmapLabel(GlobalResources::instance().getImage(wxT("conflict")));
+                buttonConflict->SetBitmapLabel(GlobalResources::getImage(wxT("conflict")));
                 buttonConflict->SetToolTip(_("Leave as unresolved conflict"));
                 break;
         }
@@ -198,19 +193,15 @@ void updateConfigIcons(const SyncConfig& syncConfig,
 
 
 SyncCfgDialog::SyncCfgDialog(wxWindow* window,
-                             CompareVariant  compareVar,
-                             SyncConfig&     syncConfiguration,
-                             DeletionPolicy& handleDeletion,
-                             wxString&       customDeletionDirectory,
-                             OnGuiError*     handleError) :
+                             CompareVariant compareVar,
+                             SyncConfig&    syncCfg,
+                             xmlAccess::OnGuiError* handleError) : //optional input parameter
     SyncCfgDlgGenerated(window),
     cmpVariant(compareVar),
-    currentSyncConfig(syncConfiguration),  //make working copy of syncConfiguration
-    refSyncConfiguration(syncConfiguration),
-    refHandleDeletion(handleDeletion),
-    refCustomDeletionDirectory(customDeletionDirectory),
+    currentDirectionCfg(syncCfg.directionCfg),  //make working copy
+    syncCfgOut(syncCfg),
     refHandleError(handleError),
-    customDelFolder(*m_panelCustomDeletionDir, *m_dirPickerCustomDelFolder, *m_textCtrlCustomDelFolder)
+    customDelFolder(*m_panelCustomDeletionDir, *m_dirPickerCustomDelFolder, *m_customDelFolder)
 {
 #ifdef FFS_WIN
     new zen::MouseMoveWindow(*this); //allow moving main dialog by clicking (nearly) anywhere...; ownership passed to "this"
@@ -222,13 +213,13 @@ SyncCfgDialog::SyncCfgDialog(wxWindow* window,
     add(MOVE_TO_CUSTOM_DIRECTORY, _("Versioning"),         _("Move files into a time-stamped subdirectory"));
 
     enumErrhandDescr.
-    add(ON_GUIERROR_POPUP,  _("Show popup"),    _("Show popup on errors or warnings")).
+    add(ON_GUIERROR_POPUP,  _("Show pop-up"),    _("Show pop-up on errors or warnings")).
     add(ON_GUIERROR_IGNORE, _("Ignore errors"), _("Hide all error and warning messages"));
 
 
     //a proper set-method may be in order some time...
-    setEnumVal(enumDelhandDescr, *m_choiceHandleDeletion, handleDeletion);
-    customDelFolder.setName(customDeletionDirectory);
+    setEnumVal(enumDelhandDescr, *m_choiceHandleDeletion, syncCfg.handleDeletion);
+    customDelFolder.setName(syncCfg.customDeletionDirectory);
     updateGui();
 
     //error handling
@@ -244,13 +235,13 @@ SyncCfgDialog::SyncCfgDialog(wxWindow* window,
     updateGui();
 
     //set icons for this dialog
-    m_bitmapLeftOnly  ->SetBitmap(GlobalResources::instance().getImage(wxT("leftOnly")));
-    m_bitmapRightOnly ->SetBitmap(GlobalResources::instance().getImage(wxT("rightOnly")));
-    m_bitmapLeftNewer ->SetBitmap(GlobalResources::instance().getImage(wxT("leftNewer")));
-    m_bitmapRightNewer->SetBitmap(GlobalResources::instance().getImage(wxT("rightNewer")));
-    m_bitmapDifferent ->SetBitmap(GlobalResources::instance().getImage(wxT("different")));
-    m_bitmapConflict  ->SetBitmap(GlobalResources::instance().getImage(wxT("conflictGrey")));
-    m_bitmapDatabase  ->SetBitmap(GlobalResources::instance().getImage(wxT("database")));
+    m_bitmapLeftOnly  ->SetBitmap(greyScale(GlobalResources::getImage(L"leftOnly")));
+    m_bitmapRightOnly ->SetBitmap(greyScale(GlobalResources::getImage(L"rightOnly")));
+    m_bitmapLeftNewer ->SetBitmap(greyScale(GlobalResources::getImage(L"leftNewer")));
+    m_bitmapRightNewer->SetBitmap(greyScale(GlobalResources::getImage(L"rightNewer")));
+    m_bitmapDifferent ->SetBitmap(greyScale(GlobalResources::getImage(L"different")));
+    m_bitmapConflict  ->SetBitmap(greyScale(GlobalResources::getImage(L"conflict")));
+    m_bitmapDatabase  ->SetBitmap(GlobalResources::getImage(wxT("database")));
 
     bSizer201->Layout(); //wxButtonWithImage size might have changed
 
@@ -258,11 +249,8 @@ SyncCfgDialog::SyncCfgDialog(wxWindow* window,
 
     Fit();
 }
-
 //#################################################################################################################
 
-SyncCfgDialog::~SyncCfgDialog() {} //non-inline destructor for std::auto_ptr to work with forward declaration
-
 
 void SyncCfgDialog::updateGui()
 {
@@ -275,7 +263,7 @@ void SyncCfgDialog::updateGui()
     wxWindowUpdateLocker dummy7(m_bpButtonDifferent);
     wxWindowUpdateLocker dummy8(m_bpButtonConflict);
 
-    updateConfigIcons(currentSyncConfig,
+    updateConfigIcons(currentDirectionCfg,
                       m_bpButtonLeftOnly,
                       m_bpButtonRightOnly,
                       m_bpButtonLeftNewer,
@@ -293,7 +281,7 @@ void SyncCfgDialog::updateGui()
     m_bitmapDatabase->Show(true);
     sbSizerSyncDirections->Show(true);
 
-    if (currentSyncConfig.var == SyncConfig::AUTOMATIC)
+    if (currentDirectionCfg.var == DirectionConfig::AUTOMATIC)
     {
         sbSizerSyncDirections->Show(false);
     }
@@ -314,18 +302,18 @@ void SyncCfgDialog::updateGui()
     }
 
     //set radiobuttons -> have no parameter-ownership at all!
-    switch (currentSyncConfig.var)
+    switch (currentDirectionCfg.var)
     {
-        case SyncConfig::AUTOMATIC:
+        case DirectionConfig::AUTOMATIC:
             m_radioBtnAutomatic->SetValue(true); //automatic mode
             break;
-        case SyncConfig::MIRROR:
+        case DirectionConfig::MIRROR:
             m_radioBtnMirror->SetValue(true);    //one way ->
             break;
-        case SyncConfig::UPDATE:
+        case DirectionConfig::UPDATE:
             m_radioBtnUpdate->SetValue(true);    //Update ->
             break;
-        case SyncConfig::CUSTOM:
+        case DirectionConfig::CUSTOM:
             m_radioBtnCustom->SetValue(true);    //custom
             break;
     }
@@ -340,10 +328,10 @@ void SyncCfgDialog::updateGui()
 void SyncCfgDialog::OnApply(wxCommandEvent& event)
 {
     //write configuration to main dialog
-    refSyncConfiguration = currentSyncConfig;
-    refHandleDeletion    = getEnumVal(enumDelhandDescr, *m_choiceHandleDeletion);
+    syncCfgOut.directionCfg            = currentDirectionCfg;
+    syncCfgOut.handleDeletion          = getEnumVal(enumDelhandDescr, *m_choiceHandleDeletion);
+    syncCfgOut.customDeletionDirectory = customDelFolder.getName();
 
-    refCustomDeletionDirectory = customDelFolder.getName();
     if (refHandleError)
         *refHandleError = getEnumVal(enumErrhandDescr, *m_choiceHandleError);
 
@@ -366,28 +354,28 @@ void SyncCfgDialog::OnChangeDeletionHandling(wxCommandEvent& event)
 
 void SyncCfgDialog::OnSyncAutomatic(wxCommandEvent& event)
 {
-    currentSyncConfig.var = SyncConfig::AUTOMATIC;
+    currentDirectionCfg.var = DirectionConfig::AUTOMATIC;
     updateGui();
 }
 
 
 void SyncCfgDialog::OnSyncMirror(wxCommandEvent& event)
 {
-    currentSyncConfig.var = SyncConfig::MIRROR;
+    currentDirectionCfg.var = DirectionConfig::MIRROR;
     updateGui();
 }
 
 
 void SyncCfgDialog::OnSyncUpdate(wxCommandEvent& event)
 {
-    currentSyncConfig.var = SyncConfig::UPDATE;
+    currentDirectionCfg.var = DirectionConfig::UPDATE;
     updateGui();
 }
 
 
 void SyncCfgDialog::OnSyncCustom(wxCommandEvent& event)
 {
-    currentSyncConfig.var = SyncConfig::CUSTOM;
+    currentDirectionCfg.var = DirectionConfig::CUSTOM;
     updateGui();
 }
 
@@ -438,41 +426,41 @@ void toggleSyncDirection(SyncDirection& current)
 }
 
 
-void pressCustomDir(SyncConfig& syncCfg, SyncDirection& syncdir)
+void pressCustomDir(DirectionConfig& directionCfg, SyncDirection& syncdir)
 {
-    switch (syncCfg.var)
+    switch (directionCfg.var)
     {
-        case SyncConfig::AUTOMATIC:
+        case DirectionConfig::AUTOMATIC:
             assert(false);
             break;
-        case SyncConfig::MIRROR:
-        case SyncConfig::UPDATE:
-            syncCfg.custom = extractDirections(syncCfg);
-            syncCfg.var = SyncConfig::CUSTOM;
+        case DirectionConfig::MIRROR:
+        case DirectionConfig::UPDATE:
+            directionCfg.custom = extractDirections(directionCfg);
+            directionCfg.var = DirectionConfig::CUSTOM;
             toggleSyncDirection(syncdir);
             break;
-        case SyncConfig::CUSTOM:
+        case DirectionConfig::CUSTOM:
             toggleSyncDirection(syncdir);
 
             //some config optimization: if custom settings happen to match "mirror" or "update", just switch variant
-            DirectionSet currentSet = extractDirections(syncCfg);
+            DirectionSet currentSet = extractDirections(directionCfg);
             DirectionSet setMirror;
             DirectionSet setUpdate;
             {
-                SyncConfig mirrorCfg;
-                mirrorCfg.var = SyncConfig::MIRROR;
+                DirectionConfig mirrorCfg;
+                mirrorCfg.var = DirectionConfig::MIRROR;
                 setMirror = extractDirections(mirrorCfg);
             }
             {
-                SyncConfig updateCfg;
-                updateCfg.var = SyncConfig::UPDATE;
+                DirectionConfig updateCfg;
+                updateCfg.var = DirectionConfig::UPDATE;
                 setUpdate = extractDirections(updateCfg);
             }
 
             if (currentSet == setMirror)
-                syncCfg.var = SyncConfig::MIRROR;
+                directionCfg.var = DirectionConfig::MIRROR;
             else if (currentSet == setUpdate)
-                syncCfg.var = SyncConfig::UPDATE;
+                directionCfg.var = DirectionConfig::UPDATE;
             break;
     }
 }
@@ -480,60 +468,54 @@ void pressCustomDir(SyncConfig& syncCfg, SyncDirection& syncdir)
 
 void SyncCfgDialog::OnExLeftSideOnly(wxCommandEvent& event )
 {
-    pressCustomDir(currentSyncConfig, currentSyncConfig.custom.exLeftSideOnly);
+    pressCustomDir(currentDirectionCfg, currentDirectionCfg.custom.exLeftSideOnly);
     updateGui();
 }
 
 
 void SyncCfgDialog::OnExRightSideOnly(wxCommandEvent& event )
 {
-    pressCustomDir(currentSyncConfig, currentSyncConfig.custom.exRightSideOnly);
+    pressCustomDir(currentDirectionCfg, currentDirectionCfg.custom.exRightSideOnly);
     updateGui();
 }
 
 
 void SyncCfgDialog::OnLeftNewer(wxCommandEvent& event )
 {
-    pressCustomDir(currentSyncConfig, currentSyncConfig.custom.leftNewer);
+    pressCustomDir(currentDirectionCfg, currentDirectionCfg.custom.leftNewer);
     updateGui();
 }
 
 
 void SyncCfgDialog::OnRightNewer(wxCommandEvent& event )
 {
-    pressCustomDir(currentSyncConfig, currentSyncConfig.custom.rightNewer);
+    pressCustomDir(currentDirectionCfg, currentDirectionCfg.custom.rightNewer);
     updateGui();
 }
 
 
 void SyncCfgDialog::OnDifferent(wxCommandEvent& event )
 {
-    pressCustomDir(currentSyncConfig, currentSyncConfig.custom.different);
+    pressCustomDir(currentDirectionCfg, currentDirectionCfg.custom.different);
     updateGui();
 }
 
 
 void SyncCfgDialog::OnConflict(wxCommandEvent& event)
 {
-    pressCustomDir(currentSyncConfig, currentSyncConfig.custom.conflict);
+    pressCustomDir(currentDirectionCfg, currentDirectionCfg.custom.conflict);
     updateGui();
 }
 
 
 
-
-
-ReturnSyncConfig::ButtonPressed zen::showSyncConfigDlg(zen::CompareVariant   compareVar,
-                                                       zen::SyncConfig&      syncConfiguration,
-                                                       zen::DeletionPolicy&  handleDeletion,
-                                                       wxString&              customDeletionDirectory,
+ReturnSyncConfig::ButtonPressed zen::showSyncConfigDlg(CompareVariant compareVar,
+                                                       SyncConfig&    syncCfg,
                                                        xmlAccess::OnGuiError* handleError) //optional input parameter
 {
     SyncCfgDialog syncDlg(NULL,
                           compareVar,
-                          syncConfiguration,
-                          handleDeletion,
-                          customDeletionDirectory,
+                          syncCfg,
                           handleError);
 
     return static_cast<ReturnSyncConfig::ButtonPressed>(syncDlg.ShowModal());
diff --git a/ui/sync_cfg.h b/ui/sync_cfg.h
index 7612d29b..1b95f53b 100644
--- a/ui/sync_cfg.h
+++ b/ui/sync_cfg.h
@@ -20,10 +20,8 @@ struct ReturnSyncConfig
     };
 };
 
-ReturnSyncConfig::ButtonPressed showSyncConfigDlg(zen::CompareVariant   compareVar,
-                                                  zen::SyncConfig&      syncConfiguration,
-                                                  zen::DeletionPolicy&  handleDeletion,
-                                                  wxString&              customDeletionDirectory,
+ReturnSyncConfig::ButtonPressed showSyncConfigDlg(CompareVariant compareVar,
+                                                  SyncConfig&    syncCfg,
                                                   xmlAccess::OnGuiError* handleError); //optional input parameter
 }
 
diff --git a/ui/tray_icon.cpp b/ui/tray_icon.cpp
index 90893c9f..96ae47e6 100644
--- a/ui/tray_icon.cpp
+++ b/ui/tray_icon.cpp
@@ -13,6 +13,7 @@
 #include <wx/image.h>
 #include <wx/menu.h>
 #include <wx/icon.h> //req. by Linux
+#include "../shared/image_tools.h"
 
 
 const wxEventType FFS_REQUEST_RESUME_TRAY_EVENT = wxNewEventType();
@@ -47,16 +48,16 @@ void fillRange(wxImage& img, int pixelFirst, int pixelLast, const wxColor& col)
     }
 }
 
-wxIcon generateIcon(double percent) //generate icon with progress indicator
+wxIcon generateIcon(double fraction) //generate icon with progress indicator
 {
 #ifdef FFS_WIN
-    static const wxBitmap trayIcon = GlobalResources::instance().getImage(wxT("FFS_tray_win.png"));
+    static const wxBitmap trayIcon = GlobalResources::getImage(wxT("FFS_tray_win.png"));
 #elif defined FFS_LINUX
-    static const wxBitmap trayIcon = GlobalResources::instance().getImage(wxT("FFS_tray_linux.png"));
+    static const wxBitmap trayIcon = GlobalResources::getImage(wxT("FFS_tray_linux.png"));
 #endif
 
     const int pixelCount = trayIcon.GetWidth() * trayIcon.GetHeight();
-    const int startFillPixel = std::min(roundNum(percent / 100.0 * pixelCount), pixelCount);
+    const int startFillPixel = std::min(roundNum(fraction * pixelCount), pixelCount);
 
     //minor optimization
     static std::pair<int, wxIcon> buffer = std::make_pair(-1, wxNullIcon);
@@ -65,74 +66,81 @@ wxIcon generateIcon(double percent) //generate icon with progress indicator
 
     wxIcon genIcon;
 
-    wxImage genImage(trayIcon.ConvertToImage());
-    if (genImage.GetWidth()  > 0 &&
-        genImage.GetHeight() > 0)
     {
-        //fill black border row
-        if (startFillPixel <= pixelCount - genImage.GetWidth())
-        {
-            /*
-                    --------
-                    ---bbbbb
-                    bbbbSyyy  S : start yellow remainder
-                    yyyyyyyy
-            */
-            int bStart = startFillPixel - genImage.GetWidth();
-            if (bStart % genImage.GetWidth() != 0) //add one more black pixel, see ascii-art
-                --bStart;
-            fillRange(genImage, std::max(bStart, 0), startFillPixel, *wxBLACK);
-        }
-        else if (startFillPixel != pixelCount)
-        {
-            //special handling for last row
-            /*
-                    --------
-                    --------
-                    ---bbbbb
-                    ---bSyyy  S : start yellow remainder
-            */
-            int bStart = startFillPixel - genImage.GetWidth() - 1;
-            int bEnd = (bStart / genImage.GetWidth() + 1) * (genImage.GetWidth());
+        wxImage genImage(trayIcon.ConvertToImage());
 
-            fillRange(genImage, std::max(bStart, 0), bEnd, *wxBLACK);
-            fillRange(genImage, startFillPixel - 1, startFillPixel, *wxBLACK);
-        }
+        //gradually make FFS icon brighter while nearing completion
+        zen::brighten(genImage, -200 * (1 - fraction));
 
-        //fill yellow remainder
-        fillRange(genImage, startFillPixel, pixelCount, wxColour(240, 200, 0));
+        //progress bar
+        if (genImage.GetWidth()  > 0 &&
+            genImage.GetHeight() > 0)
+        {
+            //fill black border row
+            if (startFillPixel <= pixelCount - genImage.GetWidth())
+            {
+                /*
+                        --------
+                        ---bbbbb
+                        bbbbSyyy  S : start yellow remainder
+                        yyyyyyyy
+                */
+                int bStart = startFillPixel - genImage.GetWidth();
+                if (bStart % genImage.GetWidth() != 0) //add one more black pixel, see ascii-art
+                    --bStart;
+                fillRange(genImage, std::max(bStart, 0), startFillPixel, *wxBLACK);
+            }
+            else if (startFillPixel != pixelCount)
+            {
+                //special handling for last row
+                /*
+                        --------
+                        --------
+                        ---bbbbb
+                        ---bSyyy  S : start yellow remainder
+                */
+                int bStart = startFillPixel - genImage.GetWidth() - 1;
+                int bEnd = (bStart / genImage.GetWidth() + 1) * (genImage.GetWidth());
+
+                fillRange(genImage, std::max(bStart, 0), bEnd, *wxBLACK);
+                fillRange(genImage, startFillPixel - 1, startFillPixel, *wxBLACK);
+            }
+
+            //fill yellow remainder
+            fillRange(genImage, startFillPixel, pixelCount, wxColour(240, 200, 0));
 
-        /*
-                const int indicatorWidth  = genImage.GetWidth() * .4;
-                const int indicatorXBegin = std::ceil((genImage.GetWidth() - indicatorWidth) / 2.0);
-                const int indicatorYBegin = genImage.GetHeight() - indicatorHeight;
+            /*
+                    const int indicatorWidth  = genImage.GetWidth() * .4;
+                    const int indicatorXBegin = std::ceil((genImage.GetWidth() - indicatorWidth) / 2.0);
+                    const int indicatorYBegin = genImage.GetHeight() - indicatorHeight;
 
-                //draw progress indicator: do NOT use wxDC::DrawRectangle! Doesn't respect alpha in Windows, but does in Linux!
-                //We need a simple, working solution:
+                    //draw progress indicator: do NOT use wxDC::DrawRectangle! Doesn't respect alpha in Windows, but does in Linux!
+                    //We need a simple, working solution:
 
-                for (int row = indicatorYBegin;  row < genImage.GetHeight(); ++row)
-                {
-                    for (int col = indicatorXBegin;  col < indicatorXBegin + indicatorWidth; ++col)
+                    for (int row = indicatorYBegin;  row < genImage.GetHeight(); ++row)
                     {
-                        unsigned char* const pixelBegin = data + (row * genImage.GetWidth() + col) * 3;
-                        pixelBegin[0] = 240; //red
-                        pixelBegin[1] = 200; //green
-                        pixelBegin[2] = 0;   //blue
+                        for (int col = indicatorXBegin;  col < indicatorXBegin + indicatorWidth; ++col)
+                        {
+                            unsigned char* const pixelBegin = data + (row * genImage.GetWidth() + col) * 3;
+                            pixelBegin[0] = 240; //red
+                            pixelBegin[1] = 200; //green
+                            pixelBegin[2] = 0;   //blue
+                        }
                     }
-                }
 
-                if (genImage.HasAlpha())
-                {
-                    unsigned char* const alpha = genImage.GetAlpha();
-                    //make progress indicator fully opaque:
-                    for (int row = indicatorYBegin;  row < genImage.GetHeight(); ++row)
-                        ::memset(alpha + row * genImage.GetWidth() + indicatorXBegin, wxIMAGE_ALPHA_OPAQUE, indicatorWidth);
-                }
-        */
-        genIcon.CopyFromBitmap(wxBitmap(genImage));
+                    if (genImage.HasAlpha())
+                    {
+                        unsigned char* const alpha = genImage.GetAlpha();
+                        //make progress indicator fully opaque:
+                        for (int row = indicatorYBegin;  row < genImage.GetHeight(); ++row)
+                            ::memset(alpha + row * genImage.GetWidth() + indicatorXBegin, wxIMAGE_ALPHA_OPAQUE, indicatorWidth);
+                    }
+            */
+            genIcon.CopyFromBitmap(wxBitmap(genImage));
+        }
+        else //fallback
+            genIcon.CopyFromBitmap(trayIcon);
     }
-    else //fallback
-        genIcon.CopyFromBitmap(trayIcon);
 
     //fill buffer
     buffer.first  = startFillPixel;
@@ -197,9 +205,9 @@ FfsTrayIcon::~FfsTrayIcon()
 }
 
 
-void FfsTrayIcon::setToolTip(const wxString& toolTipText, double percent)
+void FfsTrayIcon::setToolTip2(const wxString& toolTipText, double fraction)
 {
-    trayIcon->SetIcon(generateIcon(percent), toolTipText);
+    trayIcon->SetIcon(generateIcon(fraction), toolTipText);
 }
 
 
diff --git a/ui/tray_icon.h b/ui/tray_icon.h
index a615c091..30405465 100644
--- a/ui/tray_icon.h
+++ b/ui/tray_icon.h
@@ -19,7 +19,7 @@ public:
     FfsTrayIcon();
     ~FfsTrayIcon();
 
-    void setToolTip(const wxString& toolTipText, double percent = 0); //percent (optional), number between [0, 100], for small progress indicator
+    void setToolTip2(const wxString& toolTipText, double fraction = 0); //number between [0, 1], for small progress indicator
 
 private:
     FfsTrayIcon(const FfsTrayIcon&);