3.8

16 files changed, 5259 insertions, 4715 deletions

diff --git a/ui/MainDialog.cpp b/ui/MainDialog.cpp
index 976b9bdb..ce7129aa 100644
--- a/ui/MainDialog.cpp
+++ b/ui/MainDialog.cpp
@@ -10,6 +10,7 @@
 #include "../shared/systemConstants.h"
 #include <wx/clipbrd.h>
 #include <wx/dataobj.h>
+#include <iterator>
 #include <wx/ffile.h>
 #include "../library/customGrid.h"
 #include "../shared/customButton.h"
@@ -48,6 +49,7 @@
 #include "../shared/helpProvider.h"
 #include "isNullFilter.h"
 #include "batchConfig.h"
+#include "../shared/checkExist.h"
 
 using namespace FreeFileSync;
 using FreeFileSync::CustomLocale;
@@ -312,6 +314,21 @@ void MainDialog::init(const xmlAccess::XmlGuiConfig guiCfg,
 {
     wxWindowUpdateLocker dummy(this); //avoid display distortion
 
+    //--------- avoid mirroring this dialog in RTL languages like Hebrew or Arabic --------------------
+    m_panelViewFilter->SetLayoutDirection(wxLayout_LeftToRight);
+    m_panelStatusBar->SetLayoutDirection(wxLayout_LeftToRight);
+//           if (GetLayoutDirection() == wxLayout_RightToLeft)
+//{
+//    bSizerGridHolder->Detach(m_panelRight);
+//    bSizerGridHolder->Detach(m_panelLeft);
+//    bSizerGridHolder->Add(m_panelLeft);
+//    bSizerGridHolder->Prepend(m_panelRight);
+//bSizerGridHolder->Fit(this);
+//
+//    bSizerGridHolder->Layout();
+//}
+//------------------------------------------------------------------------------------------------------
+
     globalSettings = &settings;
     gridDataView.reset(new FreeFileSync::GridView);
     contextMenu.reset(new wxMenu); //initialize right-click context menu; will be dynamically re-created on each R-mouse-click
@@ -320,20 +337,19 @@ void MainDialog::init(const xmlAccess::XmlGuiConfig guiCfg,
     cleanedUp = false;
     lastSortColumn = -1;
     lastSortGrid = NULL;
-#ifdef FFS_WIN
+
     updateFileIcons.reset(new IconUpdater(m_gridLeft, m_gridRight));
+
+#ifdef FFS_WIN
     moveWholeWindow.reset(new MouseMoveWindow(this));
 #endif
     syncPreview.reset(new SyncPreview(this));
 
     SetTitle(wxString(wxT("FreeFileSync - ")) + _("Folder Comparison and Synchronization"));
 
-    //avoid mirroring this dialog in RTL languages like Hebrew or Arabic
-    SetLayoutDirection(wxLayout_LeftToRight);
-    m_panelStatusBar->SetLayoutDirection(wxLayout_LeftToRight);
-
     SetIcon(*GlobalResources::getInstance().programIcon); //set application icon
 
+
     //notify about (logical) application main window => program won't quit, but stay on this dialog
     FreeFileSync::AppMainWindow::setMainWindow(this);
 
@@ -477,6 +493,10 @@ void MainDialog::cleanUp(bool saveLastUsedConfig)
 
         //no need for wxEventHandler::Disconnect() here; done automatically when window is destoyed!
 
+        m_gridLeft  ->release(); //handle wxGrid-related callback on grid data after MainDialog has died... (Linux only)
+        m_gridMiddle->release();
+        m_gridRight ->release();
+
         //save configuration
         if (saveLastUsedConfig)
             writeConfigurationToXml(lastConfigFileName());   //don't throw exceptions in destructors
@@ -525,10 +545,8 @@ void MainDialog::readGlobalSettings()
         addRightFolderToHistory(*i);
 
     //show/hide file icons
-#ifdef FFS_WIN
     m_gridLeft->enableFileIcons(globalSettings->gui.showFileIconsLeft);
     m_gridRight->enableFileIcons(globalSettings->gui.showFileIconsRight);
-#endif
 
     //set selected tab
     m_notebookBottomLeft->ChangeSelection(globalSettings->gui.selectedTabBottomLeft);
@@ -749,8 +767,8 @@ public:
         if (updateUiIsAllowed())  //test if specific time span between ui updates is over
         {
             wxString statusMessage = _("%x / %y objects deleted successfully");
-            statusMessage.Replace(wxT("%x"), FreeFileSync::numberToWxString(deletionCount, true), false);
-            statusMessage.Replace(wxT("%y"), FreeFileSync::numberToWxString(totalObjToDelete, true), false);
+            statusMessage.Replace(wxT("%x"), FreeFileSync::numberToStringSep(deletionCount), false);
+            statusMessage.Replace(wxT("%y"), FreeFileSync::numberToStringSep(totalObjToDelete), false);
 
             mainDlg->m_staticTextStatusMiddle->SetLabel(statusMessage);
             mainDlg->m_panelStatusBar->Layout();
@@ -841,16 +859,29 @@ void exstractNames(const FileSystemObject& fsObj, wxString& name, wxString& dir)
 {
     if (!fsObj.isEmpty<side>())
     {
-        if (isDirectoryMapping(fsObj))
-        {
-            name = zToWx(fsObj.getFullName<side>());
-            dir  = name;
-        }
-        else
+        struct GetNames : public FSObjectVisitor
         {
-            name = zToWx(fsObj.getFullName<side>());
-            dir  = zToWx(fsObj.getFullName<side>().BeforeLast(globalFunctions::FILE_NAME_SEPARATOR));
-        }
+            GetNames(wxString& nameIn, wxString& dirIn) : name_(nameIn), dir_(dirIn) {}
+            virtual void visit(const FileMapping& fileObj)
+            {
+                name_ = zToWx(fileObj.getFullName<side>());
+                dir_  = zToWx(fileObj.getFullName<side>().BeforeLast(globalFunctions::FILE_NAME_SEPARATOR));
+            }
+            virtual void visit(const SymLinkMapping& linkObj)
+            {
+                name_ = zToWx(linkObj.getFullName<side>());
+                dir_  = zToWx(linkObj.getFullName<side>().BeforeLast(globalFunctions::FILE_NAME_SEPARATOR));
+            }
+            virtual void visit(const DirMapping& dirObj)
+            {
+                dir_  = name_ = zToWx(dirObj.getFullName<side>());
+            }
+
+            wxString& name_;
+            wxString& dir_;
+            ;
+        } getNames(name, dir);
+        fsObj.accept(getNames);
     }
     else
     {
@@ -1366,19 +1397,40 @@ void MainDialog::OnContextRim(wxGridEvent& event)
     //###############################################################################################
     //get list of relative file/dir-names for filtering
     FilterObjList exFilterCandidateObj;
+
+    class AddFilter : public FSObjectVisitor
+    {
+    public:
+        AddFilter(FilterObjList& fl) : filterList_(fl) {}
+        virtual void visit(const FileMapping& fileObj)
+        {
+            filterList_.push_back(FilterObject(fileObj.getObjRelativeName(), false));
+        }
+        virtual void visit(const SymLinkMapping& linkObj)
+        {
+            filterList_.push_back(FilterObject(linkObj.getObjRelativeName(), false));
+        }
+        virtual void visit(const DirMapping& dirObj)
+        {
+            filterList_.push_back(FilterObject(dirObj.getObjRelativeName(), true));
+        }
+
+    private:
+        FilterObjList& filterList_;
+    } newFilterEntry(exFilterCandidateObj);
+
+
     for (std::set<size_t>::const_iterator i = selectionLeft.begin(); i != selectionLeft.end(); ++i)
     {
         const FileSystemObject* currObj = gridDataView->getObject(*i);
         if (currObj && !currObj->isEmpty<LEFT_SIDE>())
-            exFilterCandidateObj.push_back(
-                FilterObject(currObj->getRelativeName<LEFT_SIDE>(), isDirectoryMapping(*currObj)));
+            currObj->accept(newFilterEntry);
     }
     for (std::set<size_t>::const_iterator i = selectionRight.begin(); i != selectionRight.end(); ++i)
     {
         const FileSystemObject* currObj = gridDataView->getObject(*i);
         if (currObj && !currObj->isEmpty<RIGHT_SIDE>())
-            exFilterCandidateObj.push_back(
-                FilterObject(currObj->getRelativeName<RIGHT_SIDE>(), isDirectoryMapping(*currObj)));
+            currObj->accept(newFilterEntry);
     }
     //###############################################################################################
 
@@ -1386,7 +1438,7 @@ void MainDialog::OnContextRim(wxGridEvent& event)
     if (exFilterCandidateObj.size() > 0 && !exFilterCandidateObj[0].isDir)
     {
         const Zstring filename = exFilterCandidateObj[0].relativeName.AfterLast(globalFunctions::FILE_NAME_SEPARATOR);
-        if (filename.Find(wxChar('.'), false) !=  Zstring::npos) //be careful: AfterLast will return the whole string if '.' is not found!
+        if (filename.Find(wxChar('.'), false) !=  Zstring::npos) //be careful: AfterLast would return the whole string if '.' were not found!
         {
             const Zstring extension = filename.AfterLast(DefaultChar('.'));
 
@@ -1506,16 +1558,19 @@ void MainDialog::OnContextExcludeExtension(wxCommandEvent& event)
     SelectedExtension* selExtension = dynamic_cast<SelectedExtension*>(event.m_callbackUserData);
     if (selExtension)
     {
-        Zstring& excludeFilter = currentCfg.mainCfg.globalFilter.excludeFilter;
+        const Zstring newExclude = Zstring(DefaultStr("*.")) + selExtension->extension;
 
+        //add to filter config
+        Zstring& excludeFilter = currentCfg.mainCfg.globalFilter.excludeFilter;
         if (!excludeFilter.empty() && !excludeFilter.EndsWith(DefaultStr(";")))
             excludeFilter += DefaultStr("\n");
-
-        excludeFilter += Zstring(DefaultStr("*.")) + selExtension->extension + DefaultStr(";"); //';' is appended to 'mark' that next exclude extension entry won't write to new line
+        excludeFilter += newExclude + DefaultStr(";"); //';' is appended to 'mark' that next exclude extension entry won't write to new line
 
         updateFilterButtons();
 
-        applyFiltering(getCurrentConfiguration().mainCfg, gridDataView->getDataTentative());
+        //do not fully apply filter, just exclude new items
+        addExcludeFiltering(newExclude, gridDataView->getDataTentative());
+        //applyFiltering(getCurrentConfiguration().mainCfg, gridDataView->getDataTentative());
         updateGuiGrid();
 
         if (currentCfg.hideFilteredElements)
@@ -1535,22 +1590,28 @@ void MainDialog::OnContextExcludeObject(wxCommandEvent& event)
     {
         if (objCont->selectedObjects.size() > 0) //check needed to determine if filtering is needed
         {
+            Zstring newExclude;
             for (std::vector<FilterObject>::const_iterator i = objCont->selectedObjects.begin(); i != objCont->selectedObjects.end(); ++i)
             {
-                Zstring& excludeFilter = currentCfg.mainCfg.globalFilter.excludeFilter;
-
-                if (!excludeFilter.empty() && !excludeFilter.EndsWith(DefaultStr("\n")))
-                    excludeFilter += DefaultStr("\n");
+                if (i != objCont->selectedObjects.begin())
+                    newExclude += DefaultStr("\n");
 
-                if (!i->isDir)
-                    excludeFilter += Zstring() + globalFunctions::FILE_NAME_SEPARATOR + i->relativeName;
-                else
-                    excludeFilter += Zstring() + globalFunctions::FILE_NAME_SEPARATOR + i->relativeName + globalFunctions::FILE_NAME_SEPARATOR;
+                newExclude += globalFunctions::FILE_NAME_SEPARATOR + i->relativeName;
+                if (i->isDir)
+                    newExclude += globalFunctions::FILE_NAME_SEPARATOR;
             }
 
+            //add to filter config
+            Zstring& excludeFilter = currentCfg.mainCfg.globalFilter.excludeFilter;
+            if (!excludeFilter.empty() && !excludeFilter.EndsWith(DefaultStr("\n")))
+                excludeFilter += DefaultStr("\n");
+            excludeFilter += newExclude;
+
             updateFilterButtons();
 
-            applyFiltering(getCurrentConfiguration().mainCfg, gridDataView->getDataTentative());
+            //do not fully apply filter, just exclude new items
+            addExcludeFiltering(newExclude, gridDataView->getDataTentative());
+            //applyFiltering(getCurrentConfiguration().mainCfg, gridDataView->getDataTentative());
             updateGuiGrid();
 
             if (currentCfg.hideFilteredElements)
@@ -1812,7 +1873,7 @@ private:
 void MainDialog::addFileToCfgHistory(const wxString& filename)
 {
     //only (still) existing files should be included in the list
-    if (!fileExists(wxToZ(filename)))
+    if (Utility::fileExists(wxToZ(filename), 200) == Utility::EXISTING_FALSE) //potentially slow network access: wait 200ms
         return;
 
     std::vector<wxString>::const_iterator i = find_if(cfgFileNames.begin(), cfgFileNames.end(), FindDuplicates(wxToZ(filename)));
@@ -2535,8 +2596,7 @@ void MainDialog::OnCompare(wxCommandEvent &event)
         CompareStatusHandler statusHandler(this);
 
         //begin comparison
-        FreeFileSync::CompareProcess comparison(currentCfg.mainCfg.processSymlinks,
-                                                currentCfg.mainCfg.traverseDirectorySymlinks,
+        FreeFileSync::CompareProcess comparison(currentCfg.mainCfg.handleSymlinks,
                                                 currentCfg.mainCfg.hidden.fileTimeTolerance,
                                                 globalSettings->ignoreOneHourDiff,
                                                 globalSettings->optDialogs,
@@ -2595,18 +2655,17 @@ void MainDialog::OnCompare(wxCommandEvent &event)
         //refresh grid in ANY case! (also on abort)
         updateGuiGrid();
 
+        //prepare status information
+        wxString statusInfo;
         if (allElementsEqual(gridDataView->getDataTentative()))
-            pushStatusInformation(_("All directories in sync!"));
+            statusInfo += _("All directories in sync!");
+        pushStatusInformation(statusInfo);
     }
 }
 
 
 void MainDialog::updateGuiGrid()
 {
-    m_gridLeft  ->BeginBatch(); //necessary??
-    m_gridMiddle->BeginBatch();
-    m_gridRight ->BeginBatch();
-
     updateGridViewData(); //update gridDataView and write status information
 
     //all three grids retrieve their data directly via gridDataView
@@ -2638,9 +2697,9 @@ void MainDialog::updateGuiGrid()
     //update sync preview statistics
     calculatePreview();
 
-    m_gridLeft  ->EndBatch();
-    m_gridMiddle->EndBatch();
-    m_gridRight ->EndBatch();
+    m_gridLeft  ->Refresh();
+    m_gridMiddle->Refresh();
+    m_gridRight ->Refresh();
 }
 
 
@@ -2648,9 +2707,9 @@ void MainDialog::calculatePreview()
 {
     //update preview of bytes to be transferred:
     const SyncStatistics st(gridDataView->getDataTentative());
-    const wxString toCreate = FreeFileSync::numberToWxString(st.getCreate(),    true);
-    const wxString toUpdate = FreeFileSync::numberToWxString(st.getOverwrite(), true);
-    const wxString toDelete = FreeFileSync::numberToWxString(st.getDelete(),    true);
+    const wxString toCreate = FreeFileSync::numberToStringSep(st.getCreate());
+    const wxString toUpdate = FreeFileSync::numberToStringSep(st.getOverwrite());
+    const wxString toDelete = FreeFileSync::numberToStringSep(st.getDelete());
     const wxString data     = FreeFileSync::formatFilesizeToShortString(st.getDataToProcess());
 
     m_textCtrlCreate->SetValue(toCreate);
@@ -2690,9 +2749,7 @@ void MainDialog::OnCmpSettings(wxCommandEvent& event)
 
     if (FreeFileSync::showCompareCfgDialog(windowPos,
                                            currentCfg.mainCfg.compareVar,
-                                           currentCfg.mainCfg.processSymlinks,
-                                           currentCfg.mainCfg.traverseDirectorySymlinks,
-                                           currentCfg.mainCfg.copyFileSymlinks) == DefaultReturnCode::BUTTON_OKAY)
+                                           currentCfg.mainCfg.handleSymlinks) == DefaultReturnCode::BUTTON_OKAY)
     {
         //update compare variant name
         m_staticTextCmpVariant->SetLabel(wxString(wxT("(")) + getVariantName(currentCfg.mainCfg.compareVar) + wxT(")"));
@@ -2732,13 +2789,6 @@ void MainDialog::OnStartSync(wxCommandEvent& event)
         globalSettings->optDialogs.showSummaryBeforeSync = !dontShowAgain;
     }
 
-    //check if there are files/folders to be sync'ed at all
-    if (!synchronizationNeeded(gridDataView->getDataTentative()))
-    {
-        wxMessageBox(_("Nothing to synchronize according to configuration!"), _("Information"), wxICON_WARNING);
-        return;
-    }
-
     wxBusyCursor dummy; //show hourglass cursor
 
     clearStatusBar();
@@ -2749,10 +2799,12 @@ void MainDialog::OnStartSync(wxCommandEvent& event)
         //class handling status updates and error messages
         SyncStatusHandler statusHandler(this, currentCfg.ignoreErrors);
 
+        //check if there are files/folders to be sync'ed at all
+        if (!synchronizationNeeded(gridDataView->getDataTentative()))
+            statusHandler.reportInfo(_("Nothing to synchronize according to configuration!")); //inform about this special case
+
         //start synchronization and mark all elements processed
         FreeFileSync::SyncProcess synchronization(
-            currentCfg.mainCfg.copyFileSymlinks,
-            currentCfg.mainCfg.traverseDirectorySymlinks,
             globalSettings->optDialogs,
             currentCfg.mainCfg.hidden.verifyFileCopy,
             globalSettings->copyLockedFiles,
@@ -2810,42 +2862,49 @@ void MainDialog::OnSortLeftGrid(wxGridEvent& event)
     const int currentSortColumn = event.GetCol();
     if (0 <= currentSortColumn && currentSortColumn < int(xmlAccess::COLUMN_TYPE_COUNT))
     {
-        static bool sortAscending = true;
+        static bool sortDefault = true;
         if (lastSortColumn != currentSortColumn || lastSortGrid != m_gridLeft)
-            sortAscending = true;
+            sortDefault = true;
         else
-            sortAscending = !sortAscending;
+            sortDefault = !sortDefault;
 
         lastSortColumn = currentSortColumn;
         lastSortGrid   = m_gridLeft;
 
-        //start sort
+        GridView::SortType st = GridView::SORT_BY_REL_NAME;
+
         const xmlAccess::ColumnTypes columnType = m_gridLeft->getTypeAtPos(currentSortColumn);
         switch (columnType)
         {
         case xmlAccess::FULL_PATH:
-            gridDataView->sortView(GridView::SORT_BY_REL_NAME, true, sortAscending);
+            st = GridView::SORT_BY_REL_NAME;
             break;
         case xmlAccess::FILENAME:
-            gridDataView->sortView(GridView::SORT_BY_FILENAME, true, sortAscending);
+            st = GridView::SORT_BY_FILENAME;
             break;
         case xmlAccess::REL_PATH:
-            gridDataView->sortView(GridView::SORT_BY_REL_NAME, true, sortAscending);
+            st = GridView::SORT_BY_REL_NAME;
             break;
         case xmlAccess::DIRECTORY:
-            gridDataView->sortView(GridView::SORT_BY_DIRECTORY, true, sortAscending);
+            st = GridView::SORT_BY_DIRECTORY;
             break;
         case xmlAccess::SIZE:
-            gridDataView->sortView(GridView::SORT_BY_FILESIZE, true, sortAscending);
+            st = GridView::SORT_BY_FILESIZE;
             break;
         case xmlAccess::DATE:
-            gridDataView->sortView(GridView::SORT_BY_DATE, true, sortAscending);
+            st = GridView::SORT_BY_DATE;
             break;
         case xmlAccess::EXTENSION:
-            gridDataView->sortView(GridView::SORT_BY_EXTENSION, true, sortAscending);
+            st = GridView::SORT_BY_EXTENSION;
             break;
         }
 
+        const bool sortAscending = sortDefault ?
+                                   GridView::getDefaultDirection(st) :
+                                   !GridView::getDefaultDirection(st);
+
+        gridDataView->sortView(st, true, sortAscending);
+
         updateGuiGrid(); //refresh gridDataView
 
         //set sort direction indicator on UI
@@ -2859,26 +2918,26 @@ void MainDialog::OnSortLeftGrid(wxGridEvent& event)
 void MainDialog::OnSortMiddleGrid(wxGridEvent& event)
 {
     //determine direction for std::sort()
-    static bool sortAscending = true;
+    static bool sortDefault = true;
     if (lastSortColumn != 0 || lastSortGrid != m_gridMiddle)
-        sortAscending = true;
+        sortDefault = true;
     else
-        sortAscending = !sortAscending;
+        sortDefault = !sortDefault;
     lastSortColumn = 0;
     lastSortGrid   = m_gridMiddle;
 
     //start sort
     if (syncPreview->previewIsEnabled())
-        gridDataView->sortView(GridView::SORT_BY_SYNC_DIRECTION, true, sortAscending);
+        gridDataView->sortView(GridView::SORT_BY_SYNC_DIRECTION, true, sortDefault);
     else
-        gridDataView->sortView(GridView::SORT_BY_CMP_RESULT, true, sortAscending);
+        gridDataView->sortView(GridView::SORT_BY_CMP_RESULT, true, sortDefault);
 
     updateGuiGrid(); //refresh gridDataView
 
     //set sort direction indicator on UI
     m_gridLeft->setSortMarker(CustomGrid::SortMarker(-1, CustomGrid::ASCENDING));
     m_gridRight->setSortMarker(CustomGrid::SortMarker(-1, CustomGrid::ASCENDING));
-    m_gridMiddle->setSortMarker(CustomGrid::SortMarker(0, sortAscending ? CustomGrid::ASCENDING : CustomGrid::DESCENDING));
+    m_gridMiddle->setSortMarker(CustomGrid::SortMarker(0, sortDefault ? CustomGrid::ASCENDING : CustomGrid::DESCENDING));
 }
 
 
@@ -2888,42 +2947,49 @@ void MainDialog::OnSortRightGrid(wxGridEvent& event)
     const int currentSortColumn = event.GetCol();
     if (0 <= currentSortColumn && currentSortColumn < int(xmlAccess::COLUMN_TYPE_COUNT))
     {
-        static bool sortAscending = true;
+        static bool sortDefault = true;
         if (lastSortColumn != currentSortColumn || lastSortGrid != m_gridRight)
-            sortAscending = true;
+            sortDefault = true;
         else
-            sortAscending = !sortAscending;
+            sortDefault = !sortDefault;
 
         lastSortColumn = currentSortColumn;
         lastSortGrid   = m_gridRight;
 
-        //start sort
+        GridView::SortType st = GridView::SORT_BY_REL_NAME;
+
         const xmlAccess::ColumnTypes columnType = m_gridRight->getTypeAtPos(currentSortColumn);
         switch (columnType)
         {
         case xmlAccess::FULL_PATH:
-            gridDataView->sortView(GridView::SORT_BY_REL_NAME, false, sortAscending);
+            st = GridView::SORT_BY_REL_NAME;
             break;
         case xmlAccess::FILENAME:
-            gridDataView->sortView(GridView::SORT_BY_FILENAME, false, sortAscending);
+            st = GridView::SORT_BY_FILENAME;
             break;
         case xmlAccess::REL_PATH:
-            gridDataView->sortView(GridView::SORT_BY_REL_NAME, false, sortAscending);
+            st = GridView::SORT_BY_REL_NAME;
             break;
         case xmlAccess::DIRECTORY:
-            gridDataView->sortView(GridView::SORT_BY_DIRECTORY, false, sortAscending);
+            st = GridView::SORT_BY_DIRECTORY;
             break;
         case xmlAccess::SIZE:
-            gridDataView->sortView(GridView::SORT_BY_FILESIZE, false, sortAscending);
+            st = GridView::SORT_BY_FILESIZE;
             break;
         case xmlAccess::DATE:
-            gridDataView->sortView(GridView::SORT_BY_DATE, false, sortAscending);
+            st = GridView::SORT_BY_DATE;
             break;
         case xmlAccess::EXTENSION:
-            gridDataView->sortView(GridView::SORT_BY_EXTENSION, false, sortAscending);
+            st = GridView::SORT_BY_EXTENSION;
             break;
         }
 
+        const bool sortAscending = sortDefault ?
+                                   GridView::getDefaultDirection(st) :
+                                   !GridView::getDefaultDirection(st);
+
+        gridDataView->sortView(st, false, sortAscending);
+
         updateGuiGrid(); //refresh gridDataView
 
         //set sort direction indicator on UI
@@ -3007,7 +3073,6 @@ void MainDialog::updateGridViewData()
     m_bpButtonSyncDirNone->      Show(false);
 
 
-
     if (syncPreview->previewIsEnabled())
     {
         const GridView::StatusSyncPreview result = gridDataView->updateSyncPreview(currentCfg.hideFilteredElements,
@@ -3050,11 +3115,11 @@ void MainDialog::updateGridViewData()
                 m_bpButtonEqual->            IsShown() ||
                 m_bpButtonConflict->         IsShown())
         {
-            m_panel112->Show();
-            m_panel112->Layout();
+            m_panelViewFilter->Show();
+            m_panelViewFilter->Layout();
         }
         else
-            m_panel112->Hide();
+            m_panelViewFilter->Hide();
 
     }
     else
@@ -3092,11 +3157,11 @@ void MainDialog::updateGridViewData()
                 m_bpButtonEqual->     IsShown() ||
                 m_bpButtonConflict->  IsShown())
         {
-            m_panel112->Show();
-            m_panel112->Layout();
+            m_panelViewFilter->Show();
+            m_panelViewFilter->Layout();
         }
         else
-            m_panel112->Hide();
+            m_panelViewFilter->Hide();
     }
 
 
@@ -3120,7 +3185,7 @@ void MainDialog::updateGridViewData()
             statusLeftNew += _("1 directory");
         else
         {
-            wxString folderCount = FreeFileSync::numberToWxString(foldersOnLeftView, true);
+            wxString folderCount = FreeFileSync::numberToStringSep(foldersOnLeftView);
 
             wxString outputString = _("%x directories");
             outputString.Replace(wxT("%x"), folderCount, false);
@@ -3128,26 +3193,26 @@ void MainDialog::updateGridViewData()
         }
 
         if (filesOnLeftView)
-            statusLeftNew += wxT(", ");
+            statusLeftNew += wxT(" - ");
     }
 
     if (filesOnLeftView)
     {
         if (filesOnLeftView == 1)
-            statusLeftNew += _("1 file,");
+            statusLeftNew += _("1 file");
         else
         {
-            wxString fileCount = FreeFileSync::numberToWxString(filesOnLeftView, true);
+            wxString fileCount = FreeFileSync::numberToStringSep(filesOnLeftView);
 
-            wxString outputString = _("%x files,");
+            wxString outputString = _("%x files");
             outputString.Replace(wxT("%x"), fileCount, false);
             statusLeftNew += outputString;
         }
-        statusLeftNew += wxT(" ");
+        statusLeftNew += wxT(" - ");
         statusLeftNew += FreeFileSync::formatFilesizeToShortString(filesizeLeftView);
     }
 
-    const wxString objectsView = FreeFileSync::numberToWxString(gridDataView->rowsOnView(), true);
+    const wxString objectsView = FreeFileSync::numberToStringSep(gridDataView->rowsOnView());
     if (gridDataView->rowsTotal() == 1)
     {
         wxString outputString = _("%x of 1 row in view");
@@ -3156,7 +3221,7 @@ void MainDialog::updateGridViewData()
     }
     else
     {
-        const wxString objectsTotal = FreeFileSync::numberToWxString(gridDataView->rowsTotal(), true);
+        const wxString objectsTotal = FreeFileSync::numberToStringSep(gridDataView->rowsTotal());
 
         wxString outputString = _("%x of %y rows in view");
         outputString.Replace(wxT("%x"), objectsView, false);
@@ -3170,7 +3235,7 @@ void MainDialog::updateGridViewData()
             statusRightNew += _("1 directory");
         else
         {
-            wxString folderCount = FreeFileSync::numberToWxString(foldersOnRightView, true);
+            wxString folderCount = FreeFileSync::numberToStringSep(foldersOnRightView);
 
             wxString outputString = _("%x directories");
             outputString.Replace(wxT("%x"), folderCount, false);
@@ -3178,23 +3243,23 @@ void MainDialog::updateGridViewData()
         }
 
         if (filesOnRightView)
-            statusRightNew += wxT(", ");
+            statusRightNew += wxT(" - ");
     }
 
     if (filesOnRightView)
     {
         if (filesOnRightView == 1)
-            statusRightNew += _("1 file,");
+            statusRightNew += _("1 file");
         else
         {
-            wxString fileCount = FreeFileSync::numberToWxString(filesOnRightView, true);
+            wxString fileCount = FreeFileSync::numberToStringSep(filesOnRightView);
 
-            wxString outputString = _("%x files,");
+            wxString outputString = _("%x files");
             outputString.Replace(wxT("%x"), fileCount, false);
             statusRightNew += outputString;
         }
 
-        statusRightNew += wxT(" ");
+        statusRightNew += wxT(" - ");
         statusRightNew += FreeFileSync::formatFilesizeToShortString(filesizeRightView);
     }
 
diff --git a/ui/MainDialog.h b/ui/MainDialog.h
index 3142cab8..744a95da 100644
--- a/ui/MainDialog.h
+++ b/ui/MainDialog.h
@@ -93,7 +93,7 @@ private:
               xmlAccess::XmlGlobalSettings& settings,
               bool startComparison);
 
-void cleanUp(bool saveLastUsedConfig);
+    void cleanUp(bool saveLastUsedConfig);
 
     //configuration load/save
     bool readConfigurationFromXml(const wxString& filename);
@@ -296,7 +296,7 @@ void cleanUp(bool saveLastUsedConfig);
     //compare status panel (hidden on start, shown when comparing)
     std::auto_ptr<CompareStatus> compareStatus; //always bound
 
-bool cleanedUp;
+    bool cleanedUp;
 
     //save the last used config filename history
     std::vector<wxString> cfgFileNames;
@@ -306,10 +306,10 @@ bool cleanedUp;
     int lastSortColumn;
     const wxGrid* lastSortGrid;
 
-#ifdef FFS_WIN
     //update icons periodically: one updater instance for both left and right grids
     std::auto_ptr<IconUpdater> updateFileIcons;
 
+#ifdef FFS_WIN
     //enable moving window by clicking on sub-windows instead of header line
     std::auto_ptr<FreeFileSync::MouseMoveWindow> moveWholeWindow;
 #endif
diff --git a/ui/SmallDialogs.cpp b/ui/SmallDialogs.cpp
index 04456024..aa858454 100644
--- a/ui/SmallDialogs.cpp
+++ b/ui/SmallDialogs.cpp
@@ -63,7 +63,7 @@ AboutDlg::AboutDlg(wxWindow* window) : AboutDlgGenerated(window)
 
 
     //build information
-    wxString build = wxString(wxT("(")) + _("Build:") + wxT(" ") + __TDATE__;
+    wxString build = __TDATE__;
 #if wxUSE_UNICODE
     build += wxT(" - Unicode");
 #else
@@ -72,13 +72,15 @@ AboutDlg::AboutDlg(wxWindow* window) : AboutDlgGenerated(window)
 
     //compile time info about 32/64-bit build
     if (Utility::is64BitBuild)
-        build += wxT(" x64)");
+        build += wxT(" x64");
     else
-        build += wxT(" x86)");
+        build += wxT(" x86");
     assert_static(Utility::is32BitBuild || Utility::is64BitBuild);
 
+    wxString buildFormatted = _("(Build: %x)");
+    buildFormatted.Replace(wxT("%x"), build);
 
-    m_build->SetLabel(build);
+    m_build->SetLabel(buildFormatted);
 
     m_animationControl1->SetAnimation(*GlobalResources::getInstance().animationMoney);
     m_animationControl1->Play();
@@ -368,12 +370,12 @@ void DeleteDialog::updateTexts()
 {
     if (m_checkBoxUseRecycler->GetValue())
     {
-        m_staticTextHeader->SetLabel(_("Do you really want to move the following objects(s) to the Recycle Bin?"));
+        m_staticTextHeader->SetLabel(_("Do you really want to move the following object(s) to the Recycle Bin?"));
         m_bitmap12->SetBitmap(GlobalResources::getInstance().getImageByName(wxT("recycler")));
     }
     else
     {
-        m_staticTextHeader->SetLabel(_("Do you really want to delete the following objects(s)?"));
+        m_staticTextHeader->SetLabel(_("Do you really want to delete the following object(s)?"));
         m_bitmap12->SetBitmap(GlobalResources::getInstance().getImageByName(wxT("deleteFile")));
     }
 
@@ -610,7 +612,7 @@ SyncPreviewDlg::SyncPreviewDlg(wxWindow* parentWindow,
     SyncPreviewDlgGenerated(parentWindow),
     m_dontShowAgain(dontShowAgain)
 {
-    using FreeFileSync::numberToWxString;
+    using FreeFileSync::numberToStringSep;
 
     m_buttonStartSync->setBitmapFront(GlobalResources::getInstance().getImageByName(wxT("startSync")));
     m_bitmapCreate->SetBitmap(GlobalResources::getInstance().getImageByName(wxT("create")));
@@ -621,13 +623,13 @@ SyncPreviewDlg::SyncPreviewDlg(wxWindow* parentWindow,
     m_staticTextVariant->SetLabel(variantName);
     m_textCtrlData->SetValue(FreeFileSync::formatFilesizeToShortString(statistics.getDataToProcess()));
 
-    m_textCtrlCreateL->SetValue(numberToWxString(statistics.getCreate(   true, false), true));
-    m_textCtrlUpdateL->SetValue(numberToWxString(statistics.getOverwrite(true, false), true));
-    m_textCtrlDeleteL->SetValue(numberToWxString(statistics.getDelete(   true, false), true));
+    m_textCtrlCreateL->SetValue(numberToStringSep(statistics.getCreate(   true, false)));
+    m_textCtrlUpdateL->SetValue(numberToStringSep(statistics.getOverwrite(true, false)));
+    m_textCtrlDeleteL->SetValue(numberToStringSep(statistics.getDelete(   true, false)));
 
-    m_textCtrlCreateR->SetValue(numberToWxString(statistics.getCreate(   false, true), true));
-    m_textCtrlUpdateR->SetValue(numberToWxString(statistics.getOverwrite(false, true), true));
-    m_textCtrlDeleteR->SetValue(numberToWxString(statistics.getDelete(   false, true), true));
+    m_textCtrlCreateR->SetValue(numberToStringSep(statistics.getCreate(   false, true)));
+    m_textCtrlUpdateR->SetValue(numberToStringSep(statistics.getOverwrite(false, true)));
+    m_textCtrlDeleteR->SetValue(numberToStringSep(statistics.getDelete(   false, true)));
 
     m_checkBoxDontShowAgain->SetValue(dontShowAgain);
 
@@ -683,9 +685,7 @@ public:
     CompareCfgDialog(wxWindow* parentWindow,
                      const wxPoint& position,
                      FreeFileSync::CompareVariant& cmpVar,
-                     bool& processSymlinks,
-                     bool& traverseDirectorySymlinks,
-                     bool& copyFileSymlinks);
+                     SymLinkHandling& handleSymlinks);
 
     enum
     {
@@ -698,30 +698,66 @@ private:
     void OnCancel(wxCommandEvent& event);
     void OnTimeSize(wxCommandEvent& event);
     void OnContent(wxCommandEvent& event);
-    void OnIncludeSymlinks(wxCommandEvent& event);
-    void OnTraverseDirSymlink(wxCommandEvent& event);
     void OnShowHelp(wxCommandEvent& event);
 
     void updateView();
 
     FreeFileSync::CompareVariant& cmpVarOut;
-    bool& processSymlinksOut;
-    bool& traverseDirectorySymlinksOut;
-    bool& copyFileSymlinksOut;
+    SymLinkHandling& handleSymlinksOut;
 };
 
 
+namespace
+{
+void setValue(wxChoice& choiceCtrl, FreeFileSync::SymLinkHandling value)
+{
+    choiceCtrl.Clear();
+    choiceCtrl.Append(_("Ignore"));
+    choiceCtrl.Append(_("Direct"));
+    choiceCtrl.Append(_("Follow"));
+
+    //default
+    choiceCtrl.SetSelection(0);
+
+    switch (value)
+    {
+    case FreeFileSync::SYMLINK_IGNORE:
+        choiceCtrl.SetSelection(0);
+        break;
+    case FreeFileSync::SYMLINK_USE_DIRECTLY:
+        choiceCtrl.SetSelection(1);
+        break;
+    case FreeFileSync::SYMLINK_FOLLOW_LINK:
+        choiceCtrl.SetSelection(2);
+        break;
+    }
+}
+
+
+FreeFileSync::SymLinkHandling getValue(const wxChoice& choiceCtrl)
+{
+    switch (choiceCtrl.GetSelection())
+    {
+    case 0:
+        return FreeFileSync::SYMLINK_IGNORE;
+    case 1:
+        return FreeFileSync::SYMLINK_USE_DIRECTLY;
+    case 2:
+        return FreeFileSync::SYMLINK_FOLLOW_LINK;
+    default:
+        assert(false);
+        return FreeFileSync::SYMLINK_IGNORE;
+    }
+}
+}
+
 CompareCfgDialog::CompareCfgDialog(wxWindow* parentWindow,
                                    const wxPoint& position,
                                    CompareVariant& cmpVar,
-                                   bool& processSymlinks,
-                                   bool& traverseDirectorySymlinks,
-                                   bool& copyFileSymlinks) :
+                                   SymLinkHandling& handleSymlinks) :
     CmpCfgDlgGenerated(parentWindow),
     cmpVarOut(cmpVar),
-    processSymlinksOut(processSymlinks),
-    traverseDirectorySymlinksOut(traverseDirectorySymlinks),
-    copyFileSymlinksOut(copyFileSymlinks)
+    handleSymlinksOut(handleSymlinks)
 {
     //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)));
@@ -742,9 +778,8 @@ CompareCfgDialog::CompareCfgDialog(wxWindow* parentWindow,
         break;
     }
 
-    m_checkBoxIncludeSymlinks->SetValue(processSymlinksOut);
-//    m_checkBoxTraverseDirSymlink->SetValue(traverseDirectorySymlinksOut);
-//    m_checkBoxCopyFileSymlink->SetValue(copyFileSymlinksOut);
+
+    setValue(*m_choiceHandleSymlinks, handleSymlinks);
 
     updateView();
 }
@@ -761,29 +796,11 @@ void CompareCfgDialog::OnOkay(wxCommandEvent& event)
     else
         cmpVarOut = CMP_BY_TIME_SIZE;
 
-    processSymlinksOut           = m_checkBoxIncludeSymlinks->GetValue();
-//    traverseDirectorySymlinksOut = m_checkBoxTraverseDirSymlink->GetValue();
-//    copyFileSymlinksOut          = m_checkBoxCopyFileSymlink->GetValue();
-
-    //simplify GUI: set reasonable default values for "traverseDirectorySymlinks" and "copyFileSymlinks"
-    traverseDirectorySymlinksOut = true;
-    copyFileSymlinksOut          = false;
+    handleSymlinksOut = getValue(*m_choiceHandleSymlinks);;
 
     EndModal(BUTTON_OKAY);
 }
 
-void CompareCfgDialog::OnIncludeSymlinks(wxCommandEvent& event)
-{
-    updateView();
-    event.Skip();
-}
-
-void CompareCfgDialog::OnTraverseDirSymlink(wxCommandEvent& event)
-{
-    updateView();
-    event.Skip();
-}
-
 
 void CompareCfgDialog::OnClose(wxCloseEvent& event)
 {
@@ -821,11 +838,9 @@ void CompareCfgDialog::OnShowHelp(wxCommandEvent& event)
 DefaultReturnCode::Response FreeFileSync::showCompareCfgDialog(
     const wxPoint& position,
     CompareVariant& cmpVar,
-    bool& processSymlinks,
-    bool& traverseDirectorySymlinks,
-    bool& copyFileSymlinks)
+    SymLinkHandling& handleSymlinks)
 {
-    CompareCfgDialog syncDlg(NULL, position, cmpVar, processSymlinks, traverseDirectorySymlinks, copyFileSymlinks);
+    CompareCfgDialog syncDlg(NULL, position, cmpVar, handleSymlinks);
 
     return syncDlg.ShowModal() == CompareCfgDialog::BUTTON_OKAY ?
            DefaultReturnCode::BUTTON_OKAY :
diff --git a/ui/SmallDialogs.h b/ui/SmallDialogs.h
index 74c12f33..acc69aa3 100644
--- a/ui/SmallDialogs.h
+++ b/ui/SmallDialogs.h
@@ -49,9 +49,7 @@ DefaultReturnCode::Response showSyncPreviewDlg(
 DefaultReturnCode::Response showCompareCfgDialog(
     const wxPoint& position,
     CompareVariant& cmpVar,
-    bool& processSymlinks,
-    bool& traverseDirectorySymlinks,
-    bool& copyFileSymlinks);
+    SymLinkHandling& handleSymlinks);
 
 DefaultReturnCode::Response showGlobalSettingsDlg(xmlAccess::XmlGlobalSettings& globalSettings);
 }
diff --git a/ui/batchConfig.cpp b/ui/batchConfig.cpp
index e58821e4..ef85561e 100644
--- a/ui/batchConfig.cpp
+++ b/ui/batchConfig.cpp
@@ -7,6 +7,7 @@
 #include "batchConfig.h"
 #include "../shared/xmlBase.h"
 #include "folderPair.h"
+#include <iterator>
 #include <wx/wupdlock.h>
 #include "../shared/helpProvider.h"
 #include "../shared/fileHandling.h"
@@ -252,9 +253,7 @@ void BatchDialog::OnCmpSettings(wxCommandEvent& event)
 
     if (FreeFileSync::showCompareCfgDialog(windowPos,
                                            localBatchCfg.mainCfg.compareVar,
-                                           localBatchCfg.mainCfg.processSymlinks,
-                                           localBatchCfg.mainCfg.traverseDirectorySymlinks,
-                                           localBatchCfg.mainCfg.copyFileSymlinks) == DefaultReturnCode::BUTTON_OKAY)
+                                           localBatchCfg.mainCfg.handleSymlinks) == DefaultReturnCode::BUTTON_OKAY)
     {
         updateGui();
     }
diff --git a/ui/batchStatusHandler.cpp b/ui/batchStatusHandler.cpp
index b7589497..6914d9f5 100644
--- a/ui/batchStatusHandler.cpp
+++ b/ui/batchStatusHandler.cpp
@@ -106,7 +106,7 @@ private:
 
         //ensure uniqueness
         for (int i = 1; FreeFileSync::somethingExists(wxToZ(output)); ++i)
-            output = logfileName + wxChar('_') + numberToWxString(i, false) + wxT(".log");
+            output = logfileName + wxChar('_') + globalFunctions::numberToString(i) + wxT(".log");
 
         return output;
     }
@@ -185,7 +185,7 @@ BatchStatusHandler::~BatchStatusHandler()
         if (totalErrors > 0)
         {
             wxString header(_("Warning: Synchronization failed for %x item(s):"));
-            header.Replace(wxT("%x"), FreeFileSync::numberToWxString(totalErrors, true), false);
+            header.Replace(wxT("%x"), FreeFileSync::numberToStringSep(totalErrors), false);
             finalMessage += header + wxT("\n\n");
         }
 
diff --git a/ui/checkVersion.cpp b/ui/checkVersion.cpp
index 7a509204..36d609b1 100644
--- a/ui/checkVersion.cpp
+++ b/ui/checkVersion.cpp
@@ -12,7 +12,6 @@
 #include <wx/utils.h>
 #include <wx/timer.h>
 #include "../shared/globalFunctions.h"
-//#include "smallDialogs.h"
 #include "messagePopup.h"
 #include "../shared/standardPaths.h"
 
@@ -45,13 +44,13 @@ bool getOnlineVersion(wxString& version)
     CloseConnectionOnExit dummy2(httpStream, webAccess);
 
     webAccess.SetHeader(wxT("Content-type"), wxT("text/html; charset=utf-8"));
-    webAccess.SetTimeout(10); //10 seconds of timeout instead of 10 minutes...
+    webAccess.SetTimeout(5); //5 seconds of timeout instead of 10 minutes...
 
     if (webAccess.Connect(wxT("freefilesync.cvs.sourceforge.net"))) //only the server, no pages here yet...
     {
         //wxApp::IsMainLoopRunning(); // should return true
 
-        httpStream = webAccess.GetInputStream(wxT("/viewvc/*checkout*/freefilesync/version/version.txt"));
+        httpStream = webAccess.GetInputStream(wxT("/viewvc/freefilesync/version/version.txt"));
 
         if (httpStream && webAccess.GetError() == wxPROTO_NOERR)
         {
@@ -77,11 +76,13 @@ bool newerVersionExists(const wxString& onlineVersion)
 
     const wxChar VERSION_SEP = wxT('.');
 
+    using globalFunctions::stringToNumber;
+
     while ( currentVersionCpy.Find(VERSION_SEP) != wxNOT_FOUND ||
             onlineVersionCpy.Find(VERSION_SEP) != wxNOT_FOUND)
     {
-        const int currentMajor = globalFunctions::wxStringToInt(currentVersionCpy.BeforeFirst(VERSION_SEP));  //Returns the whole string if VERSION_SEP is not found.
-        const int onlineMajor  = globalFunctions::wxStringToInt(onlineVersionCpy.BeforeFirst(VERSION_SEP));   //Returns the whole string if VERSION_SEP is not found.
+        const int currentMajor = stringToNumber<int>(currentVersionCpy.BeforeFirst(VERSION_SEP));  //Returns the whole string if VERSION_SEP is not found.
+        const int onlineMajor  = stringToNumber<int>(onlineVersionCpy.BeforeFirst(VERSION_SEP));   //Returns the whole string if VERSION_SEP is not found.
 
         if (currentMajor != onlineMajor)
             return currentMajor < onlineMajor;
@@ -90,7 +91,7 @@ bool newerVersionExists(const wxString& onlineVersion)
         onlineVersionCpy  = onlineVersionCpy.AfterFirst(VERSION_SEP);  //Returns the empty string if VERSION_SEP is not found.
     }
 
-    return globalFunctions::wxStringToInt(currentVersionCpy) < globalFunctions::wxStringToInt(onlineVersionCpy);
+    return stringToNumber<int>(currentVersionCpy) < stringToNumber<int>(onlineVersionCpy);
 }
 
 
diff --git a/ui/gridView.cpp b/ui/gridView.cpp
index b1ecb9eb..b3b1f2ae 100644
--- a/ui/gridView.cpp
+++ b/ui/gridView.cpp
@@ -27,6 +27,50 @@ GridView::StatusCmpResult::StatusCmpResult() :
     foldersOnRightView(0) {}
 
 
+template <class StatusResult>
+void getNumbers(const FileSystemObject& fsObj, StatusResult& result)
+{
+    struct GetValues : public FSObjectVisitor
+    {
+        GetValues(StatusResult& res) : result_(res) {}
+
+        virtual void visit(const FileMapping& fileObj)
+        {
+            if (!fileObj.isEmpty<LEFT_SIDE>())
+            {
+                result_.filesizeLeftView += fileObj.getFileSize<LEFT_SIDE>();
+                ++result_.filesOnLeftView;
+            }
+            if (!fileObj.isEmpty<RIGHT_SIDE>())
+            {
+                result_.filesizeRightView += fileObj.getFileSize<RIGHT_SIDE>();
+                ++result_.filesOnRightView;
+            }
+        }
+
+        virtual void visit(const SymLinkMapping& linkObj)
+        {
+            if (!linkObj.isEmpty<LEFT_SIDE>())
+                ++result_.filesOnLeftView;
+
+            if (!linkObj.isEmpty<RIGHT_SIDE>())
+                ++result_.filesOnRightView;
+        }
+
+        virtual void visit(const DirMapping& dirObj)
+        {
+            if (!dirObj.isEmpty<LEFT_SIDE>())
+                ++result_.foldersOnLeftView;
+
+            if (!dirObj.isEmpty<RIGHT_SIDE>())
+                ++result_.foldersOnRightView;
+        }
+        StatusResult& result_;
+    } getVal(result);
+    fsObj.accept(getVal);
+}
+
+
 GridView::StatusCmpResult GridView::updateCmpResult(bool hideFiltered, //maps sortedRef to viewRef
         bool leftOnlyFilesActive,
         bool rightOnlyFilesActive,
@@ -82,28 +126,7 @@ GridView::StatusCmpResult GridView::updateCmpResult(bool hideFiltered, //maps so
             }
 
             //calculate total number of bytes for each side
-            const FileMapping* fileObj = dynamic_cast<const FileMapping*>(fsObj);
-            if (fileObj)
-            {
-                if (!fileObj->isEmpty<LEFT_SIDE>())
-                {
-                    output.filesizeLeftView += fileObj->getFileSize<LEFT_SIDE>();
-                    ++output.filesOnLeftView;
-                }
-                if (!fileObj->isEmpty<RIGHT_SIDE>())
-                {
-                    output.filesizeRightView += fileObj->getFileSize<RIGHT_SIDE>();
-                    ++output.filesOnRightView;
-                }
-            }
-            else
-            {
-                if (!fsObj->isEmpty<LEFT_SIDE>())
-                    ++output.foldersOnLeftView;
-
-                if (!fsObj->isEmpty<RIGHT_SIDE>())
-                    ++output.foldersOnRightView;
-            }
+            getNumbers(*fsObj, output);
 
             viewRef.push_back(*j);
         }
@@ -196,28 +219,7 @@ GridView::StatusSyncPreview GridView::updateSyncPreview(bool hideFiltered, //map
             }
 
             //calculate total number of bytes for each side
-            const FileMapping* fileObj = dynamic_cast<const FileMapping*>(fsObj);
-            if (fileObj)
-            {
-                if (!fileObj->isEmpty<LEFT_SIDE>())
-                {
-                    output.filesizeLeftView += fileObj->getFileSize<LEFT_SIDE>();
-                    ++output.filesOnLeftView;
-                }
-                if (!fileObj->isEmpty<RIGHT_SIDE>())
-                {
-                    output.filesizeRightView += fileObj->getFileSize<RIGHT_SIDE>();
-                    ++output.filesOnRightView;
-                }
-            }
-            else
-            {
-                if (!fsObj->isEmpty<LEFT_SIDE>())
-                    ++output.foldersOnLeftView;
-
-                if (!fsObj->isEmpty<RIGHT_SIDE>())
-                    ++output.foldersOnRightView;
-            }
+            getNumbers(*fsObj, output);
 
             viewRef.push_back(*j);
         }
@@ -279,6 +281,9 @@ public:
         //add file references
         std::for_each(hierObj.useSubFiles().begin(), hierObj.useSubFiles().end(), *this);
 
+        //add symlink references
+        std::for_each(hierObj.useSubLinks().begin(), hierObj.useSubLinks().end(), *this);
+
         //add dir references
         std::for_each(hierObj.useSubDirs().begin(), hierObj.useSubDirs().end(), *this);
     }
@@ -288,6 +293,11 @@ public:
         sortedRef_.push_back(RefIndex(index_, fileObj.getId()));
     }
 
+    void operator()(const SymLinkMapping& linkObj)
+    {
+        sortedRef_.push_back(RefIndex(index_, linkObj.getId()));
+    }
+
     void operator()(const DirMapping& dirObj)
     {
         sortedRef_.push_back(RefIndex(index_, dirObj.getId()));
@@ -486,7 +496,28 @@ private:
 };
 
 //-------------------------------------------------------------------------------------------------------
-void GridView::sortView(const SortType type, const bool onLeft, const bool ascending)
+bool GridView::getDefaultDirection(SortType type) //true: ascending; false: descending
+{
+    switch (type)
+    {
+    case SORT_BY_FILESIZE:
+    case SORT_BY_DATE:
+        return false;
+
+    case SORT_BY_REL_NAME:
+    case SORT_BY_FILENAME:
+    case SORT_BY_EXTENSION:
+    case SORT_BY_CMP_RESULT:
+    case SORT_BY_DIRECTORY:
+    case SORT_BY_SYNC_DIRECTION:
+        return true;
+    }
+    assert(false);
+    return true;
+}
+
+
+void GridView::sortView(SortType type, bool onLeft, bool ascending)
 {
     viewRef.clear();
 
diff --git a/ui/gridView.h b/ui/gridView.h
index 53ca017b..c0639d2e 100644
--- a/ui/gridView.h
+++ b/ui/gridView.h
@@ -111,7 +111,9 @@ public:
         SORT_BY_SYNC_DIRECTION
     };
 
-    void sortView(const SortType type, const bool onLeft, const bool ascending); //always call this method for sorting, never sort externally!
+    bool static getDefaultDirection(SortType type); //true: ascending; false: descending
+
+    void sortView(SortType type, bool onLeft, bool ascending); //always call this method for sorting, never sort externally!
 
 private:
     class SerializeHierarchy;
diff --git a/ui/guiGenerated.cpp b/ui/guiGenerated.cpp
index 9b2f8145..920484ea 100644
--- a/ui/guiGenerated.cpp
+++ b/ui/guiGenerated.cpp
@@ -16,900 +16,899 @@
 
 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("ALT-C"), wxEmptyString, wxITEM_NORMAL );
-	m_menuFile->Append( m_menuItem10 );
-	
-	m_menuItem11 = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("2. &Synchronize...") ) + wxT('\t') + wxT("ALT-S"), wxEmptyString, wxITEM_NORMAL );
-	m_menuFile->Append( m_menuItem11 );
-	
-	m_menuFile->AppendSeparator();
-	
-	m_menuItemSwitchView = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("S&witch view") ) + wxT('\t') + wxT("ALT-W"), wxEmptyString, wxITEM_NORMAL );
-	m_menuFile->Append( m_menuItemSwitchView );
-	
-	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-L"), wxEmptyString, wxITEM_NORMAL );
-	m_menuFile->Append( m_menuItemLoad );
-	
-	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, _("&File") );
-	
-	m_menuAdvanced = new wxMenu();
-	m_menuLanguages = new wxMenu();
-	m_menuAdvanced->Append( -1, _("&Language"), m_menuLanguages );
-	
-	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 );
-	
-	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 );
-	
-	bSizer1 = new wxBoxSizer( wxVERTICAL );
-	
-	m_panel71 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxRAISED_BORDER|wxTAB_TRAVERSAL );
-	bSizer6 = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizer6->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_panel71, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextCmpVariant->Wrap( -1 );
-	m_staticTextCmpVariant->SetFont( wxFont( 8, 74, 90, 92, false, wxT("Arial") ) );
-	m_staticTextCmpVariant->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
-	
-	fgSizer121->Add( m_staticTextCmpVariant, 1, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	fgSizer121->Add( 0, 0, 1, 0, 5 );
-	
-	wxBoxSizer* bSizer30;
-	bSizer30 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_buttonCompare = new wxButtonWithImage( m_panel71, wxID_OK, _("Compare"), wxDefaultPosition, wxSize( 180,42 ), 0 );
-	m_buttonCompare->SetDefault(); 
-	m_buttonCompare->SetFont( wxFont( 14, 74, 90, 92, false, wxT("Arial Black") ) );
-	m_buttonCompare->SetToolTip( _("Compare both sides") );
-	
-	bSizer30->Add( m_buttonCompare, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_buttonAbort = new wxButton( m_panel71, wxID_CANCEL, _("&Abort"), wxDefaultPosition, wxSize( 180,42 ), 0 );
-	m_buttonAbort->SetFont( wxFont( 14, 74, 90, 92, false, wxT("Tahoma") ) );
-	m_buttonAbort->Enable( false );
-	m_buttonAbort->Hide();
-	
-	bSizer30->Add( m_buttonAbort, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	fgSizer121->Add( bSizer30, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonCmpConfig = new wxBitmapButton( m_panel71, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,42 ), wxBU_AUTODRAW );
-	m_bpButtonCmpConfig->SetToolTip( _("Comparison settings") );
-	
-	m_bpButtonCmpConfig->SetToolTip( _("Comparison settings") );
-	
-	fgSizer121->Add( m_bpButtonCmpConfig, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 3 );
-	
-	bSizer6->Add( fgSizer121, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 );
-	
-	
-	bSizer6->Add( 0, 0, 1, 0, 5 );
-	
-	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_panel71, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextSyncVariant->Wrap( -1 );
-	m_staticTextSyncVariant->SetFont( wxFont( 8, 74, 90, 92, false, wxT("Arial") ) );
-	m_staticTextSyncVariant->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
-	
-	fgSizer12->Add( m_staticTextSyncVariant, 1, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonSyncConfig = new wxBitmapButton( m_panel71, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,42 ), wxBU_AUTODRAW );
-	m_bpButtonSyncConfig->SetToolTip( _("Synchronization settings") );
-	
-	m_bpButtonSyncConfig->SetToolTip( _("Synchronization settings") );
-	
-	fgSizer12->Add( m_bpButtonSyncConfig, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 3 );
-	
-	m_buttonStartSync = new wxButtonWithImage( m_panel71, wxID_ANY, _("Synchronize..."), wxDefaultPosition, wxSize( -1,42 ), 0 );
-	m_buttonStartSync->SetFont( wxFont( 14, 74, 90, 92, false, wxT("Arial Black") ) );
-	m_buttonStartSync->SetToolTip( _("Start synchronization") );
-	
-	fgSizer12->Add( m_buttonStartSync, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer6->Add( fgSizer12, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 );
-	
-	
-	bSizer6->Add( 15, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_panel71->SetSizer( bSizer6 );
-	m_panel71->Layout();
-	bSizer6->Fit( m_panel71 );
-	bSizer1->Add( m_panel71, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
-	
-	wxBoxSizer* bSizer91;
-	bSizer91 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_panelTopLeft = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer92;
-	bSizer92 = new wxBoxSizer( wxVERTICAL );
-	
-	sbSizer2 = 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 ); 
-	sbSizer2->Add( m_directoryLeft, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_dirPickerLeft = new wxDirPickerCtrl( m_panelTopLeft, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_dirPickerLeft->SetToolTip( _("Select a folder") );
-	
-	sbSizer2->Add( m_dirPickerLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer92->Add( sbSizer2, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
-	
-	m_panelTopLeft->SetSizer( bSizer92 );
-	m_panelTopLeft->Layout();
-	bSizer92->Fit( m_panelTopLeft );
-	bSizer91->Add( m_panelTopLeft, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	m_panelTopMiddle = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer93;
-	bSizer93 = new wxBoxSizer( wxVERTICAL );
-	
-	
-	bSizer93->Add( 0, 3, 0, 0, 5 );
-	
-	bSizerMiddle = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bpButtonSwapSides = new wxBitmapButton( m_panelTopMiddle, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
-	m_bpButtonSwapSides->SetToolTip( _("Swap sides") );
-	
-	m_bpButtonSwapSides->SetToolTip( _("Swap sides") );
-	
-	bSizerMiddle->Add( m_bpButtonSwapSides, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer93->Add( bSizerMiddle, 1, wxALIGN_CENTER_HORIZONTAL|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( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer94;
-	bSizer94 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer77;
-	bSizer77 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxStaticBoxSizer* sbSizer3;
-	sbSizer3 = 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") );
-	
-	m_bpButtonAddPair->SetToolTip( _("Add folder pair") );
-	
-	sbSizer3->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") );
-	
-	m_bpButtonRemovePair->SetToolTip( _("Remove folder pair") );
-	
-	sbSizer3->Add( m_bpButtonRemovePair, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_directoryRight = new CustomComboBox( m_panelTopRight, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
-	sbSizer3->Add( m_directoryRight, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_dirPickerRight = new wxDirPickerCtrl( m_panelTopRight, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_dirPickerRight->SetToolTip( _("Select a folder") );
-	
-	sbSizer3->Add( m_dirPickerRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer77->Add( sbSizer3, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 3 );
-	
-	bSizer94->Add( bSizer77, 0, wxEXPAND|wxLEFT, 3 );
-	
-	m_panelTopRight->SetSizer( bSizer94 );
-	m_panelTopRight->Layout();
-	bSizer94->Fit( m_panelTopRight );
-	bSizer91->Add( m_panelTopRight, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	bSizer1->Add( bSizer91, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_scrolledWindowFolderPairs = new wxScrolledWindow( this, 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 );
-	bSizer1->Add( m_scrolledWindowFolderPairs, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer2;
-	bSizer2 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_panelLeft = new wxPanel( this, 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 );
-	bSizer7->Add( m_gridLeft, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALL, 5 );
-	
-	m_panelLeft->SetSizer( bSizer7 );
-	m_panelLeft->Layout();
-	bSizer7->Fit( m_panelLeft );
-	bSizer2->Add( m_panelLeft, 1, wxEXPAND, 5 );
-	
-	m_panelMiddle = new wxPanel( this, 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|wxTOP|wxBOTTOM, 5 );
-	
-	m_panelMiddle->SetSizer( bSizer18 );
-	m_panelMiddle->Layout();
-	bSizer18->Fit( m_panelMiddle );
-	bSizer2->Add( m_panelMiddle, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 );
-	
-	m_panelRight = new wxPanel( this, 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 );
-	bSizer10->Add( m_gridRight, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALL, 5 );
-	
-	m_panelRight->SetSizer( bSizer10 );
-	m_panelRight->Layout();
-	bSizer10->Fit( m_panelRight );
-	bSizer2->Add( m_panelRight, 1, wxEXPAND, 5 );
-	
-	bSizer1->Add( bSizer2, 1, wxEXPAND, 5 );
-	
-	m_panelBottom = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	bSizer3 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer120;
-	bSizer120 = new wxBoxSizer( wxVERTICAL );
-	
-	m_notebookBottomLeft = new wxNotebook( m_panelBottom, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	m_panel30 = new wxPanel( m_notebookBottomLeft, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer139;
-	bSizer139 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bpButtonSave = new wxBitmapButton( m_panel30, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	m_bpButtonSave->SetToolTip( _("Save current configuration to file") );
-	
-	m_bpButtonSave->SetToolTip( _("Save current configuration to file") );
-	
-	bSizer139->Add( m_bpButtonSave, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonLoad = new wxBitmapButton( m_panel30, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	m_bpButtonLoad->SetToolTip( _("Load configuration from file") );
-	
-	m_bpButtonLoad->SetToolTip( _("Load configuration from file") );
-	
-	bSizer139->Add( m_bpButtonLoad, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	wxArrayString m_choiceHistoryChoices;
-	m_choiceHistory = new wxChoice( m_panel30, wxID_ANY, wxDefaultPosition, wxSize( 170,-1 ), m_choiceHistoryChoices, 0 );
-	m_choiceHistory->SetSelection( 0 );
-	m_choiceHistory->SetToolTip( _("Load configuration history (press DEL to delete items)") );
-	
-	bSizer139->Add( m_choiceHistory, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_panel30->SetSizer( bSizer139 );
-	m_panel30->Layout();
-	bSizer139->Fit( m_panel30 );
-	m_notebookBottomLeft->AddPage( m_panel30, _("Configuration"), true );
-	m_panelFilter = new wxPanel( m_notebookBottomLeft, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer140;
-	bSizer140 = new wxBoxSizer( wxHORIZONTAL );
-	
-	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, 0, 5 );
-	
-	bSizer140->Add( bSizer23, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_panelFilter->SetSizer( bSizer140 );
-	m_panelFilter->Layout();
-	bSizer140->Fit( m_panelFilter );
-	m_notebookBottomLeft->AddPage( m_panelFilter, _("Filter files"), false );
-	
-	bSizer120->Add( m_notebookBottomLeft, 0, wxALL, 5 );
-	
-	bSizer3->Add( bSizer120, 1, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT, 5 );
-	
-	m_panel112 = new wxPanel( m_panelBottom, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer64;
-	bSizer64 = new wxBoxSizer( wxVERTICAL );
-	
-	wxStaticBoxSizer* sbSizer31;
-	sbSizer31 = new wxStaticBoxSizer( new wxStaticBox( m_panel112, wxID_ANY, _("Filter view") ), wxHORIZONTAL );
-	
-	sbSizer31->SetMinSize( wxSize( 100,-1 ) ); 
-	
-	sbSizer31->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_bpButtonSyncCreateLeft = new ToggleButton( m_panel112, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	sbSizer31->Add( m_bpButtonSyncCreateLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonSyncDirOverwLeft = new ToggleButton( m_panel112, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	sbSizer31->Add( m_bpButtonSyncDirOverwLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonSyncDeleteLeft = new ToggleButton( m_panel112, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	sbSizer31->Add( m_bpButtonSyncDeleteLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonLeftOnly = new ToggleButton( m_panel112, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	sbSizer31->Add( m_bpButtonLeftOnly, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonLeftNewer = new ToggleButton( m_panel112, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	sbSizer31->Add( m_bpButtonLeftNewer, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonEqual = new ToggleButton( m_panel112, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	sbSizer31->Add( m_bpButtonEqual, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonDifferent = new ToggleButton( m_panel112, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	sbSizer31->Add( m_bpButtonDifferent, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonSyncDirNone = new ToggleButton( m_panel112, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	sbSizer31->Add( m_bpButtonSyncDirNone, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonRightNewer = new ToggleButton( m_panel112, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	sbSizer31->Add( m_bpButtonRightNewer, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonRightOnly = new ToggleButton( m_panel112, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	sbSizer31->Add( m_bpButtonRightOnly, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonSyncDeleteRight = new ToggleButton( m_panel112, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	sbSizer31->Add( m_bpButtonSyncDeleteRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonSyncDirOverwRight = new ToggleButton( m_panel112, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	sbSizer31->Add( m_bpButtonSyncDirOverwRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonSyncCreateRight = new ToggleButton( m_panel112, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	sbSizer31->Add( m_bpButtonSyncCreateRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonConflict = new ToggleButton( m_panel112, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	sbSizer31->Add( m_bpButtonConflict, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
-	
-	sbSizer31->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	bSizer64->Add( sbSizer31, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_panel112->SetSizer( bSizer64 );
-	m_panel112->Layout();
-	bSizer64->Fit( m_panel112 );
-	bSizer3->Add( m_panel112, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	bSizerBottomRight = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizerBottomRight->Add( 5, 0, 1, 0, 5 );
-	
-	m_panelSyncPreview = new wxPanel( m_panelBottom, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer121;
-	bSizer121 = new wxBoxSizer( wxVERTICAL );
-	
-	wxStaticBoxSizer* sbSizer161;
-	sbSizer161 = new wxStaticBoxSizer( new wxStaticBox( m_panelSyncPreview, wxID_ANY, _("Statistics") ), wxHORIZONTAL );
-	
-	wxFlexGridSizer* fgSizer5;
-	fgSizer5 = new wxFlexGridSizer( 2, 2, 0, 5 );
-	fgSizer5->SetFlexibleDirection( wxHORIZONTAL );
-	fgSizer5->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	m_bitmapCreate = new wxStaticBitmap( m_panelSyncPreview, 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_panelSyncPreview, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY );
-	m_textCtrlCreate->SetFont( wxFont( 8, 74, 90, 90, false, wxT("Tahoma") ) );
-	m_textCtrlCreate->SetBackgroundColour( wxColour( 222, 222, 236 ) );
-	m_textCtrlCreate->SetToolTip( _("Number of files and directories that will be created") );
-	
-	fgSizer5->Add( m_textCtrlCreate, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bitmapDelete = new wxStaticBitmap( m_panelSyncPreview, 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_textCtrlDelete = new wxTextCtrl( m_panelSyncPreview, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY );
-	m_textCtrlDelete->SetFont( wxFont( 8, 74, 90, 90, false, wxT("Tahoma") ) );
-	m_textCtrlDelete->SetBackgroundColour( wxColour( 222, 222, 236 ) );
-	m_textCtrlDelete->SetToolTip( _("Number of files and directories that will be deleted") );
-	
-	fgSizer5->Add( m_textCtrlDelete, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	sbSizer161->Add( fgSizer5, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-	
-	wxFlexGridSizer* fgSizer6;
-	fgSizer6 = new wxFlexGridSizer( 2, 2, 0, 5 );
-	fgSizer6->SetFlexibleDirection( wxHORIZONTAL );
-	fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	m_bitmapUpdate = new wxStaticBitmap( m_panelSyncPreview, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_bitmapUpdate->SetToolTip( _("Number of files that will be overwritten") );
-	
-	fgSizer6->Add( m_bitmapUpdate, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_textCtrlUpdate = new wxTextCtrl( m_panelSyncPreview, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY );
-	m_textCtrlUpdate->SetFont( wxFont( 8, 74, 90, 90, false, wxT("Tahoma") ) );
-	m_textCtrlUpdate->SetBackgroundColour( wxColour( 222, 222, 236 ) );
-	m_textCtrlUpdate->SetToolTip( _("Number of files that will be overwritten") );
-	
-	fgSizer6->Add( m_textCtrlUpdate, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bitmapData = new wxStaticBitmap( m_panelSyncPreview, 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_panelSyncPreview, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY );
-	m_textCtrlData->SetFont( wxFont( 8, 74, 90, 90, false, wxT("Tahoma") ) );
-	m_textCtrlData->SetBackgroundColour( wxColour( 222, 222, 236 ) );
-	m_textCtrlData->SetToolTip( _("Total amount of data that will be transferred") );
-	
-	fgSizer6->Add( m_textCtrlData, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	sbSizer161->Add( fgSizer6, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-	
-	bSizer121->Add( sbSizer161, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_panelSyncPreview->SetSizer( bSizer121 );
-	m_panelSyncPreview->Layout();
-	bSizer121->Fit( m_panelSyncPreview );
-	bSizerBottomRight->Add( m_panelSyncPreview, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButton10 = new wxBitmapButton( m_panelBottom, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 50,50 ), wxBU_AUTODRAW );
-	m_bpButton10->Hide();
-	m_bpButton10->SetToolTip( _("Quit") );
-	
-	m_bpButton10->Hide();
-	m_bpButton10->SetToolTip( _("Quit") );
-	
-	bSizerBottomRight->Add( m_bpButton10, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 );
-	
-	bSizer3->Add( bSizerBottomRight, 1, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 );
-	
-	m_panelBottom->SetSizer( bSizer3 );
-	m_panelBottom->Layout();
-	bSizer3->Fit( m_panelBottom );
-	bSizer1->Add( m_panelBottom, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 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, 74, 90, 92, false, wxT("Tahoma") ) );
-	
-	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, 74, 90, 92, false, wxT("Tahoma") ) );
-	
-	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, 74, 90, 92, false, wxT("Tahoma") ) );
-	
-	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 );
-	bSizer1->Add( m_panelStatusBar, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	this->SetSizer( bSizer1 );
-	this->Layout();
-	
-	// 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_choiceHistory->Connect( wxEVT_CHAR, wxKeyEventHandler( MainDialogGenerated::OnCfgHistoryKeyEvent ), NULL, this );
-	m_choiceHistory->Connect( wxEVT_COMMAND_CHOICE_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 );
-	m_bpButton10->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnQuit ), 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("ALT-C"), wxEmptyString, wxITEM_NORMAL );
+    m_menuFile->Append( m_menuItem10 );
+
+    m_menuItem11 = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("2. &Synchronize...") ) + wxT('\t') + wxT("ALT-S"), wxEmptyString, wxITEM_NORMAL );
+    m_menuFile->Append( m_menuItem11 );
+
+    m_menuFile->AppendSeparator();
+
+    m_menuItemSwitchView = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("S&witch view") ) + wxT('\t') + wxT("ALT-W"), wxEmptyString, wxITEM_NORMAL );
+    m_menuFile->Append( m_menuItemSwitchView );
+
+    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-L"), wxEmptyString, wxITEM_NORMAL );
+    m_menuFile->Append( m_menuItemLoad );
+
+    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, _("&File") );
+
+    m_menuAdvanced = new wxMenu();
+    m_menuLanguages = new wxMenu();
+    m_menuAdvanced->Append( -1, _("&Language"), m_menuLanguages );
+
+    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 );
+
+    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 );
+
+    bSizer1 = new wxBoxSizer( wxVERTICAL );
+
+    m_panel71 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxRAISED_BORDER|wxTAB_TRAVERSAL );
+    bSizer6 = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizer6->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_panel71, 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, 1, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    fgSizer121->Add( 0, 0, 1, 0, 5 );
+
+    wxBoxSizer* bSizer30;
+    bSizer30 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_buttonCompare = new wxButtonWithImage( m_panel71, wxID_OK, _("Compare"), wxDefaultPosition, wxSize( 180,42 ), 0 );
+    m_buttonCompare->SetDefault();
+    m_buttonCompare->SetFont( wxFont( 14, 74, 90, 92, false, wxT("Arial Black") ) );
+    m_buttonCompare->SetToolTip( _("Compare both sides") );
+
+    bSizer30->Add( m_buttonCompare, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_buttonAbort = new wxButton( m_panel71, wxID_CANCEL, _("&Abort"), wxDefaultPosition, wxSize( 180,42 ), 0 );
+    m_buttonAbort->SetFont( wxFont( 14, 74, 90, 92, false, wxT("Arial Black") ) );
+    m_buttonAbort->Enable( false );
+    m_buttonAbort->Hide();
+
+    bSizer30->Add( m_buttonAbort, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    fgSizer121->Add( bSizer30, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonCmpConfig = new wxBitmapButton( m_panel71, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,42 ), wxBU_AUTODRAW );
+    m_bpButtonCmpConfig->SetToolTip( _("Comparison settings") );
+
+    m_bpButtonCmpConfig->SetToolTip( _("Comparison settings") );
+
+    fgSizer121->Add( m_bpButtonCmpConfig, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 3 );
+
+    bSizer6->Add( fgSizer121, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 );
+
+
+    bSizer6->Add( 0, 0, 1, 0, 5 );
+
+    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_panel71, 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, 1, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonSyncConfig = new wxBitmapButton( m_panel71, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,42 ), wxBU_AUTODRAW );
+    m_bpButtonSyncConfig->SetToolTip( _("Synchronization settings") );
+
+    m_bpButtonSyncConfig->SetToolTip( _("Synchronization settings") );
+
+    fgSizer12->Add( m_bpButtonSyncConfig, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 3 );
+
+    m_buttonStartSync = new wxButtonWithImage( m_panel71, wxID_ANY, _("Synchronize..."), wxDefaultPosition, wxSize( -1,42 ), 0 );
+    m_buttonStartSync->SetFont( wxFont( 14, 74, 90, 92, false, wxT("Arial Black") ) );
+    m_buttonStartSync->SetToolTip( _("Start synchronization") );
+
+    fgSizer12->Add( m_buttonStartSync, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer6->Add( fgSizer12, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 );
+
+
+    bSizer6->Add( 15, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_panel71->SetSizer( bSizer6 );
+    m_panel71->Layout();
+    bSizer6->Fit( m_panel71 );
+    bSizer1->Add( m_panel71, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+
+    wxBoxSizer* bSizer91;
+    bSizer91 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_panelTopLeft = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer92;
+    bSizer92 = new wxBoxSizer( wxVERTICAL );
+
+    sbSizer2 = 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 );
+    sbSizer2->Add( m_directoryLeft, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_dirPickerLeft = new wxDirPickerCtrl( m_panelTopLeft, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_dirPickerLeft->SetToolTip( _("Select a folder") );
+
+    sbSizer2->Add( m_dirPickerLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer92->Add( sbSizer2, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
+
+    m_panelTopLeft->SetSizer( bSizer92 );
+    m_panelTopLeft->Layout();
+    bSizer92->Fit( m_panelTopLeft );
+    bSizer91->Add( m_panelTopLeft, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    m_panelTopMiddle = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer93;
+    bSizer93 = new wxBoxSizer( wxVERTICAL );
+
+
+    bSizer93->Add( 0, 3, 0, 0, 5 );
+
+    bSizerMiddle = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bpButtonSwapSides = new wxBitmapButton( m_panelTopMiddle, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+    m_bpButtonSwapSides->SetToolTip( _("Swap sides") );
+
+    m_bpButtonSwapSides->SetToolTip( _("Swap sides") );
+
+    bSizerMiddle->Add( m_bpButtonSwapSides, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer93->Add( bSizerMiddle, 1, wxALIGN_CENTER_HORIZONTAL|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( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer94;
+    bSizer94 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer77;
+    bSizer77 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxStaticBoxSizer* sbSizer3;
+    sbSizer3 = 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") );
+
+    m_bpButtonAddPair->SetToolTip( _("Add folder pair") );
+
+    sbSizer3->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") );
+
+    m_bpButtonRemovePair->SetToolTip( _("Remove folder pair") );
+
+    sbSizer3->Add( m_bpButtonRemovePair, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_directoryRight = new CustomComboBox( m_panelTopRight, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+    sbSizer3->Add( m_directoryRight, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_dirPickerRight = new wxDirPickerCtrl( m_panelTopRight, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_dirPickerRight->SetToolTip( _("Select a folder") );
+
+    sbSizer3->Add( m_dirPickerRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer77->Add( sbSizer3, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 3 );
+
+    bSizer94->Add( bSizer77, 0, wxEXPAND|wxLEFT, 3 );
+
+    m_panelTopRight->SetSizer( bSizer94 );
+    m_panelTopRight->Layout();
+    bSizer94->Fit( m_panelTopRight );
+    bSizer91->Add( m_panelTopRight, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    bSizer1->Add( bSizer91, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_scrolledWindowFolderPairs = new wxScrolledWindow( this, 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 );
+    bSizer1->Add( m_scrolledWindowFolderPairs, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    bSizerGridHolder = new wxBoxSizer( wxHORIZONTAL );
+
+    m_panelLeft = new wxPanel( this, 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 );
+    bSizer7->Add( m_gridLeft, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALL, 5 );
+
+    m_panelLeft->SetSizer( bSizer7 );
+    m_panelLeft->Layout();
+    bSizer7->Fit( m_panelLeft );
+    bSizerGridHolder->Add( m_panelLeft, 1, wxEXPAND, 5 );
+
+    m_panelMiddle = new wxPanel( this, 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|wxTOP|wxBOTTOM, 5 );
+
+    m_panelMiddle->SetSizer( bSizer18 );
+    m_panelMiddle->Layout();
+    bSizer18->Fit( m_panelMiddle );
+    bSizerGridHolder->Add( m_panelMiddle, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 );
+
+    m_panelRight = new wxPanel( this, 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 );
+    bSizer10->Add( m_gridRight, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALL, 5 );
+
+    m_panelRight->SetSizer( bSizer10 );
+    m_panelRight->Layout();
+    bSizer10->Fit( m_panelRight );
+    bSizerGridHolder->Add( m_panelRight, 1, wxEXPAND, 5 );
+
+    bSizer1->Add( bSizerGridHolder, 1, wxEXPAND, 5 );
+
+    m_panelBottom = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    bSizer3 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer120;
+    bSizer120 = new wxBoxSizer( wxVERTICAL );
+
+    m_notebookBottomLeft = new wxNotebook( m_panelBottom, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+    m_panel30 = new wxPanel( m_notebookBottomLeft, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer139;
+    bSizer139 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bpButtonSave = new wxBitmapButton( m_panel30, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    m_bpButtonSave->SetToolTip( _("Save current configuration to file") );
+
+    m_bpButtonSave->SetToolTip( _("Save current configuration to file") );
+
+    bSizer139->Add( m_bpButtonSave, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonLoad = new wxBitmapButton( m_panel30, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    m_bpButtonLoad->SetToolTip( _("Load configuration from file") );
+
+    m_bpButtonLoad->SetToolTip( _("Load configuration from file") );
+
+    bSizer139->Add( m_bpButtonLoad, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    wxArrayString m_choiceHistoryChoices;
+    m_choiceHistory = new wxChoice( m_panel30, wxID_ANY, wxDefaultPosition, wxSize( 170,-1 ), m_choiceHistoryChoices, 0 );
+    m_choiceHistory->SetSelection( 0 );
+    m_choiceHistory->SetToolTip( _("Load configuration history (press DEL to delete items)") );
+
+    bSizer139->Add( m_choiceHistory, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_panel30->SetSizer( bSizer139 );
+    m_panel30->Layout();
+    bSizer139->Fit( m_panel30 );
+    m_notebookBottomLeft->AddPage( m_panel30, _("Configuration"), true );
+    m_panelFilter = new wxPanel( m_notebookBottomLeft, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer140;
+    bSizer140 = new wxBoxSizer( wxHORIZONTAL );
+
+    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 );
+    m_notebookBottomLeft->AddPage( m_panelFilter, _("Filter files"), false );
+
+    bSizer120->Add( m_notebookBottomLeft, 0, wxALL, 5 );
+
+    bSizer3->Add( bSizer120, 1, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT, 5 );
+
+    m_panelViewFilter = new wxPanel( m_panelBottom, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer64;
+    bSizer64 = new wxBoxSizer( wxVERTICAL );
+
+    wxStaticBoxSizer* sbSizer31;
+    sbSizer31 = new wxStaticBoxSizer( new wxStaticBox( m_panelViewFilter, wxID_ANY, _("Filter view") ), wxHORIZONTAL );
+
+    sbSizer31->SetMinSize( wxSize( 100,-1 ) );
+
+    sbSizer31->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_bpButtonSyncCreateLeft = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    sbSizer31->Add( m_bpButtonSyncCreateLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonSyncDirOverwLeft = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    sbSizer31->Add( m_bpButtonSyncDirOverwLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonSyncDeleteLeft = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    sbSizer31->Add( m_bpButtonSyncDeleteLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonLeftOnly = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    sbSizer31->Add( m_bpButtonLeftOnly, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonLeftNewer = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    sbSizer31->Add( m_bpButtonLeftNewer, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonEqual = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    sbSizer31->Add( m_bpButtonEqual, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonDifferent = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    sbSizer31->Add( m_bpButtonDifferent, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonSyncDirNone = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    sbSizer31->Add( m_bpButtonSyncDirNone, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonRightNewer = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    sbSizer31->Add( m_bpButtonRightNewer, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonRightOnly = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    sbSizer31->Add( m_bpButtonRightOnly, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonSyncDeleteRight = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    sbSizer31->Add( m_bpButtonSyncDeleteRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonSyncDirOverwRight = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    sbSizer31->Add( m_bpButtonSyncDirOverwRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonSyncCreateRight = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    sbSizer31->Add( m_bpButtonSyncCreateRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonConflict = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    sbSizer31->Add( m_bpButtonConflict, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+
+
+    sbSizer31->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    bSizer64->Add( sbSizer31, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_panelViewFilter->SetSizer( bSizer64 );
+    m_panelViewFilter->Layout();
+    bSizer64->Fit( m_panelViewFilter );
+    bSizer3->Add( m_panelViewFilter, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+    bSizerBottomRight = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizerBottomRight->Add( 5, 0, 1, 0, 5 );
+
+    m_panelSyncPreview = new wxPanel( m_panelBottom, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer121;
+    bSizer121 = new wxBoxSizer( wxVERTICAL );
+
+    wxStaticBoxSizer* sbSizer161;
+    sbSizer161 = new wxStaticBoxSizer( new wxStaticBox( m_panelSyncPreview, wxID_ANY, _("Statistics") ), wxHORIZONTAL );
+
+    wxFlexGridSizer* fgSizer5;
+    fgSizer5 = new wxFlexGridSizer( 2, 2, 0, 5 );
+    fgSizer5->SetFlexibleDirection( wxHORIZONTAL );
+    fgSizer5->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    m_bitmapCreate = new wxStaticBitmap( m_panelSyncPreview, 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_panelSyncPreview, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY );
+    m_textCtrlCreate->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
+    m_textCtrlCreate->SetBackgroundColour( wxColour( 222, 222, 236 ) );
+    m_textCtrlCreate->SetToolTip( _("Number of files and directories that will be created") );
+
+    fgSizer5->Add( m_textCtrlCreate, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bitmapDelete = new wxStaticBitmap( m_panelSyncPreview, 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_textCtrlDelete = new wxTextCtrl( m_panelSyncPreview, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY );
+    m_textCtrlDelete->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
+    m_textCtrlDelete->SetBackgroundColour( wxColour( 222, 222, 236 ) );
+    m_textCtrlDelete->SetToolTip( _("Number of files and directories that will be deleted") );
+
+    fgSizer5->Add( m_textCtrlDelete, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    sbSizer161->Add( fgSizer5, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+
+    wxFlexGridSizer* fgSizer6;
+    fgSizer6 = new wxFlexGridSizer( 2, 2, 0, 5 );
+    fgSizer6->SetFlexibleDirection( wxHORIZONTAL );
+    fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    m_bitmapUpdate = new wxStaticBitmap( m_panelSyncPreview, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    m_bitmapUpdate->SetToolTip( _("Number of files that will be overwritten") );
+
+    fgSizer6->Add( m_bitmapUpdate, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_textCtrlUpdate = new wxTextCtrl( m_panelSyncPreview, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY );
+    m_textCtrlUpdate->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
+    m_textCtrlUpdate->SetBackgroundColour( wxColour( 222, 222, 236 ) );
+    m_textCtrlUpdate->SetToolTip( _("Number of files that will be overwritten") );
+
+    fgSizer6->Add( m_textCtrlUpdate, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bitmapData = new wxStaticBitmap( m_panelSyncPreview, 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_panelSyncPreview, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY );
+    m_textCtrlData->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
+    m_textCtrlData->SetBackgroundColour( wxColour( 222, 222, 236 ) );
+    m_textCtrlData->SetToolTip( _("Total amount of data that will be transferred") );
+
+    fgSizer6->Add( m_textCtrlData, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    sbSizer161->Add( fgSizer6, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+
+    bSizer121->Add( sbSizer161, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_panelSyncPreview->SetSizer( bSizer121 );
+    m_panelSyncPreview->Layout();
+    bSizer121->Fit( m_panelSyncPreview );
+    bSizerBottomRight->Add( m_panelSyncPreview, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButton10 = new wxBitmapButton( m_panelBottom, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 50,50 ), wxBU_AUTODRAW );
+    m_bpButton10->Hide();
+    m_bpButton10->SetToolTip( _("Quit") );
+
+    m_bpButton10->Hide();
+    m_bpButton10->SetToolTip( _("Quit") );
+
+    bSizerBottomRight->Add( m_bpButton10, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 );
+
+    bSizer3->Add( bSizerBottomRight, 1, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 );
+
+    m_panelBottom->SetSizer( bSizer3 );
+    m_panelBottom->Layout();
+    bSizer3->Fit( m_panelBottom );
+    bSizer1->Add( m_panelBottom, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 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 );
+    bSizer1->Add( m_panelStatusBar, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+    this->SetSizer( bSizer1 );
+    this->Layout();
+
+    // 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_choiceHistory->Connect( wxEVT_CHAR, wxKeyEventHandler( MainDialogGenerated::OnCfgHistoryKeyEvent ), NULL, this );
+    m_choiceHistory->Connect( wxEVT_COMMAND_CHOICE_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 );
+    m_bpButton10->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnQuit ), 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_ANY, 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_ANY, 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_choiceHistory->Disconnect( wxEVT_CHAR, wxKeyEventHandler( MainDialogGenerated::OnCfgHistoryKeyEvent ), NULL, this );
-	m_choiceHistory->Disconnect( wxEVT_COMMAND_CHOICE_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 );
-	m_bpButton10->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnQuit ), 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_ANY, 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_ANY, 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_choiceHistory->Disconnect( wxEVT_CHAR, wxKeyEventHandler( MainDialogGenerated::OnCfgHistoryKeyEvent ), NULL, this );
+    m_choiceHistory->Disconnect( wxEVT_COMMAND_CHOICE_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 );
+    m_bpButton10->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnQuit ), 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 wxDirPickerCtrl( 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 );
-	m_panel20->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_APPWORKSPACE ) );
-	
-	wxBoxSizer* bSizer95;
-	bSizer95 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_panel21 = new wxPanel( m_panel20, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panel21->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-	
-	wxBoxSizer* bSizer96;
-	bSizer96 = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizer96->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_bpButtonLocalFilter = new wxBitmapButton( m_panel21, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
-	bSizer96->Add( m_bpButtonLocalFilter, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer96->Add( 5, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonAltSyncCfg = new wxBitmapButton( m_panel21, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
-	bSizer96->Add( m_bpButtonAltSyncCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer96->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_panel21->SetSizer( bSizer96 );
-	m_panel21->Layout();
-	bSizer96->Fit( m_panel21 );
-	bSizer95->Add( m_panel21, 0, wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_panel20->SetSizer( bSizer95 );
-	m_panel20->Layout();
-	bSizer95->Fit( m_panel20 );
-	bSizer74->Add( m_panel20, 0, wxALIGN_CENTER_VERTICAL|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") );
-	
-	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 wxDirPickerCtrl( 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_directoryLeft = new wxTextCtrl( m_panelLeft, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer134->Add( m_directoryLeft, 1, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+
+    m_dirPickerLeft = new wxDirPickerCtrl( 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 );
+    m_panel20->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_APPWORKSPACE ) );
+
+    wxBoxSizer* bSizer95;
+    bSizer95 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_panel21 = new wxPanel( m_panel20, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panel21->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+    wxBoxSizer* bSizer96;
+    bSizer96 = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizer96->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_bpButtonLocalFilter = new wxBitmapButton( m_panel21, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
+    bSizer96->Add( m_bpButtonLocalFilter, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer96->Add( 5, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonAltSyncCfg = new wxBitmapButton( m_panel21, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
+    bSizer96->Add( m_bpButtonAltSyncCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer96->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_panel21->SetSizer( bSizer96 );
+    m_panel21->Layout();
+    bSizer96->Fit( m_panel21 );
+    bSizer95->Add( m_panel21, 0, wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_panel20->SetSizer( bSizer95 );
+    m_panel20->Layout();
+    bSizer95->Fit( m_panel20 );
+    bSizer74->Add( m_panel20, 0, wxALIGN_CENTER_VERTICAL|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") );
+
+    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 wxDirPickerCtrl( 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()
@@ -918,113 +917,113 @@ FolderPairGenerated::~FolderPairGenerated()
 
 BatchFolderPairGenerated::BatchFolderPairGenerated( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, 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") );
-	
-	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, 74, 90, 92, false, wxT("Tahoma") ) );
-	
-	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, 74, 90, 92, false, wxT("Tahoma") ) );
-	
-	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 wxDirPickerCtrl( 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 wxDirPickerCtrl( 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 );
+    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") );
+
+    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 wxDirPickerCtrl( 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 wxDirPickerCtrl( 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 );
 }
 
 BatchFolderPairGenerated::~BatchFolderPairGenerated()
@@ -1033,550 +1032,550 @@ BatchFolderPairGenerated::~BatchFolderPairGenerated()
 
 BatchDlgGenerated::BatchDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-	this->SetSizeHints( wxSize( 400,420 ), 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, 74, 90, 92, false, wxT("Tahoma") ) );
-	
-	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( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer69->Add( bSizer87, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	bSizer69->Add( 0, 5, 0, 0, 5 );
-	
-	wxBoxSizer* bSizer70;
-	bSizer70 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText44 = new wxStaticText( this, wxID_ANY, _("Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText44->Wrap( 500 );
-	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") );
-	
-	m_bpButtonHelp->SetToolTip( _("Help") );
-	
-	bSizer70->Add( m_bpButtonHelp, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
-	bSizer69->Add( bSizer70, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	bSizer69->Add( 0, 5, 0, 0, 5 );
-	
-	m_staticline10 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer69->Add( m_staticline10, 0, wxEXPAND|wxTOP, 5 );
-	
-	m_staticText531 = new wxStaticText( this, wxID_ANY, _("Configuration overview:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText531->Wrap( -1 );
-	m_staticText531->SetFont( wxFont( 10, 74, 90, 92, false, wxT("Arial Black") ) );
-	
-	bSizer69->Add( m_staticText531, 0, wxALL|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") );
-	
-	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, 74, 90, 92, false, wxT("Arial") ) );
-	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, 74, 90, 92, false, wxT("Arial") ) );
-	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") );
-	
-	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") );
-	
-	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") );
-	
-	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, 74, 90, 92, false, wxT("Tahoma") ) );
-	
-	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, 74, 90, 92, false, wxT("Tahoma") ) );
-	
-	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 wxDirPickerCtrl( 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 wxDirPickerCtrl( 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, 0, wxEXPAND, 5 );
-	
-	m_scrolledWindow6->SetSizer( bSizer141 );
-	m_scrolledWindow6->Layout();
-	bSizer141->Fit( m_scrolledWindow6 );
-	bSizer120->Add( m_scrolledWindow6, 0, wxEXPAND, 5 );
-	
-	
-	bSizer120->Add( 0, 5, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	wxFlexGridSizer* fgSizer15;
-	fgSizer15 = new wxFlexGridSizer( 2, 2, 10, 10 );
-	fgSizer15->SetFlexibleDirection( wxBOTH );
-	fgSizer15->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	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 );
-	
-	fgSizer15->Add( sbSizer25, 0, wxEXPAND, 5 );
-	
-	wxStaticBoxSizer* sbSizer24;
-	sbSizer24 = new wxStaticBoxSizer( new wxStaticBox( m_panelOverview, wxID_ANY, _("Status feedback") ), wxVERTICAL );
-	
-	
-	sbSizer24->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_checkBoxSilent = new wxCheckBox( m_panelOverview, wxID_ANY, _("Silent mode"), wxDefaultPosition, wxDefaultSize, 0 );
-	
-	m_checkBoxSilent->SetToolTip( _("Run minimized and write status information to a logfile") );
-	
-	sbSizer24->Add( m_checkBoxSilent, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 14 );
-	
-	
-	sbSizer24->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	fgSizer15->Add( sbSizer24, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	bSizer120->Add( fgSizer15, 0, 0, 5 );
-	
-	bSizer67->Add( bSizer120, 1, wxALIGN_CENTER_VERTICAL|wxALL, 10 );
-	
-	m_panelOverview->SetSizer( bSizer67 );
-	m_panelOverview->Layout();
-	bSizer67->Fit( m_panelOverview );
-	m_notebookSettings->AddPage( m_panelOverview, _("Overview"), true );
-	m_panelLogging = new wxPanel( m_notebookSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer117;
-	bSizer117 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer119;
-	bSizer119 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText120 = new wxStaticText( m_panelLogging, wxID_ANY, _("Select logfile directory:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText120->Wrap( -1 );
-	bSizer119->Add( m_staticText120, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	wxStaticBoxSizer* sbSizer251;
-	sbSizer251 = new wxStaticBoxSizer( new wxStaticBox( m_panelLogging, wxID_ANY, _("Drag && drop") ), wxHORIZONTAL );
-	
-	m_textCtrlLogfileDir = new wxTextCtrl( m_panelLogging, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	sbSizer251->Add( m_textCtrlLogfileDir, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_dirPickerLogfileDir = new wxDirPickerCtrl( m_panelLogging, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_dirPickerLogfileDir->SetToolTip( _("Select a folder") );
-	
-	sbSizer251->Add( m_dirPickerLogfileDir, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer119->Add( sbSizer251, 1, wxEXPAND, 5 );
-	
-	bSizer117->Add( bSizer119, 0, wxEXPAND|wxALL, 10 );
-	
-	m_panelLogging->SetSizer( bSizer117 );
-	m_panelLogging->Layout();
-	bSizer117->Fit( m_panelLogging );
-	m_notebookSettings->AddPage( m_panelLogging, _("Logging"), 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, 74, 90, 92, false, wxT("Tahoma") ) );
-	
-	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, 74, 90, 90, false, wxT("Tahoma") ) );
-	
-	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, 74, 90, 90, false, wxT("Tahoma") ) );
-	
-	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_checkBoxSilent->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnCheckSilent ), 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 );
+    this->SetSizeHints( wxSize( 400,420 ), 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( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer69->Add( bSizer87, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    bSizer69->Add( 0, 5, 0, 0, 5 );
+
+    wxBoxSizer* bSizer70;
+    bSizer70 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText44 = new wxStaticText( this, wxID_ANY, _("Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner."), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText44->Wrap( 500 );
+    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") );
+
+    m_bpButtonHelp->SetToolTip( _("Help") );
+
+    bSizer70->Add( m_bpButtonHelp, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+
+    bSizer69->Add( bSizer70, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    bSizer69->Add( 0, 5, 0, 0, 5 );
+
+    m_staticline10 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer69->Add( m_staticline10, 0, wxEXPAND|wxTOP, 5 );
+
+    m_staticText531 = new wxStaticText( this, wxID_ANY, _("Configuration overview:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText531->Wrap( -1 );
+    m_staticText531->SetFont( wxFont( 10, 74, 90, 92, false, wxT("Arial Black") ) );
+
+    bSizer69->Add( m_staticText531, 0, wxALL|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") );
+
+    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") );
+
+    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") );
+
+    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") );
+
+    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 wxDirPickerCtrl( 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 wxDirPickerCtrl( 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, 0, wxEXPAND, 5 );
+
+    m_scrolledWindow6->SetSizer( bSizer141 );
+    m_scrolledWindow6->Layout();
+    bSizer141->Fit( m_scrolledWindow6 );
+    bSizer120->Add( m_scrolledWindow6, 0, wxEXPAND, 5 );
+
+
+    bSizer120->Add( 0, 5, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    wxFlexGridSizer* fgSizer15;
+    fgSizer15 = new wxFlexGridSizer( 1, 2, 10, 10 );
+    fgSizer15->SetFlexibleDirection( wxBOTH );
+    fgSizer15->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    wxStaticBoxSizer* sbSizer24;
+    sbSizer24 = new wxStaticBoxSizer( new wxStaticBox( m_panelOverview, wxID_ANY, _("Status feedback") ), wxVERTICAL );
+
+
+    sbSizer24->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_checkBoxSilent = new wxCheckBox( m_panelOverview, wxID_ANY, _("Silent mode"), wxDefaultPosition, wxDefaultSize, 0 );
+
+    m_checkBoxSilent->SetToolTip( _("Run minimized and write status information to a logfile") );
+
+    sbSizer24->Add( m_checkBoxSilent, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 14 );
+
+
+    sbSizer24->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    fgSizer15->Add( sbSizer24, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 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 );
+
+    fgSizer15->Add( sbSizer25, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer120->Add( fgSizer15, 0, 0, 5 );
+
+    bSizer67->Add( bSizer120, 1, wxALIGN_CENTER_VERTICAL|wxALL, 10 );
+
+    m_panelOverview->SetSizer( bSizer67 );
+    m_panelOverview->Layout();
+    bSizer67->Fit( m_panelOverview );
+    m_notebookSettings->AddPage( m_panelOverview, _("Overview"), true );
+    m_panelLogging = new wxPanel( m_notebookSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer117;
+    bSizer117 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer119;
+    bSizer119 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText120 = new wxStaticText( m_panelLogging, wxID_ANY, _("Select logfile directory:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText120->Wrap( -1 );
+    bSizer119->Add( m_staticText120, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    wxStaticBoxSizer* sbSizer251;
+    sbSizer251 = new wxStaticBoxSizer( new wxStaticBox( m_panelLogging, wxID_ANY, _("Drag && drop") ), wxHORIZONTAL );
+
+    m_textCtrlLogfileDir = new wxTextCtrl( m_panelLogging, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    sbSizer251->Add( m_textCtrlLogfileDir, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_dirPickerLogfileDir = new wxDirPickerCtrl( m_panelLogging, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_dirPickerLogfileDir->SetToolTip( _("Select a folder") );
+
+    sbSizer251->Add( m_dirPickerLogfileDir, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer119->Add( sbSizer251, 1, wxEXPAND, 5 );
+
+    bSizer117->Add( bSizer119, 0, wxEXPAND|wxALL, 10 );
+
+    m_panelLogging->SetSizer( bSizer117 );
+    m_panelLogging->Layout();
+    bSizer117->Fit( m_panelLogging );
+    m_notebookSettings->AddPage( m_panelLogging, _("Logging"), 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_checkBoxSilent->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnCheckSilent ), NULL, this );
+    m_choiceHandleError->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( BatchDlgGenerated::OnChangeErrorHandling ), 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 );
 }
 
 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_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_checkBoxSilent->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnCheckSilent ), 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 );
+    // 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_checkBoxSilent->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnCheckSilent ), NULL, this );
+    m_choiceHandleError->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( BatchDlgGenerated::OnChangeErrorHandling ), 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 );
-	
-	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, 74, 90, 90, false, wxT("Arial") ) );
-	
-	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, 74, 90, 90, false, wxT("Arial") ) );
-	
-	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, 74, 90, 90, false, wxT("Arial") ) );
-	
-	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, 74, 90, 90, false, wxT("Arial") ) );
-	
-	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, 74, 90, 90, false, wxT("Arial") ) );
-	
-	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|wxALL|wxEXPAND, 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, 74, 90, 92, false, wxT("Tahoma") ) );
-	
-	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( wxSystemSettings::GetColour( wxSYS_COLOUR_ACTIVEBORDER ) );
-	
-	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, wxALL|wxEXPAND, 5 );
-	
-	this->SetSizer( bSizer40 );
-	this->Layout();
-	bSizer40->Fit( this );
+    wxBoxSizer* bSizer40;
+    bSizer40 = new wxBoxSizer( wxVERTICAL );
+
+    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|wxALL|wxEXPAND, 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( wxSystemSettings::GetColour( wxSYS_COLOUR_ACTIVEBORDER ) );
+
+    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, wxALL|wxEXPAND, 5 );
+
+    this->SetSizer( bSizer40 );
+    this->Layout();
+    bSizer40->Fit( this );
 }
 
 CompareStatusGenerated::~CompareStatusGenerated()
@@ -1585,2110 +1584,2116 @@ 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, 74, 90, 92, false, wxT("Tahoma") ) );
-	
-	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, 74, 90, 92, false, wxT("Tahoma") ) );
-	
-	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, 74, 90, 92, false, wxT("Tahoma") ) );
-	
-	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( 300 );
-	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, 74, 90, 92, false, wxT("Tahoma") ) );
-	
-	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, 74, 90, 92, false, wxT("Tahoma") ) );
-	
-	fgSizer1->Add( m_buttonOneWay, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	m_staticText8 = new wxStaticText( this, wxID_ANY, _("Mirror backup of left folder: Right folder will be overwritten and exactly match left folder after synchronization."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText8->Wrap( 300 );
-	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, 74, 90, 92, false, wxT("Tahoma") ) );
-	
-	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, 74, 90, 92, false, wxT("Tahoma") ) );
-	
-	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( 300 );
-	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, 74, 90, 92, false, wxT("Tahoma") ) );
-	m_radioBtnCustom->Enable( false );
-	
-	fgSizer1->Add( m_radioBtnCustom, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	wxBoxSizer* bSizer65;
-	bSizer65 = new wxBoxSizer( wxVERTICAL );
-	
-	
-	bSizer65->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticText23 = new wxStaticText( this, wxID_ANY, _("Custom"), wxDefaultPosition, wxSize( -1,-1 ), wxALIGN_CENTRE|wxSTATIC_BORDER );
-	m_staticText23->Wrap( -1 );
-	m_staticText23->SetFont( wxFont( 11, 74, 90, 92, false, wxT("Tahoma") ) );
-	
-	bSizer65->Add( m_staticText23, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	
-	bSizer65->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	fgSizer1->Add( bSizer65, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	m_staticText9 = new wxStaticText( this, wxID_ANY, _("Configure your own synchronization rules."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText9->Wrap( 300 );
-	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 );
-	
-	wxStaticBoxSizer* sbSizer231;
-	sbSizer231 = 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 );
-	sbSizer231->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 wxDirPickerCtrl( 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 );
-	sbSizer231->Add( m_panelCustomDeletionDir, 0, 0, 5 );
-	
-	bSizer201->Add( sbSizer231, 0, wxEXPAND, 5 );
-	
-	bSizer29->Add( bSizer201, 0, wxTOP|wxBOTTOM, 5 );
-	
-	
-	bSizer29->Add( 0, 5, 1, 0, 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, 74, 90, 92, false, wxT("Tahoma") ) );
-	
-	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, 74, 90, 90, false, wxT("Tahoma") ) );
-	
-	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 );
-	
-	sbSizerSyncDirections = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Configuration") ), 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, 74, 90, 92, false, wxT("Tahoma") ) );
-	
-	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, 74, 90, 92, false, wxT("Tahoma") ) );
-	
-	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 );
-	
-	wxBoxSizer* bSizer122;
-	bSizer122 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapLeftOnly = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
-	m_bitmapLeftOnly->SetToolTip( _("Files/folders that exist on left side only") );
-	
-	bSizer122->Add( m_bitmapLeftOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer122->Add( 5, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonLeftOnly = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizer122->Add( m_bpButtonLeftOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer121->Add( bSizer122, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	wxBoxSizer* bSizer123;
-	bSizer123 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapRightOnly = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
-	m_bitmapRightOnly->SetToolTip( _("Files/folders that exist on right side only") );
-	
-	bSizer123->Add( m_bitmapRightOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer123->Add( 5, 0, 0, 0, 5 );
-	
-	m_bpButtonRightOnly = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizer123->Add( m_bpButtonRightOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer121->Add( bSizer123, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	wxBoxSizer* bSizer124;
-	bSizer124 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapLeftNewer = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
-	m_bitmapLeftNewer->SetToolTip( _("Files that exist on both sides, left one is newer") );
-	
-	bSizer124->Add( m_bitmapLeftNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer124->Add( 5, 0, 0, 0, 5 );
-	
-	m_bpButtonLeftNewer = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizer124->Add( m_bpButtonLeftNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer121->Add( bSizer124, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	wxBoxSizer* bSizer125;
-	bSizer125 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapRightNewer = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
-	m_bitmapRightNewer->SetToolTip( _("Files that exist on both sides, right one is newer") );
-	
-	bSizer125->Add( m_bitmapRightNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer125->Add( 5, 0, 0, 0, 5 );
-	
-	m_bpButtonRightNewer = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizer125->Add( m_bpButtonRightNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer121->Add( bSizer125, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	wxBoxSizer* bSizer126;
-	bSizer126 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapDifferent = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
-	m_bitmapDifferent->SetToolTip( _("Files that have different content") );
-	
-	bSizer126->Add( m_bitmapDifferent, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer126->Add( 5, 0, 0, 0, 5 );
-	
-	m_bpButtonDifferent = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizer126->Add( m_bpButtonDifferent, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer121->Add( bSizer126, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	wxBoxSizer* bSizer127;
-	bSizer127 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapConflict = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
-	m_bitmapConflict->SetToolTip( _("Conflicts/files that cannot be categorized") );
-	
-	bSizer127->Add( m_bitmapConflict, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer127->Add( 5, 0, 0, 0, 5 );
-	
-	m_bpButtonConflict = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizer127->Add( m_bpButtonConflict, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer121->Add( bSizer127, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	sbSizerSyncDirections->Add( bSizer121, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	bSizer181->Add( sbSizerSyncDirections, 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_radioBtnMirror->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncLeftToRight ), NULL, this );
-	m_buttonOneWay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncLeftToRight ), 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_radioBtnCustom->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncCustom ), 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( 300 );
+    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 will be overwritten and exactly match left folder after synchronization."), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText8->Wrap( 300 );
+    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( 300 );
+    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 ) );
+    m_radioBtnCustom->Enable( false );
+
+    fgSizer1->Add( m_radioBtnCustom, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    wxBoxSizer* bSizer65;
+    bSizer65 = new wxBoxSizer( wxVERTICAL );
+
+
+    bSizer65->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticText23 = new wxStaticText( this, wxID_ANY, _("Custom"), wxDefaultPosition, wxSize( -1,-1 ), wxALIGN_CENTRE|wxSTATIC_BORDER );
+    m_staticText23->Wrap( -1 );
+    m_staticText23->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer65->Add( m_staticText23, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+
+    bSizer65->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    fgSizer1->Add( bSizer65, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    m_staticText9 = new wxStaticText( this, wxID_ANY, _("Configure your own synchronization rules."), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText9->Wrap( 300 );
+    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 );
+
+    wxStaticBoxSizer* sbSizer231;
+    sbSizer231 = 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 );
+    sbSizer231->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 wxDirPickerCtrl( 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 );
+    sbSizer231->Add( m_panelCustomDeletionDir, 0, 0, 5 );
+
+    bSizer201->Add( sbSizer231, 0, wxEXPAND, 5 );
+
+    bSizer29->Add( bSizer201, 0, wxTOP|wxBOTTOM, 5 );
+
+
+    bSizer29->Add( 0, 5, 1, 0, 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 );
+
+    sbSizerSyncDirections = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Configuration") ), 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 );
+
+    wxBoxSizer* bSizer122;
+    bSizer122 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapLeftOnly = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
+    m_bitmapLeftOnly->SetToolTip( _("Files/folders that exist on left side only") );
+
+    bSizer122->Add( m_bitmapLeftOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer122->Add( 5, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonLeftOnly = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
+    bSizer122->Add( m_bpButtonLeftOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer121->Add( bSizer122, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    wxBoxSizer* bSizer123;
+    bSizer123 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapRightOnly = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
+    m_bitmapRightOnly->SetToolTip( _("Files/folders that exist on right side only") );
+
+    bSizer123->Add( m_bitmapRightOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer123->Add( 5, 0, 0, 0, 5 );
+
+    m_bpButtonRightOnly = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
+    bSizer123->Add( m_bpButtonRightOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer121->Add( bSizer123, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    wxBoxSizer* bSizer124;
+    bSizer124 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapLeftNewer = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
+    m_bitmapLeftNewer->SetToolTip( _("Files that exist on both sides, left one is newer") );
+
+    bSizer124->Add( m_bitmapLeftNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer124->Add( 5, 0, 0, 0, 5 );
+
+    m_bpButtonLeftNewer = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
+    bSizer124->Add( m_bpButtonLeftNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer121->Add( bSizer124, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    wxBoxSizer* bSizer125;
+    bSizer125 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapRightNewer = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
+    m_bitmapRightNewer->SetToolTip( _("Files that exist on both sides, right one is newer") );
+
+    bSizer125->Add( m_bitmapRightNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer125->Add( 5, 0, 0, 0, 5 );
+
+    m_bpButtonRightNewer = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
+    bSizer125->Add( m_bpButtonRightNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer121->Add( bSizer125, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    wxBoxSizer* bSizer126;
+    bSizer126 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapDifferent = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
+    m_bitmapDifferent->SetToolTip( _("Files that have different content") );
+
+    bSizer126->Add( m_bitmapDifferent, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer126->Add( 5, 0, 0, 0, 5 );
+
+    m_bpButtonDifferent = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
+    bSizer126->Add( m_bpButtonDifferent, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer121->Add( bSizer126, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    wxBoxSizer* bSizer127;
+    bSizer127 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapConflict = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
+    m_bitmapConflict->SetToolTip( _("Conflicts/files that cannot be categorized") );
+
+    bSizer127->Add( m_bitmapConflict, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer127->Add( 5, 0, 0, 0, 5 );
+
+    m_bpButtonConflict = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
+    bSizer127->Add( m_bpButtonConflict, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer121->Add( bSizer127, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    sbSizerSyncDirections->Add( bSizer121, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    bSizer181->Add( sbSizerSyncDirections, 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_radioBtnMirror->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncLeftToRight ), NULL, this );
+    m_buttonOneWay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncLeftToRight ), 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_radioBtnCustom->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncCustom ), 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_radioBtnMirror->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncLeftToRight ), NULL, this );
-	m_buttonOneWay->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncLeftToRight ), 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_radioBtnCustom->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncCustom ), 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_radioBtnMirror->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncLeftToRight ), NULL, this );
+    m_buttonOneWay->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncLeftToRight ), 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_radioBtnCustom->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncCustom ), 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     - filesize\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     - filesize\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, 74, 90, 92, false, wxT("Tahoma") ) );
-	m_buttonTimeSize->SetToolTip( _("Files are found equal if\n     - filesize\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, 74, 90, 92, false, wxT("Tahoma") ) );
-	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") );
-	
-	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 );
-	
-	m_checkBoxIncludeSymlinks = new wxCheckBox( this, wxID_ANY, _("Include Symbolic Links"), wxDefaultPosition, wxDefaultSize, 0 );
-	
-	bSizer55->Add( m_checkBoxIncludeSymlinks, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 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, 74, 90, 92, false, wxT("Tahoma") ) );
-	
-	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, 74, 90, 90, false, wxT("Tahoma") ) );
-	
-	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_radioBtnContent->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( CmpCfgDlgGenerated::OnContent ), NULL, this );
-	m_buttonContent->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnContent ), NULL, this );
-	m_bpButtonHelp->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnShowHelp ), NULL, this );
-	m_checkBoxIncludeSymlinks->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnIncludeSymlinks ), 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     - filesize\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     - filesize\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     - filesize\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") );
+
+    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_radioBtnContent->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( CmpCfgDlgGenerated::OnContent ), NULL, this );
+    m_buttonContent->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnContent ), 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 );
 }
 
 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_radioBtnContent->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( CmpCfgDlgGenerated::OnContent ), NULL, this );
-	m_buttonContent->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnContent ), NULL, this );
-	m_bpButtonHelp->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnShowHelp ), NULL, this );
-	m_checkBoxIncludeSymlinks->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnIncludeSymlinks ), 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_radioBtnContent->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( CmpCfgDlgGenerated::OnContent ), NULL, this );
+    m_buttonContent->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnContent ), 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 );
 }
 
 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 );
-	
-	m_animationControl1 = new wxAnimationCtrl(this, wxID_ANY, wxNullAnimation, wxDefaultPosition, wxSize( 45,45 ));
-	bSizer37->Add( m_animationControl1, 0, wxALIGN_CENTER_VERTICAL|wxALL, 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, _("Synchronization status"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText56->Wrap( -1 );
-	m_staticText56->SetFont( wxFont( 16, 74, 90, 92, false, wxT("Tahoma") ) );
-	
-	bSizer72->Add( m_staticText56, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
-	
-	m_panel8->SetSizer( bSizer72 );
-	m_panel8->Layout();
-	bSizer72->Fit( m_panel8 );
-	bSizer37->Add( m_panel8, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	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, 74, 93, 90, false, wxT("Tahoma") ) );
-	
-	bSizer42->Add( m_staticTextStatus, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-	
-	
-	bSizer42->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	bSizer27->Add( bSizer42, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	bSizer31 = 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, 74, 90, 90, false, wxT("Tahoma") ) );
-	
-	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 );
-	
-	bSizer31->Add( bSizerSpeed, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer31->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	bSizerRemTime = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText21 = new wxStaticText( this, wxID_ANY, _("Time remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText21->Wrap( -1 );
-	m_staticText21->SetFont( wxFont( 10, 74, 90, 90, false, wxT("Tahoma") ) );
-	
-	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 );
-	
-	bSizer31->Add( bSizerRemTime, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer27->Add( bSizer31, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	m_textCtrlInfo = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY );
-	m_textCtrlInfo->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_ACTIVEBORDER ) );
-	
-	bSizer27->Add( m_textCtrlInfo, 3, wxEXPAND|wxALL, 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 );
-	
-	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, 74, 90, 90, false, wxT("Tahoma") ) );
-	
-	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("Tahoma") ) );
-	
-	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("Tahoma") ) );
-	
-	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("Tahoma") ) );
-	
-	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, 74, 90, 90, false, wxT("Tahoma") ) );
-	
-	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("Tahoma") ) );
-	
-	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("Tahoma") ) );
-	
-	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("Tahoma") ) );
-	
-	bSizerObjectsProcessed->Add( m_staticText99, 0, wxALIGN_BOTTOM, 5 );
-	
-	bSizer111->Add( bSizerObjectsProcessed, 0, 0, 5 );
-	
-	bSizer28->Add( bSizer111, 0, 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, 74, 90, 90, false, wxT("Tahoma") ) );
-	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, 74, 90, 90, false, wxT("Tahoma") ) );
-	
-	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, 74, 90, 90, false, wxT("Tahoma") ) );
-	
-	bSizer28->Add( m_buttonAbort, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-	
-	
-	bSizer28->Add( 0, 0, 1, 0, 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, 74, 90, 90, false, wxT("Tahoma") ) );
-	
-	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 );
-	
-	bSizer28->Add( bSizer114, 0, 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 );
+
+    m_animationControl1 = new wxAnimationCtrl(this, wxID_ANY, wxNullAnimation, wxDefaultPosition, wxSize( 45,45 ));
+    bSizer37->Add( m_animationControl1, 0, wxALIGN_CENTER_VERTICAL|wxALL, 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, _("Synchronization status"), 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 );
+    bSizer37->Add( m_panel8, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    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, 93, 90, false, wxEmptyString ) );
+
+    bSizer42->Add( m_staticTextStatus, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxRIGHT|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 );
+
+    m_textCtrlInfo = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY );
+    m_textCtrlInfo->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_ACTIVEBORDER ) );
+
+    bSizer27->Add( m_textCtrlInfo, 3, wxEXPAND|wxALL, 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 );
+
+    bSizer28->Add( bSizerSpeed, 0, 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 );
+
+    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, 0, 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 );
 }
 
 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, 74, 90, 92, false, wxT("Tahoma") ) );
-	
-	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, 74, 90, 92, true, wxT("Tahoma") ) );
-	
-	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,175 ), wxTR_DEFAULT_STYLE );
-	m_treeCtrl1->SetBackgroundColour( wxColour( 237, 236, 235 ) );
-	
-	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"), 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, 74, 90, 92, true, wxT("Tahoma") ) );
-	
-	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( 237, 236, 235 ) );
-	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, 74, 90, 90, false, wxT("Tahoma") ) );
-	
-	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 );
+    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,175 ), wxTR_DEFAULT_STYLE );
+    m_treeCtrl1->SetBackgroundColour( wxColour( 237, 236, 235 ) );
+
+    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"), 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( 237, 236, 235 ) );
+    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 );
 }
 
 HelpDlgGenerated::~HelpDlgGenerated()
 {
-	// Disconnect Events
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( HelpDlgGenerated::OnClose ) );
-	m_button8->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( HelpDlgGenerated::OnOK ), NULL, this );
+    // Disconnect Events
+    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( HelpDlgGenerated::OnClose ) );
+    m_button8->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( HelpDlgGenerated::OnOK ), 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 );
-	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, 74, 90, 90, false, wxT("Tahoma") ) );
-	
-	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_scrolledWindowCodeInfo = new wxScrolledWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxDOUBLE_BORDER|wxHSCROLL|wxVSCROLL );
-	m_scrolledWindowCodeInfo->SetScrollRate( 5, 5 );
-	m_scrolledWindowCodeInfo->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_ACTIVEBORDER ) );
-	m_scrolledWindowCodeInfo->SetMinSize( wxSize( -1,125 ) );
-	
-	bSizerCodeInfo = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText72 = new wxStaticText( m_scrolledWindowCodeInfo, wxID_ANY, _("Source code written completely in C++ utilizing:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText72->Wrap( -1 );
-	m_staticText72->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 74, 90, 92, false, wxT("Tahoma") ) );
-	
-	bSizerCodeInfo->Add( m_staticText72, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxBOTTOM, 5 );
-	
-	m_staticText73 = new wxStaticText( m_scrolledWindowCodeInfo, wxID_ANY, _("  MinGW \t- Windows port of GNU Compiler Collection\n  wxWidgets \t- Open-Source GUI framework\n  wxFormBuilder\t- wxWidgets GUI-builder\n  CodeBlocks \t- Open-Source IDE"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText73->Wrap( -1 );
-	bSizerCodeInfo->Add( m_staticText73, 0, wxALL|wxEXPAND, 5 );
-	
-	m_staticText74 = new wxStaticText( m_scrolledWindowCodeInfo, wxID_ANY, _("- ZenJu -"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText74->Wrap( -1 );
-	m_staticText74->SetFont( wxFont( 10, 74, 93, 90, false, wxT("Tahoma") ) );
-	
-	bSizerCodeInfo->Add( m_staticText74, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxRIGHT|wxLEFT, 5 );
-	
-	m_scrolledWindowCodeInfo->SetSizer( bSizerCodeInfo );
-	m_scrolledWindowCodeInfo->Layout();
-	bSizerCodeInfo->Fit( m_scrolledWindowCodeInfo );
-	bSizer53->Add( m_scrolledWindowCodeInfo, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxBOTTOM, 10 );
-	
-	m_scrolledWindowTranslators = new wxScrolledWindow( this, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxDOUBLE_BORDER|wxHSCROLL|wxVSCROLL );
-	m_scrolledWindowTranslators->SetScrollRate( 5, 5 );
-	m_scrolledWindowTranslators->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_ACTIVEBORDER ) );
-	m_scrolledWindowTranslators->SetMinSize( wxSize( -1,140 ) );
-	m_scrolledWindowTranslators->SetMaxSize( wxSize( -1,140 ) );
-	
-	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, 74, 90, 92, false, wxT("Tahoma") ) );
-	
-	bSizerTranslators->Add( m_staticText54, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxBOTTOM, 5 );
-	
-	
-	bSizerTranslators->Add( 0, 5, 0, 0, 5 );
-	
-	fgSizerTranslators = new wxFlexGridSizer( 1, 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, 74, 93, 92, false, wxT("Tahoma") ) );
-	
-	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* bSizer104;
-	bSizer104 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer103;
-	bSizer103 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmap9 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 );
-	m_bitmap9->SetToolTip( _("FreeFileSync at Sourceforge") );
-	
-	bSizer103->Add( m_bitmap9, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 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, 74, 90, 92, true, wxT("Tahoma") ) );
-	m_hyperlink1->SetToolTip( _("http://sourceforge.net/projects/freefilesync/") );
-	
-	bSizer103->Add( m_hyperlink1, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer103->Add( 20, 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, 74, 90, 92, true, wxT("Tahoma") ) );
-	m_hyperlink6->SetToolTip( _("http://sourceforge.net/projects/freefilesync/forums/forum/976976") );
-	
-	bSizer103->Add( m_hyperlink6, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
-	bSizer104->Add( bSizer103, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer108;
-	bSizer108 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmap10 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 );
-	m_bitmap10->SetToolTip( _("Email") );
-	
-	bSizer108->Add( m_bitmap10, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_hyperlink2 = new wxHyperlinkCtrl( this, wxID_ANY, _("Email"), wxT("mailto:zhnmju123@gmx.de"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink2->SetFont( wxFont( 10, 74, 90, 92, true, wxT("Tahoma") ) );
-	m_hyperlink2->SetToolTip( _("zhnmju123@gmx.de") );
-	
-	bSizer108->Add( m_hyperlink2, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer108->Add( 30, 0, 1, wxEXPAND, 5 );
-	
-	m_animationControl1 = new wxAnimationCtrl(this, wxID_ANY, wxNullAnimation);
-	m_animationControl1->SetToolTip( _("Donate with PayPal") );
-	
-	bSizer108->Add( m_animationControl1, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 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, 74, 90, 92, true, wxT("Tahoma") ) );
-	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") );
-	
-	bSizer108->Add( m_hyperlink3, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
-	bSizer104->Add( bSizer108, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	bSizer31->Add( bSizer104, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	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, 74, 90, 90, false, wxT("Tahoma") ) );
-	
-	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_scrolledWindowCodeInfo = new wxScrolledWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxDOUBLE_BORDER|wxHSCROLL|wxVSCROLL );
+    m_scrolledWindowCodeInfo->SetScrollRate( 5, 5 );
+    m_scrolledWindowCodeInfo->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_ACTIVEBORDER ) );
+    m_scrolledWindowCodeInfo->SetMinSize( wxSize( -1,125 ) );
+
+    bSizerCodeInfo = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText72 = new wxStaticText( m_scrolledWindowCodeInfo, wxID_ANY, _("Source code written completely 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|wxEXPAND, 5 );
+
+    m_staticText73 = new wxStaticText( m_scrolledWindowCodeInfo, wxID_ANY, _("  MinGW \t- Windows port of GNU Compiler Collection\n  wxWidgets \t- Open-Source GUI framework\n  wxFormBuilder\t- wxWidgets GUI-builder\n  CodeBlocks \t- Open-Source IDE"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText73->Wrap( -1 );
+    bSizerCodeInfo->Add( m_staticText73, 0, wxALL|wxEXPAND, 5 );
+
+    m_staticText74 = new wxStaticText( m_scrolledWindowCodeInfo, wxID_ANY, _("- ZenJu -"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText74->Wrap( -1 );
+    m_staticText74->SetFont( wxFont( 10, 74, 93, 92, false, wxT("Segoe Print") ) );
+
+    bSizerCodeInfo->Add( m_staticText74, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxRIGHT|wxLEFT, 5 );
+
+    m_scrolledWindowCodeInfo->SetSizer( bSizerCodeInfo );
+    m_scrolledWindowCodeInfo->Layout();
+    bSizerCodeInfo->Fit( m_scrolledWindowCodeInfo );
+    bSizer53->Add( m_scrolledWindowCodeInfo, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxBOTTOM, 10 );
+
+    m_scrolledWindowTranslators = new wxScrolledWindow( this, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxDOUBLE_BORDER|wxHSCROLL|wxVSCROLL );
+    m_scrolledWindowTranslators->SetScrollRate( 5, 5 );
+    m_scrolledWindowTranslators->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_ACTIVEBORDER ) );
+    m_scrolledWindowTranslators->SetMinSize( wxSize( -1,140 ) );
+    m_scrolledWindowTranslators->SetMaxSize( wxSize( -1,140 ) );
+
+    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( 1, 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* bSizer104;
+    bSizer104 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer103;
+    bSizer103 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmap9 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 );
+    m_bitmap9->SetToolTip( _("FreeFileSync at Sourceforge") );
+
+    bSizer103->Add( m_bitmap9, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 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/") );
+
+    bSizer103->Add( m_hyperlink1, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer103->Add( 20, 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") );
+
+    bSizer103->Add( m_hyperlink6, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+
+    bSizer104->Add( bSizer103, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer108;
+    bSizer108 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmap10 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 );
+    m_bitmap10->SetToolTip( _("Email") );
+
+    bSizer108->Add( m_bitmap10, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 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") );
+
+    bSizer108->Add( m_hyperlink2, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer108->Add( 30, 0, 1, wxEXPAND, 5 );
+
+    m_animationControl1 = new wxAnimationCtrl(this, wxID_ANY, wxNullAnimation);
+    m_animationControl1->SetToolTip( _("Donate with PayPal") );
+
+    bSizer108->Add( m_animationControl1, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 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") );
+
+    bSizer108->Add( m_hyperlink3, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+
+    bSizer104->Add( bSizer108, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    bSizer31->Add( bSizer104, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    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( wxSystemSettings::GetColour( wxSYS_COLOUR_ACTIVEBORDER ) );
-	
-	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, 74, 90, 90, false, wxT("Tahoma") ) );
-	
-	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, 74, 90, 90, false, wxT("Tahoma") ) );
-	
-	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, 74, 90, 90, false, wxT("Tahoma") ) );
-	
-	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( wxSystemSettings::GetColour( wxSYS_COLOUR_ACTIVEBORDER ) );
+
+    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( wxSystemSettings::GetColour( wxSYS_COLOUR_ACTIVEBORDER ) );
-	
-	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, 74, 90, 90, false, wxT("Tahoma") ) );
-	
-	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, 74, 90, 90, false, wxT("Tahoma") ) );
-	
-	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, 74, 90, 90, false, wxT("Tahoma") ) );
-	
-	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( wxSystemSettings::GetColour( wxSYS_COLOUR_ACTIVEBORDER ) );
+
+    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( wxSystemSettings::GetColour( wxSYS_COLOUR_ACTIVEBORDER ) );
-	
-	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, 74, 90, 90, false, wxT("Tahoma") ) );
-	
-	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, 74, 90, 90, false, wxT("Tahoma") ) );
-	
-	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, 74, 90, 90, false, wxT("Tahoma") ) );
-	
-	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( wxSystemSettings::GetColour( wxSYS_COLOUR_ACTIVEBORDER ) );
+
+    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 );
 }
 
 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_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, 74, 90, 90, false, wxT("Tahoma") ) );
-	
-	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_MULTILINE|wxTE_READONLY );
-	m_textCtrlMessage->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_ACTIVEBORDER ) );
-	
-	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, 74, 90, 92, false, wxT("Tahoma") ) );
-	
-	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, 74, 90, 90, false, wxT("Tahoma") ) );
-	
-	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_MULTILINE|wxTE_READONLY );
+    m_textCtrlMessage->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_ACTIVEBORDER ) );
+
+    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( wxDefaultSize, 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, 74, 90, 92, false, wxT("Tahoma") ) );
-	
-	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 pass filtering will be selected for synchronization. The filter will be applied to the name relative(!) to the base synchronization directories."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText44->Wrap( 400 );
-	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") );
-	
-	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, 74, 90, 92, true, wxT("Tahoma") ) );
-	
-	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, 74, 93, 90, false, wxT("Tahoma") ) );
-	
-	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 );
-	
-	wxStaticBoxSizer* sbSizer8;
-	sbSizer8 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxEmptyString ), wxVERTICAL );
-	
-	wxFlexGridSizer* fgSizer3;
-	fgSizer3 = new wxFlexGridSizer( 2, 2, 0, 0 );
-	fgSizer3->AddGrowableCol( 1 );
-	fgSizer3->AddGrowableRow( 1 );
-	fgSizer3->SetFlexibleDirection( wxBOTH );
-	fgSizer3->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	
-	fgSizer3->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticText15 = new wxStaticText( this, wxID_ANY, _("Include"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText15->Wrap( -1 );
-	m_staticText15->SetFont( wxFont( 10, 74, 90, 92, false, wxT("Tahoma") ) );
-	
-	fgSizer3->Add( m_staticText15, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-	
-	m_bitmap8 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), 0 );
-	fgSizer3->Add( m_bitmap8, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_textCtrlInclude = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE );
-	fgSizer3->Add( m_textCtrlInclude, 1, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	sbSizer8->Add( fgSizer3, 1, wxEXPAND, 5 );
-	
-	wxFlexGridSizer* fgSizer4;
-	fgSizer4 = new wxFlexGridSizer( 2, 2, 0, 0 );
-	fgSizer4->AddGrowableCol( 1 );
-	fgSizer4->AddGrowableRow( 1 );
-	fgSizer4->SetFlexibleDirection( wxBOTH );
-	fgSizer4->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	
-	fgSizer4->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticText16 = new wxStaticText( this, wxID_ANY, _("Exclude"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText16->Wrap( -1 );
-	m_staticText16->SetFont( wxFont( 10, 74, 90, 92, false, wxT("Tahoma") ) );
-	
-	fgSizer4->Add( m_staticText16, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-	
-	m_bitmap9 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), 0 );
-	fgSizer4->Add( m_bitmap9, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_textCtrlExclude = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE );
-	fgSizer4->Add( m_textCtrlExclude, 1, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	sbSizer8->Add( fgSizer4, 1, wxEXPAND, 5 );
-	
-	bSizer21->Add( sbSizer8, 1, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-	
-	
-	bSizer21->Add( 0, 0, 0, 0, 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, 74, 90, 90, false, wxT("Tahoma") ) );
-	
-	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, 74, 90, 92, false, wxT("Tahoma") ) );
-	
-	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, 74, 90, 90, false, wxT("Tahoma") ) );
-	
-	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_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( wxDefaultSize, 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 pass filtering will be selected for synchronization. The filter will be applied to the name relative(!) to the base synchronization directories."), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText44->Wrap( 400 );
+    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") );
+
+    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 );
+
+    wxStaticBoxSizer* sbSizer8;
+    sbSizer8 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxEmptyString ), wxVERTICAL );
+
+    wxFlexGridSizer* fgSizer3;
+    fgSizer3 = new wxFlexGridSizer( 2, 2, 0, 0 );
+    fgSizer3->AddGrowableCol( 1 );
+    fgSizer3->AddGrowableRow( 1 );
+    fgSizer3->SetFlexibleDirection( wxBOTH );
+    fgSizer3->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+
+    fgSizer3->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticText15 = new wxStaticText( this, wxID_ANY, _("Include"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText15->Wrap( -1 );
+    m_staticText15->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
+
+    fgSizer3->Add( m_staticText15, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+
+    m_bitmap8 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), 0 );
+    fgSizer3->Add( m_bitmap8, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_textCtrlInclude = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE );
+    fgSizer3->Add( m_textCtrlInclude, 1, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    sbSizer8->Add( fgSizer3, 1, wxEXPAND, 5 );
+
+    wxFlexGridSizer* fgSizer4;
+    fgSizer4 = new wxFlexGridSizer( 2, 2, 0, 0 );
+    fgSizer4->AddGrowableCol( 1 );
+    fgSizer4->AddGrowableRow( 1 );
+    fgSizer4->SetFlexibleDirection( wxBOTH );
+    fgSizer4->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+
+    fgSizer4->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticText16 = new wxStaticText( this, wxID_ANY, _("Exclude"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText16->Wrap( -1 );
+    m_staticText16->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
+
+    fgSizer4->Add( m_staticText16, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+
+    m_bitmap9 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), 0 );
+    fgSizer4->Add( m_bitmap9, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_textCtrlExclude = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE );
+    fgSizer4->Add( m_textCtrlExclude, 1, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    sbSizer8->Add( fgSizer4, 1, wxEXPAND, 5 );
+
+    bSizer21->Add( sbSizer8, 1, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+
+
+    bSizer21->Add( 0, 0, 0, 0, 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_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_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_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") );
-	
-	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") );
-	
-	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, 74, 90, 90, false, wxT("Tahoma") ) );
-	
-	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, 74, 90, 92, false, wxT("Tahoma") ) );
-	
-	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, 74, 90, 90, false, wxT("Tahoma") ) );
-	
-	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") );
+
+    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") );
+
+    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 );
 }
 
 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, 74, 90, 92, false, wxT("Tahoma") ) );
-	
-	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_checkBoxIgnoreOneHour = new wxCheckBox( this, wxID_ANY, _("Ignore 1-hour file time difference"), wxDefaultPosition, wxDefaultSize, 0 );
-	
-	m_checkBoxIgnoreOneHour->SetToolTip( _("Treat file times that differ by exactly +/- 1 hour as equal, less than 1 hour as conflict in order to handle Daylight Saving Time changes") );
-	
-	sbSizer23->Add( m_checkBoxIgnoreOneHour, 0, wxALL|wxALIGN_CENTER_VERTICAL, 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") );
-	
-	sbSizer23->Add( m_checkBoxCopyLocked, 0, wxALL|wxALIGN_CENTER_VERTICAL, 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( 8, 74, 90, 92, false, wxT("Tahoma") ) );
-	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, 98 );
-	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, 74, 90, 90, false, wxT("Tahoma") ) );
-	
-	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, 74, 90, 92, false, wxT("Tahoma") ) );
-	
-	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, 74, 90, 90, false, wxT("Tahoma") ) );
-	
-	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_checkBoxIgnoreOneHour = new wxCheckBox( this, wxID_ANY, _("Ignore 1-hour file time difference"), wxDefaultPosition, wxDefaultSize, 0 );
+
+    m_checkBoxIgnoreOneHour->SetToolTip( _("Treat file times that differ by exactly +/- 1 hour as equal, less than 1 hour as conflict in order to handle Daylight Saving Time changes") );
+
+    sbSizer23->Add( m_checkBoxIgnoreOneHour, 0, wxALL|wxALIGN_CENTER_VERTICAL|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") );
+
+    sbSizer23->Add( m_checkBoxCopyLocked, 0, wxALL|wxALIGN_CENTER_VERTICAL|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, 98 );
+    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 );
 }
 
 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, 74, 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, 74, 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, 74, 90, 92, false, wxT("Arial") ) );
-	
-	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 );
-	m_textCtrlCreateL->SetFont( wxFont( 8, 74, 90, 90, false, wxT("Tahoma") ) );
-	m_textCtrlCreateL->SetBackgroundColour( wxColour( 222, 222, 236 ) );
-	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 );
-	m_textCtrlUpdateL->SetFont( wxFont( 8, 74, 90, 90, false, wxT("Tahoma") ) );
-	m_textCtrlUpdateL->SetBackgroundColour( wxColour( 222, 222, 236 ) );
-	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 );
-	m_textCtrlDeleteL->SetFont( wxFont( 8, 74, 90, 90, false, wxT("Tahoma") ) );
-	m_textCtrlDeleteL->SetBackgroundColour( wxColour( 222, 222, 236 ) );
-	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, 74, 90, 92, false, wxT("Arial") ) );
-	
-	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 );
-	m_textCtrlCreateR->SetFont( wxFont( 8, 74, 90, 90, false, wxT("Tahoma") ) );
-	m_textCtrlCreateR->SetBackgroundColour( wxColour( 222, 222, 236 ) );
-	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 );
-	m_textCtrlUpdateR->SetFont( wxFont( 8, 74, 90, 90, false, wxT("Tahoma") ) );
-	m_textCtrlUpdateR->SetBackgroundColour( wxColour( 222, 222, 236 ) );
-	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 );
-	m_textCtrlDeleteR->SetFont( wxFont( 8, 74, 90, 90, false, wxT("Tahoma") ) );
-	m_textCtrlDeleteR->SetBackgroundColour( wxColour( 222, 222, 236 ) );
-	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_READONLY );
-	m_textCtrlData->SetFont( wxFont( 8, 74, 90, 90, false, wxT("Tahoma") ) );
-	m_textCtrlData->SetBackgroundColour( wxColour( 222, 222, 236 ) );
-	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, 74, 90, 90, false, wxT("Tahoma") ) );
-	
-	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 );
+    m_textCtrlCreateL->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
+    m_textCtrlCreateL->SetBackgroundColour( wxColour( 222, 222, 236 ) );
+    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 );
+    m_textCtrlUpdateL->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
+    m_textCtrlUpdateL->SetBackgroundColour( wxColour( 222, 222, 236 ) );
+    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 );
+    m_textCtrlDeleteL->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
+    m_textCtrlDeleteL->SetBackgroundColour( wxColour( 222, 222, 236 ) );
+    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 );
+    m_textCtrlCreateR->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
+    m_textCtrlCreateR->SetBackgroundColour( wxColour( 222, 222, 236 ) );
+    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 );
+    m_textCtrlUpdateR->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
+    m_textCtrlUpdateR->SetBackgroundColour( wxColour( 222, 222, 236 ) );
+    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 );
+    m_textCtrlDeleteR->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
+    m_textCtrlDeleteR->SetBackgroundColour( wxColour( 222, 222, 236 ) );
+    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_READONLY );
+    m_textCtrlData->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
+    m_textCtrlData->SetBackgroundColour( wxColour( 222, 222, 236 ) );
+    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 );
-	this->SetBackgroundColour( wxColour( 255, 255, 255 ) );
-	
-	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 );
+    this->SetBackgroundColour( wxColour( 255, 255, 255 ) );
+
+    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()
@@ -3697,67 +3702,67 @@ 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, 74, 90, 92, false, wxT("Tahoma") ) );
-	
-	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, 74, 90, 90, false, wxT("Tahoma") ) );
-	
-	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, 10, 0, 0, 5 );
+
+    m_checkBoxMatchCase = new wxCheckBox( this, wxID_ANY, _("Match case"), wxDefaultPosition, wxDefaultSize, 0 );
+
+    bSizer166->Add( m_checkBoxMatchCase, 0, wxALL|wxEXPAND, 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 );
 }
 
 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 );
 }
diff --git a/ui/guiGenerated.h b/ui/guiGenerated.h
index 32e0c2a4..f4793fc6 100644
--- a/ui/guiGenerated.h
+++ b/ui/guiGenerated.h
@@ -57,984 +57,1387 @@ 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* bSizer1;
-		wxPanel* m_panel71;
-		wxBoxSizer* bSizer6;
-		
-		wxStaticText* m_staticTextCmpVariant;
-		
-		wxButtonWithImage* m_buttonCompare;
-		wxButton* m_buttonAbort;
-		wxBitmapButton* m_bpButtonCmpConfig;
-		
-		
-		wxStaticText* m_staticTextSyncVariant;
-		wxBitmapButton* m_bpButtonSyncConfig;
-		wxButtonWithImage* m_buttonStartSync;
-		
-		wxStaticBoxSizer* sbSizer2;
-		wxPanel* m_panelTopMiddle;
-		
-		wxBoxSizer* bSizerMiddle;
-		wxBitmapButton* m_bpButtonSwapSides;
-		
-		
-		
-		wxBitmapButton* m_bpButtonAddPair;
-		wxScrolledWindow* m_scrolledWindowFolderPairs;
-		wxBoxSizer* bSizerAddFolderPairs;
-		CustomGridLeft* m_gridLeft;
-		wxPanel* m_panelMiddle;
-		CustomGridMiddle* m_gridMiddle;
-		CustomGridRight* m_gridRight;
-		wxPanel* m_panelBottom;
-		wxBoxSizer* bSizer3;
-		wxNotebook* m_notebookBottomLeft;
-		wxPanel* m_panel30;
-		wxBitmapButton* m_bpButtonSave;
-		wxBitmapButton* m_bpButtonLoad;
-		wxChoice* m_choiceHistory;
-		wxPanel* m_panelFilter;
-		wxBitmapButton* m_bpButtonFilter;
-		wxCheckBox* m_checkBoxHideFilt;
-		wxPanel* m_panel112;
-		
-		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;
-		
-		wxBoxSizer* bSizerBottomRight;
-		
-		wxPanel* m_panelSyncPreview;
-		wxStaticBitmap* m_bitmapCreate;
-		wxTextCtrl* m_textCtrlCreate;
-		wxStaticBitmap* m_bitmapDelete;
-		wxTextCtrl* m_textCtrlDelete;
-		wxStaticBitmap* m_bitmapUpdate;
-		wxTextCtrl* m_textCtrlUpdate;
-		wxStaticBitmap* m_bitmapData;
-		wxTextCtrl* m_textCtrlData;
-		wxBitmapButton* m_bpButton10;
-		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(); }
-		virtual void OnQuit( wxCommandEvent& event ){ event.Skip(); }
-		
-	
-	public:
-		wxPanel* m_panelTopLeft;
-		CustomComboBox* m_directoryLeft;
-		wxDirPickerCtrl* m_dirPickerLeft;
-		wxBitmapButton* m_bpButtonLocalFilter;
-		wxBitmapButton* m_bpButtonAltSyncCfg;
-		wxPanel* m_panelTopRight;
-		wxBitmapButton* m_bpButtonRemovePair;
-		CustomComboBox* m_directoryRight;
-		wxDirPickerCtrl* 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( 933,612 ), 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* bSizer1;
+    wxPanel* m_panel71;
+    wxBoxSizer* bSizer6;
+
+    wxStaticText* m_staticTextCmpVariant;
+
+    wxButtonWithImage* m_buttonCompare;
+    wxButton* m_buttonAbort;
+    wxBitmapButton* m_bpButtonCmpConfig;
+
+
+    wxStaticText* m_staticTextSyncVariant;
+    wxBitmapButton* m_bpButtonSyncConfig;
+    wxButtonWithImage* m_buttonStartSync;
+
+    wxStaticBoxSizer* sbSizer2;
+    wxPanel* m_panelTopMiddle;
+
+    wxBoxSizer* bSizerMiddle;
+    wxBitmapButton* m_bpButtonSwapSides;
+
+
+
+    wxBitmapButton* m_bpButtonAddPair;
+    wxScrolledWindow* m_scrolledWindowFolderPairs;
+    wxBoxSizer* bSizerAddFolderPairs;
+    wxBoxSizer* bSizerGridHolder;
+    CustomGridLeft* m_gridLeft;
+    wxPanel* m_panelMiddle;
+    CustomGridMiddle* m_gridMiddle;
+    CustomGridRight* m_gridRight;
+    wxPanel* m_panelBottom;
+    wxBoxSizer* bSizer3;
+    wxNotebook* m_notebookBottomLeft;
+    wxPanel* m_panel30;
+    wxBitmapButton* m_bpButtonSave;
+    wxBitmapButton* m_bpButtonLoad;
+    wxChoice* m_choiceHistory;
+    wxPanel* m_panelFilter;
+    wxBitmapButton* m_bpButtonFilter;
+    wxCheckBox* m_checkBoxHideFilt;
+    wxPanel* m_panelViewFilter;
+
+    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;
+
+    wxBoxSizer* bSizerBottomRight;
+
+    wxPanel* m_panelSyncPreview;
+    wxStaticBitmap* m_bitmapCreate;
+    wxTextCtrl* m_textCtrlCreate;
+    wxStaticBitmap* m_bitmapDelete;
+    wxTextCtrl* m_textCtrlDelete;
+    wxStaticBitmap* m_bitmapUpdate;
+    wxTextCtrl* m_textCtrlUpdate;
+    wxStaticBitmap* m_bitmapData;
+    wxTextCtrl* m_textCtrlData;
+    wxBitmapButton* m_bpButton10;
+    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();
+    }
+    virtual void OnQuit( wxCommandEvent& event )
+    {
+        event.Skip();
+    }
+
+
+public:
+    wxPanel* m_panelTopLeft;
+    CustomComboBox* m_directoryLeft;
+    wxDirPickerCtrl* m_dirPickerLeft;
+    wxBitmapButton* m_bpButtonLocalFilter;
+    wxBitmapButton* m_bpButtonAltSyncCfg;
+    wxPanel* m_panelTopRight;
+    wxBitmapButton* m_bpButtonRemovePair;
+    CustomComboBox* m_directoryRight;
+    wxDirPickerCtrl* 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( 933,612 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
+    ~MainDialogGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class FolderPairGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class FolderPairGenerated : public wxPanel 
+class FolderPairGenerated : public wxPanel
 {
-	private:
-	
-	protected:
-		wxPanel* m_panel20;
-		
-		
-		
-	
-	public:
-		wxPanel* m_panelLeft;
-		wxTextCtrl* m_directoryLeft;
-		wxDirPickerCtrl* m_dirPickerLeft;
-		wxPanel* m_panel21;
-		wxBitmapButton* m_bpButtonLocalFilter;
-		wxBitmapButton* m_bpButtonAltSyncCfg;
-		wxPanel* m_panelRight;
-		wxBitmapButton* m_bpButtonRemovePair;
-		wxTextCtrl* m_directoryRight;
-		wxDirPickerCtrl* 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:
+    wxPanel* m_panel20;
+
+
+
+
+public:
+    wxPanel* m_panelLeft;
+    wxTextCtrl* m_directoryLeft;
+    wxDirPickerCtrl* m_dirPickerLeft;
+    wxPanel* m_panel21;
+    wxBitmapButton* m_bpButtonLocalFilter;
+    wxBitmapButton* m_bpButtonAltSyncCfg;
+    wxPanel* m_panelRight;
+    wxBitmapButton* m_bpButtonRemovePair;
+    wxTextCtrl* m_directoryRight;
+    wxDirPickerCtrl* 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 BatchFolderPairGenerated : public wxPanel 
+class BatchFolderPairGenerated : public wxPanel
 {
-	private:
-	
-	protected:
-		wxPanel* m_panel32;
-		wxStaticText* m_staticText53;
-		wxStaticText* m_staticText541;
-		wxPanel* m_panelLeft;
-		wxPanel* m_panelRight;
-		
-	
-	public:
-		wxBitmapButton* m_bpButtonRemovePair;
-		wxTextCtrl* m_directoryLeft;
-		wxDirPickerCtrl* m_dirPickerLeft;
-		wxBitmapButton* m_bpButtonLocalFilter;
-		wxTextCtrl* m_directoryRight;
-		wxDirPickerCtrl* 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:
+    wxPanel* m_panel32;
+    wxStaticText* m_staticText53;
+    wxStaticText* m_staticText541;
+    wxPanel* m_panelLeft;
+    wxPanel* m_panelRight;
+
+
+public:
+    wxBitmapButton* m_bpButtonRemovePair;
+    wxTextCtrl* m_directoryLeft;
+    wxDirPickerCtrl* m_dirPickerLeft;
+    wxBitmapButton* m_bpButtonLocalFilter;
+    wxTextCtrl* m_directoryRight;
+    wxDirPickerCtrl* 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();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class BatchDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class BatchDlgGenerated : public wxDialog 
+class BatchDlgGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		wxBoxSizer* bSizer69;
-		wxStaticBitmap* m_bitmap27;
-		wxPanel* m_panel8;
-		wxStaticText* m_staticText56;
-		
-		
-		wxStaticText* m_staticText44;
-		wxBitmapButton* m_bpButtonHelp;
-		
-		wxStaticLine* m_staticline10;
-		wxStaticText* m_staticText531;
-		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;
-		
-		wxCheckBox* m_checkBoxSilent;
-		
-		wxPanel* m_panelLogging;
-		wxStaticText* m_staticText120;
-		wxTextCtrl* m_textCtrlLogfileDir;
-		wxDirPickerCtrl* 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 OnCheckSilent( 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;
-		wxDirPickerCtrl* m_dirPickerLeft;
-		wxBitmapButton* m_bpButtonLocalFilter;
-		wxPanel* m_panelRight;
-		wxTextCtrl* m_directoryRight;
-		wxDirPickerCtrl* 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:
+    wxBoxSizer* bSizer69;
+    wxStaticBitmap* m_bitmap27;
+    wxPanel* m_panel8;
+    wxStaticText* m_staticText56;
+
+
+    wxStaticText* m_staticText44;
+    wxBitmapButton* m_bpButtonHelp;
+
+    wxStaticLine* m_staticline10;
+    wxStaticText* m_staticText531;
+    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;
+
+
+    wxCheckBox* m_checkBoxSilent;
+
+    wxChoice* m_choiceHandleError;
+    wxPanel* m_panelLogging;
+    wxStaticText* m_staticText120;
+    wxTextCtrl* m_textCtrlLogfileDir;
+    wxDirPickerCtrl* 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 OnCheckSilent( wxCommandEvent& event )
+    {
+        event.Skip();
+    }
+    virtual void OnChangeErrorHandling( 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;
+    wxDirPickerCtrl* m_dirPickerLeft;
+    wxBitmapButton* m_bpButtonLocalFilter;
+    wxPanel* m_panelRight;
+    wxTextCtrl* m_directoryRight;
+    wxDirPickerCtrl* 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();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// 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 = 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 = 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;
-		
-		wxStaticText* m_staticText23;
-		
-		wxStaticText* m_staticText9;
-		
-		wxBoxSizer* bSizer201;
-		wxStaticBoxSizer* sbSizerErrorHandling;
-		wxChoice* m_choiceHandleError;
-		wxChoice* m_choiceHandleDeletion;
-		wxPanel* m_panelCustomDeletionDir;
-		wxTextCtrl* m_textCtrlCustomDelFolder;
-		wxDirPickerCtrl* m_dirPickerCustomDelFolder;
-		
-		wxButton* m_buttonOK;
-		wxButton* m_button16;
-		
-		
-		wxStaticBoxSizer* sbSizerSyncDirections;
-		wxStaticText* m_staticText21;
-		wxStaticText* m_staticText31;
-		wxStaticLine* m_staticline3;
-		wxStaticBitmap* m_bitmapLeftOnly;
-		
-		wxBitmapButton* m_bpButtonLeftOnly;
-		wxStaticBitmap* m_bitmapRightOnly;
-		
-		wxBitmapButton* m_bpButtonRightOnly;
-		wxStaticBitmap* m_bitmapLeftNewer;
-		
-		wxBitmapButton* m_bpButtonLeftNewer;
-		wxStaticBitmap* m_bitmapRightNewer;
-		
-		wxBitmapButton* m_bpButtonRightNewer;
-		wxStaticBitmap* m_bitmapDifferent;
-		
-		wxBitmapButton* m_bpButtonDifferent;
-		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 OnSyncLeftToRight( wxCommandEvent& event ){ event.Skip(); }
-		virtual void OnSyncUpdate( wxCommandEvent& event ){ event.Skip(); }
-		virtual void OnSyncCustom( wxCommandEvent& 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;
+
+    wxStaticText* m_staticText23;
+
+    wxStaticText* m_staticText9;
+
+    wxBoxSizer* bSizer201;
+    wxStaticBoxSizer* sbSizerErrorHandling;
+    wxChoice* m_choiceHandleError;
+    wxChoice* m_choiceHandleDeletion;
+    wxPanel* m_panelCustomDeletionDir;
+    wxTextCtrl* m_textCtrlCustomDelFolder;
+    wxDirPickerCtrl* m_dirPickerCustomDelFolder;
+
+    wxButton* m_buttonOK;
+    wxButton* m_button16;
+
+
+    wxStaticBoxSizer* sbSizerSyncDirections;
+    wxStaticText* m_staticText21;
+    wxStaticText* m_staticText31;
+    wxStaticLine* m_staticline3;
+    wxStaticBitmap* m_bitmapLeftOnly;
+
+    wxBitmapButton* m_bpButtonLeftOnly;
+    wxStaticBitmap* m_bitmapRightOnly;
+
+    wxBitmapButton* m_bpButtonRightOnly;
+    wxStaticBitmap* m_bitmapLeftNewer;
+
+    wxBitmapButton* m_bpButtonLeftNewer;
+    wxStaticBitmap* m_bitmapRightNewer;
+
+    wxBitmapButton* m_bpButtonRightNewer;
+    wxStaticBitmap* m_bitmapDifferent;
+
+    wxBitmapButton* m_bpButtonDifferent;
+    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 OnSyncLeftToRight( wxCommandEvent& event )
+    {
+        event.Skip();
+    }
+    virtual void OnSyncUpdate( wxCommandEvent& event )
+    {
+        event.Skip();
+    }
+    virtual void OnSyncCustom( wxCommandEvent& 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;
-		
-		wxCheckBox* m_checkBoxIncludeSymlinks;
-		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 OnContent( wxCommandEvent& event ){ event.Skip(); }
-		virtual void OnShowHelp( wxCommandEvent& event ){ event.Skip(); }
-		virtual void OnIncludeSymlinks( 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;
+    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 OnContent( wxCommandEvent& 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();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class SyncStatusDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class SyncStatusDlgGenerated : public wxFrame 
+class SyncStatusDlgGenerated : public wxFrame
 {
-	private:
-	
-	protected:
-		
-		wxAnimationCtrl* m_animationControl1;
-		wxPanel* m_panel8;
-		wxStaticText* m_staticText56;
-		
-		wxStaticBitmap* m_bitmapStatus;
-		wxStaticText* m_staticTextStatus;
-		
-		wxBoxSizer* bSizer31;
-		wxBoxSizer* bSizerSpeed;
-		wxStaticText* m_staticText108;
-		wxStaticText* m_staticTextSpeed;
-		
-		wxBoxSizer* bSizerRemTime;
-		wxStaticText* m_staticText21;
-		wxStaticText* m_staticTextTimeRemaining;
-		wxTextCtrl* m_textCtrlInfo;
-		wxBoxSizer* bSizer28;
-		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;
-		
-		wxButton* m_buttonOK;
-		wxButton* m_buttonPause;
-		wxButton* m_buttonAbort;
-		
-		wxStaticText* m_staticText55;
-		wxStaticText* m_staticTextTimeElapsed;
-		
-		
-		// 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,376 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
-		~SyncStatusDlgGenerated();
-	
+private:
+
+protected:
+
+    wxAnimationCtrl* m_animationControl1;
+    wxPanel* m_panel8;
+    wxStaticText* m_staticText56;
+
+    wxStaticBitmap* m_bitmapStatus;
+    wxStaticText* m_staticTextStatus;
+
+    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;
+    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,376 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
+    ~SyncStatusDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class HelpDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class HelpDlgGenerated : public wxDialog 
+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();
-	
+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;
-		
-		wxScrolledWindow* m_scrolledWindowCodeInfo;
-		wxBoxSizer* bSizerCodeInfo;
-		wxStaticText* m_staticText72;
-		wxStaticText* m_staticText73;
-		wxStaticText* m_staticText74;
-		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_hyperlink6;
-		wxStaticBitmap* m_bitmap10;
-		wxHyperlinkCtrl* m_hyperlink2;
-		
-		wxAnimationCtrl* m_animationControl1;
-		wxHyperlinkCtrl* m_hyperlink3;
-		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;
+
+    wxScrolledWindow* m_scrolledWindowCodeInfo;
+    wxBoxSizer* bSizerCodeInfo;
+    wxStaticText* m_staticText72;
+    wxStaticText* m_staticText73;
+    wxStaticText* m_staticText74;
+    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_hyperlink6;
+    wxStaticBitmap* m_bitmap10;
+    wxHyperlinkCtrl* m_hyperlink2;
+
+    wxAnimationCtrl* m_animationControl1;
+    wxHyperlinkCtrl* m_hyperlink3;
+    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( 421,228 ), long style = wxDEFAULT_DIALOG_STYLE|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( 421,228 ), long style = wxDEFAULT_DIALOG_STYLE|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( 421,231 ), long style = wxDEFAULT_DIALOG_STYLE|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( 421,231 ), long style = wxDEFAULT_DIALOG_STYLE|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|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 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|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|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|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;
-		
-		wxStaticText* m_staticText15;
-		wxStaticBitmap* m_bitmap8;
-		wxTextCtrl* m_textCtrlInclude;
-		
-		wxStaticText* m_staticText16;
-		wxStaticBitmap* m_bitmap9;
-		wxTextCtrl* m_textCtrlExclude;
-		
-		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 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;
+
+    wxStaticText* m_staticText15;
+    wxStaticBitmap* m_bitmap8;
+    wxTextCtrl* m_textCtrlInclude;
+
+    wxStaticText* m_staticText16;
+    wxStaticBitmap* m_bitmap9;
+    wxTextCtrl* m_textCtrlExclude;
+
+    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 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_checkBoxIgnoreOneHour;
-		wxCheckBox* m_checkBoxCopyLocked;
-		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_checkBoxIgnoreOneHour;
+    wxCheckBox* m_checkBoxCopyLocked;
+    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();
+
 };
 
 #endif //__guiGenerated__
diff --git a/ui/guiStatusHandler.cpp b/ui/guiStatusHandler.cpp
index 0cd32383..3d91fbe7 100644
--- a/ui/guiStatusHandler.cpp
+++ b/ui/guiStatusHandler.cpp
@@ -94,9 +94,13 @@ void CompareStatusHandler::initNewProcess(int objectsTotal, wxLongLong dataTotal
     case StatusHandler::PROCESS_SCANNING:
         break;
     case StatusHandler::PROCESS_COMPARING_CONTENT:
+    {
+        wxWindowUpdateLocker dummy(mainDialog);
         mainDialog->compareStatus->switchToCompareBytewise(objectsTotal, dataTotal);
-        mainDialog->Layout();
-        break;
+        mainDialog->Layout();  //show progress bar...
+        mainDialog->Refresh(); //remove distortion...
+    }
+    break;
     case StatusHandler::PROCESS_SYNCHRONIZING:
     case StatusHandler::PROCESS_NONE:
         assert(false);
@@ -241,7 +245,7 @@ SyncStatusHandler::~SyncStatusHandler()
     if (totalErrors > 0)
     {
         wxString header(_("Warning: Synchronization failed for %x item(s):"));
-        header.Replace(wxT("%x"), FreeFileSync::numberToWxString(totalErrors, true), false);
+        header.Replace(wxT("%x"), FreeFileSync::numberToStringSep(totalErrors), false);
         finalMessage += header + wxT("\n\n");
     }
 
@@ -374,6 +378,12 @@ void SyncStatusHandler::reportWarning(const wxString& warningMessage, bool& warn
 }
 
 
+void SyncStatusHandler::reportInfo(const wxString& infoMessage)
+{
+    errorLog.logInfo(infoMessage);
+}
+
+
 void SyncStatusHandler::forceUiRefresh()
 {
     syncStatusFrame.updateStatusDialogNow();
diff --git a/ui/guiStatusHandler.h b/ui/guiStatusHandler.h
index add3ffaa..18bbdc10 100644
--- a/ui/guiStatusHandler.h
+++ b/ui/guiStatusHandler.h
@@ -59,6 +59,7 @@ public:
     virtual ErrorHandler::Response reportError(const wxString& text);
     virtual void reportFatalError(const wxString& errorMessage);
     virtual void reportWarning(const wxString& warningMessage, bool& warningActive);
+    void reportInfo(const wxString& infoMessage);
 
 private:
     virtual void abortThisProcess();
diff --git a/ui/progressIndicator.cpp b/ui/progressIndicator.cpp
index 09af2f6f..8a1f14f8 100644
--- a/ui/progressIndicator.cpp
+++ b/ui/progressIndicator.cpp
@@ -307,15 +307,16 @@ void CompareStatus::CompareStatusImpl::updateStatusPanelNow()
     {
         //wxWindowUpdateLocker dummy(this) -> not needed
 
+        const float percent = totalData == 0 ? 0 : currentData.ToDouble() * 100 / totalData.ToDouble();
+
         //write status information to taskbar, parent title ect.
         switch (status)
         {
         case SCANNING:
-            showProgressExternally(numberToWxString(scannedObjects, true) + wxT(" - ") + _("Scanning..."));
+            showProgressExternally(numberToStringSep(scannedObjects) + wxT(" - ") + _("Scanning..."));
             break;
         case COMPARING_CONTENT:
-            showProgressExternally(formatPercentage(currentData, totalData) + wxT(" - ") + _("Comparing content..."),
-                                   currentData.ToDouble() * 100 / totalData.ToDouble());
+            showProgressExternally(formatPercentage(currentData, totalData) + wxT(" - ") + _("Comparing content..."), percent);
             break;
         }
 
@@ -333,13 +334,13 @@ void CompareStatus::CompareStatusImpl::updateStatusPanelNow()
             m_textCtrlStatus->ChangeValue(formattedStatusText);
 
         //nr of scanned objects
-        setNewText(numberToWxString(scannedObjects, true), *m_staticTextScanned, updateLayout);
+        setNewText(numberToStringSep(scannedObjects), *m_staticTextScanned, updateLayout);
 
         //progress indicator for "compare file content"
         m_gauge2->SetValue(int(currentData.ToDouble() * scalingFactor));
 
         //remaining files left for file comparison
-        const wxString filesToCompareTmp = numberToWxString(totalObjects - currentObjects, true);
+        const wxString filesToCompareTmp = numberToStringSep(totalObjects - currentObjects);
         setNewText(filesToCompareTmp, *m_staticTextFilesRemaining, updateLayout);
 
         //remaining bytes left for file comparison
@@ -692,32 +693,29 @@ void SyncStatus::SyncStatusImpl::updateStatusDialogNow()
     //static RetrieveStatistics statistic;
     //statistic.writeEntry(currentData, currentObjects);
 
+    const float percent = totalData == 0 ? 0 : currentData.ToDouble() * 100 / totalData.ToDouble();
+
     //write status information to systray, taskbar, parent title ect.
     switch (currentStatus)
     {
     case SyncStatus::SCANNING:
-        showProgressExternally(numberToWxString(scannedObjects, true) + wxT(" - ") + _("Scanning..."));
+        showProgressExternally(numberToStringSep(scannedObjects) + wxT(" - ") + _("Scanning..."));
         break;
     case SyncStatus::COMPARING_CONTENT:
-        showProgressExternally(formatPercentage(currentData, totalData) + wxT(" - ") + _("Comparing content..."),
-                               currentData.ToDouble() * 100 / totalData.ToDouble());
+        showProgressExternally(formatPercentage(currentData, totalData) + wxT(" - ") + _("Comparing content..."), percent);
         break;
     case SyncStatus::SYNCHRONIZING:
-        showProgressExternally(formatPercentage(currentData, totalData) + wxT(" - ") + _("Synchronizing..."),
-                               currentData.ToDouble() * 100 / totalData.ToDouble());
+        showProgressExternally(formatPercentage(currentData, totalData) + wxT(" - ") + _("Synchronizing..."), percent);
         break;
     case SyncStatus::PAUSE:
-        showProgressExternally((totalData != 0 ? formatPercentage(currentData, totalData) + wxT(" - ") : wxString()) + _("Paused"),
-                               currentData.ToDouble() * 100 / totalData.ToDouble());
+        showProgressExternally((totalData != 0 ? formatPercentage(currentData, totalData) + wxT(" - ") : wxString()) + _("Paused"), percent);
         break;
     case SyncStatus::ABORTED:
-        showProgressExternally(_("Aborted"),
-                               currentData.ToDouble() * 100 / totalData.ToDouble());
+        showProgressExternally(_("Aborted"), percent);
         break;
     case SyncStatus::FINISHED_WITH_SUCCESS:
     case SyncStatus::FINISHED_WITH_ERROR:
-        showProgressExternally(_("Completed"),
-                               currentData.ToDouble() * 100 / totalData.ToDouble());
+        showProgressExternally(_("Completed"), percent);
         break;
     }
 
@@ -739,7 +737,7 @@ void SyncStatus::SyncStatusImpl::updateStatusDialogNow()
             m_textCtrlInfo->ChangeValue(statusTxt);
 
         //remaining objects
-        const wxString remainingObjTmp = numberToWxString(totalObjects - currentObjects, true);
+        const wxString remainingObjTmp = numberToStringSep(totalObjects - currentObjects);
         setNewText(remainingObjTmp, *m_staticTextRemainingObj, updateLayout);
 
         //remaining bytes left for copy
@@ -873,24 +871,18 @@ void SyncStatus::SyncStatusImpl::processHasFinished(SyncStatus::SyncStatusID id,
             totalData    == currentData)
     {
         bSizerObjectsRemaining->Show(false);
-        //bSizerDataRemaining   ->Show(false);
 
-        //show processed statistics at the end (but only if there was some work to be done)
-        if (totalObjects != 0 || totalData != 0)
-        {
-            bSizerObjectsProcessed->Show(true);
-            //bSizerDataProcessed   ->Show(true);
+        bSizerObjectsProcessed->Show(true);
 
-            m_staticTextProcessedObj->SetLabel(numberToWxString(currentObjects, true));
-            m_staticTextDataProcessed->SetLabel(FreeFileSync::formatFilesizeToShortString(currentData));
-        }
+        m_staticTextProcessedObj->SetLabel(numberToStringSep(currentObjects));
+        m_staticTextDataProcessed->SetLabel(FreeFileSync::formatFilesizeToShortString(currentData));
     }
 
     updateStatusDialogNow(); //keep this sequence to avoid display distortion, if e.g. only 1 item is sync'ed
     m_textCtrlInfo->SetValue(finalMessage); //
     Layout();                               //
 
-    Raise();
+    //Raise(); -> don't! user may be watching a movie in the meantime ;)
 }
 
 
diff --git a/ui/search.cpp b/ui/search.cpp
index 367d6502..03a2e23b 100644
--- a/ui/search.cpp
+++ b/ui/search.cpp
@@ -41,6 +41,7 @@ SearchDlg::SearchDlg(wxWindow& parentWindow, wxString& searchText, bool& respect
     m_textCtrlSearchTxt->SetValue(searchText_);
 
     CentreOnParent(); //this requires a parent window!
+    m_textCtrlSearchTxt->SetFocus();
 }
 
 
diff --git a/ui/sorting.h b/ui/sorting.h
index 9592b36f..1a77ff02 100644
--- a/ui/sorting.h
+++ b/ui/sorting.h
@@ -15,6 +15,22 @@
 
 namespace FreeFileSync
 {
+namespace
+{
+struct CompileTimeReminder : public FSObjectVisitor
+{
+    virtual void visit(const FileMapping& fileObj) {}
+    virtual void visit(const SymLinkMapping& linkObj) {}
+    virtual void visit(const DirMapping& dirObj) {}
+} checkDymanicCasts; //just a compile-time reminder to check dynamic casts in this file
+}
+
+inline
+bool isDirectoryMapping(const FileSystemObject& fsObj)
+{
+    return dynamic_cast<const DirMapping*>(&fsObj) != NULL;
+}
+
 inline
 int compareString(const Zstring& stringA, const Zstring& stringB)
 {
@@ -91,12 +107,12 @@ bool sortByRelativeName(const FileSystemObject& a, const FileSystemObject& b)
     const bool isDirectoryA = isDirectoryMapping(a);
     const Zstring relDirNameA = isDirectoryA ?
                                 a.getRelativeName<side>() : //directory
-                                a.getParentRelativeName();  //file
+                                a.getParentRelativeName();  //file or symlink
 
     const bool isDirectoryB = isDirectoryMapping(b);
     const Zstring relDirNameB = isDirectoryB ?
                                 b.getRelativeName<side>() : //directory
-                                b.getParentRelativeName();  //file
+                                b.getParentRelativeName();  //file or symlink
 
 
     //compare relative names without filenames first
@@ -124,7 +140,6 @@ bool sortByFileSize(const FileSystemObject& a, const FileSystemObject& b)
     else if (b.isEmpty<side>())
         return true;  //empty rows always last
 
-
     const FileMapping* fileObjA = dynamic_cast<const FileMapping*>(&a);
     const FileMapping* fileObjB = dynamic_cast<const FileMapping*>(&b);
 
@@ -134,7 +149,7 @@ bool sortByFileSize(const FileSystemObject& a, const FileSystemObject& b)
         return true;  //directories last
 
     //return list beginning with largest files first
-    return Compare<!ascending>().isSmallerThan(fileObjA->getFileSize<side>(), fileObjB->getFileSize<side>());
+    return Compare<ascending>().isSmallerThan(fileObjA->getFileSize<side>(), fileObjB->getFileSize<side>());
 }
 
 
@@ -151,13 +166,19 @@ bool sortByDate(const FileSystemObject& a, const FileSystemObject& b)
     const FileMapping* fileObjA = dynamic_cast<const FileMapping*>(&a);
     const FileMapping* fileObjB = dynamic_cast<const FileMapping*>(&b);
 
-    if (fileObjA == NULL)
+    const SymLinkMapping* linkObjA = dynamic_cast<const SymLinkMapping*>(&a);
+    const SymLinkMapping* linkObjB = dynamic_cast<const SymLinkMapping*>(&b);
+
+    if (!fileObjA && !linkObjA)
         return false; //directories last
-    else if (fileObjB == NULL)
+    else if (!fileObjB && !linkObjB)
         return true;  //directories last
 
+    const wxLongLong& dateA = fileObjA ? fileObjA->getLastWriteTime<side>() : linkObjA->getLastWriteTime<side>();
+    const wxLongLong& dateB = fileObjB ? fileObjB->getLastWriteTime<side>() : linkObjB->getLastWriteTime<side>();
+
     //return list beginning with newest files first
-    return Compare<!ascending>().isSmallerThan(fileObjA->getLastWriteTime<side>(), fileObjB->getLastWriteTime<side>());
+    return Compare<ascending>().isSmallerThan(dateA, dateB);
 }