5.14

26 files changed, 4674 insertions, 4888 deletions

diff --git a/ui/IFileDialog_Vista/ifile_dialog.cpp b/ui/IFileDialog_Vista/ifile_dialog.cpp
index 565dfa1a..19dcbc5d 100644
--- a/ui/IFileDialog_Vista/ifile_dialog.cpp
+++ b/ui/IFileDialog_Vista/ifile_dialog.cpp
@@ -23,38 +23,38 @@ bool showFolderPickerImpl(HWND ownerWindow, //throw ComError; return "false" if
                           std::wstring& selectedFolder)
 {
     ComPtr<IFileDialog> fileDlg;
-    ZEN_CHECK_COM(::CoCreateInstance(CLSID_FileOpenDialog, //throw ComError
+    ZEN_COM_CHECK(::CoCreateInstance(CLSID_FileOpenDialog, //throw ComError
                                      nullptr,
                                      CLSCTX_ALL,
                                      IID_PPV_ARGS(fileDlg.init())));
 
     if (persistenceGuid)
-        ZEN_CHECK_COM(fileDlg->SetClientGuid(*persistenceGuid));
+        ZEN_COM_CHECK(fileDlg->SetClientGuid(*persistenceGuid));
 
     FILEOPENDIALOGOPTIONS dlgOptions = 0;
-    ZEN_CHECK_COM(fileDlg->GetOptions(&dlgOptions)); //throw ComError
-    ZEN_CHECK_COM(fileDlg->SetOptions(dlgOptions | FOS_PICKFOLDERS | FOS_NOVALIDATE | FOS_FORCEFILESYSTEM));
+    ZEN_COM_CHECK(fileDlg->GetOptions(&dlgOptions)); //throw ComError
+    ZEN_COM_CHECK(fileDlg->SetOptions(dlgOptions | FOS_PICKFOLDERS | FOS_NOVALIDATE | FOS_FORCEFILESYSTEM));
 
     if (defaultFolder) //show last selection instead of top level if no default available
     {
         ComPtr<IShellItem> folderItem;
-        ZEN_CHECK_COM(::SHCreateItemFromParsingName(defaultFolder,
+        ZEN_COM_CHECK(::SHCreateItemFromParsingName(defaultFolder,
                                                     nullptr,
                                                     IID_PPV_ARGS(folderItem.init())));
-        ZEN_CHECK_COM(fileDlg->SetFolder(folderItem.get()));
+        ZEN_COM_CHECK(fileDlg->SetFolder(folderItem.get()));
     }
 
     try
     {
-        ZEN_CHECK_COM(fileDlg->Show(ownerWindow)); //may fail with: HRESULT_FROM_WIN32(ERROR_CANCELLED)
+        ZEN_COM_CHECK(fileDlg->Show(ownerWindow)); //may fail with: HRESULT_FROM_WIN32(ERROR_CANCELLED)
     }
     catch (const ComError&) { return false; }
 
     ComPtr<IShellItem> folderItem;
-    ZEN_CHECK_COM(fileDlg->GetResult(folderItem.init()));
+    ZEN_COM_CHECK(fileDlg->GetResult(folderItem.init()));
 
     LPWSTR folderPath = nullptr;
-    ZEN_CHECK_COM(folderItem->GetDisplayName(SIGDN_FILESYSPATH, &folderPath));
+    ZEN_COM_CHECK(folderItem->GetDisplayName(SIGDN_FILESYSPATH, &folderPath));
     ZEN_ON_SCOPE_EXIT(::CoTaskMemFree(folderPath));
 
     selectedFolder = folderPath;
diff --git a/ui/batch_config.cpp b/ui/batch_config.cpp
index c3bf797d..bd82194d 100644
--- a/ui/batch_config.cpp
+++ b/ui/batch_config.cpp
@@ -75,15 +75,15 @@ BatchDialog::BatchDialog(wxWindow* parent,
 
     m_comboBoxExecFinished->initHistory(onCompletionHistory, onCompletionHistoryMax);
 
-    m_bpButtonHelp  ->SetBitmapLabel(GlobalResources::getImage(L"help"));
-    m_bitmapBatchJob->SetBitmap     (GlobalResources::getImage(L"batch"));
+    m_bpButtonHelp  ->SetBitmapLabel(getResourceImage(L"help"));
+    m_bitmapBatchJob->SetBitmap     (getResourceImage(L"batch"));
 
-    logfileDir = make_unique<DirectoryName<FolderHistoryBox>>(*this, *m_buttonSelectLogfileDir, *m_comboBoxLogfileDir);
+    logfileDir = make_unique<DirectoryName<FolderHistoryBox>>(*this, *m_buttonSelectLogfileDir, *m_logfileDir);
 
     setConfig(batchCfg);
 
     Fit(); //child-element widths have changed: image was set
-    m_panelHeader->Layout();
+    Layout();
 
     m_buttonSave->SetFocus();
 }
diff --git a/ui/batch_status_handler.cpp b/ui/batch_status_handler.cpp
index d26b9bf6..0edd289f 100644
--- a/ui/batch_status_handler.cpp
+++ b/ui/batch_status_handler.cpp
@@ -93,8 +93,8 @@ std::unique_ptr<FileOutput> prepareNewLogfile(const Zstring& logfileDirectory, /
 }
 }
 
-
 //##############################################################################################################################
+
 BatchStatusHandler::BatchStatusHandler(bool showProgress,
                                        const std::wstring& jobName,
                                        const TimeComp& timeStamp,
diff --git a/ui/check_version.cpp b/ui/check_version.cpp
index e3ed042d..f01239da 100644
--- a/ui/check_version.cpp
+++ b/ui/check_version.cpp
@@ -249,26 +249,27 @@ void zen::checkForUpdatePeriodically(wxWindow* parent, long& lastUpdateCheck)
 {
     if (lastUpdateCheck != -1)
     {
-        if (lastUpdateCheck == 0)
-        {
-            switch (showQuestionDlg(parent, ReturnQuestionDlg::BUTTON_YES | ReturnQuestionDlg::BUTTON_NO | ReturnQuestionDlg::BUTTON_CANCEL,
-                                    _("Do you want FreeFileSync to automatically check for updates every week?") + L"\n" +
-                                    _("(Requires an Internet connection!)")))
-            {
-                case ReturnQuestionDlg::BUTTON_YES:
-                    lastUpdateCheck = 123; //some old date (few seconds after 1970) different from 0 and -1
-                    checkForUpdatePeriodically(parent, lastUpdateCheck); //check for updates now
-                    break;
-
-                case ReturnQuestionDlg::BUTTON_NO:
-                    lastUpdateCheck = -1; //don't check for updates anymore
-                    break;
-
-                case ReturnQuestionDlg::BUTTON_CANCEL:
-                    break;
-            }
-        }
-        else if (wxGetLocalTime() >= lastUpdateCheck + 7 * 24 * 3600) //check weekly
+        //if (lastUpdateCheck == 0)
+        //{
+        //    switch (showQuestionDlg(parent, ReturnQuestionDlg::BUTTON_YES | ReturnQuestionDlg::BUTTON_NO | ReturnQuestionDlg::BUTTON_CANCEL,
+        //                            _("Do you want FreeFileSync to automatically check for updates every week?") + L"\n" +
+        //                            _("(Requires an Internet connection!)")))
+        //    {
+        //        case ReturnQuestionDlg::BUTTON_YES:
+        //            lastUpdateCheck = 123; //some old date (few seconds after 1970) different from 0 and -1
+        //            checkForUpdatePeriodically(parent, lastUpdateCheck); //check for updates now
+        //            break;
+
+        //        case ReturnQuestionDlg::BUTTON_NO:
+        //            lastUpdateCheck = -1; //don't check for updates anymore
+        //            break;
+
+        //        case ReturnQuestionDlg::BUTTON_CANCEL:
+        //            break;
+        //    }
+        //}
+        //else 
+		if (wxGetLocalTime() >= lastUpdateCheck + 7 * 24 * 3600) //check weekly
         {
             wxString onlineVersion;
             switch (getOnlineVersion(onlineVersion))
diff --git a/ui/custom_grid.cpp b/ui/custom_grid.cpp
index a600a214..006ad834 100644
--- a/ui/custom_grid.cpp
+++ b/ui/custom_grid.cpp
@@ -170,7 +170,7 @@ public:
 
     void setIconManager(const std::shared_ptr<IconManager>& iconMgr) { iconMgr_ = iconMgr; }
 
-    void updateNewAndGetMissingIcons(std::vector<Zstring>& newLoad) //loads all (not yet) drawn icons
+    void updateNewAndGetMissingIcons(std::list<Zstring>& newLoad) //loads all (not yet) drawn icons
     {
         //don't check too often! give worker thread some time to fetch data
         if (iconMgr_)
@@ -190,18 +190,18 @@ public:
 
                 if (isFailedLoad(currentRow)) //find failed attempts to load icon
                 {
-                    const Zstring fileName = getIconFile(currentRow);
-                    if (!fileName.empty())
+                    const Zstring filename = getIconFile(currentRow);
+                    if (!filename.empty() && filename != ICON_FILE_FOLDER)
                     {
                         //test if they are already loaded in buffer:
-                        if (iconMgr_->refIconBuffer().requestFileIcon(fileName))
+                        if (iconMgr_->refIconBuffer().readyForRetrieval(filename))
                         {
                             //do a *full* refresh for *every* failed load to update partial DC updates while scrolling
                             refreshCell(refGrid(), currentRow, static_cast<ColumnType>(COL_TYPE_FILENAME));
                             setFailedLoad(currentRow, false);
                         }
                         else //not yet in buffer: mark for async. loading
-                            newLoad.push_back(fileName);
+                            newLoad.push_back(filename);
                     }
                 }
             }
@@ -496,45 +496,36 @@ private:
                 //  | gap | icon | gap | text |
                 //   --------------------------
 
-                const Zstring fileName = getIconFile(row);
-                if (!fileName.empty())
+                const Zstring filename = getIconFile(row);
+                if (!filename.empty())
                 {
-                    wxIcon icon;
+                    wxBitmap fileIcon;
 
                     //first check if it is a directory icon:
-                    if (fileName == ICON_FILE_FOLDER)
-                        icon = iconMgr_->refIconBuffer().genericDirIcon();
+                    if (filename == ICON_FILE_FOLDER)
+                        fileIcon = iconMgr_->refIconBuffer().genericDirIcon();
                     else //retrieve file icon
                     {
-                        if (!iconMgr_->refIconBuffer().requestFileIcon(fileName, &icon)) //returns false if icon is not in buffer
+                        if (Opt<wxBitmap> tmpIco = iconMgr_->refIconBuffer().retrieveFileIcon(filename))
+                            fileIcon = *tmpIco;
+                        else
                         {
-                            icon = iconMgr_->refIconBuffer().genericFileIcon(); //better than nothing
+                            fileIcon = iconMgr_->refIconBuffer().genericFileIcon(); //better than nothing
                             setFailedLoad(row, true); //save status of failed icon load -> used for async. icon loading
                             //falsify only! we want to avoid writing incorrect success values when only partially updating the DC, e.g. when scrolling,
                             //see repaint behavior of ::ScrollWindow() function!
                         }
                     }
 
-                    if (icon.IsOk())
+                    if (fileIcon.IsOk())
                     {
-                        //center icon if it is too small
-                        const int posX = rectTmp.GetX() + std::max(0, (iconSize - icon.GetWidth()) / 2);
-                        const int posY = rectTmp.GetY() + std::max(0, (rectTmp.GetHeight() - icon.GetHeight()) / 2);
-
-                        drawIconRtlNoMirror(dc, icon, wxPoint(posX, posY), buffer);
-
-                        //convert icon to greyscale if row is not active
-                        if (!isActive)
-                        {
-                            wxBitmap bmp(icon.GetWidth(), icon.GetHeight());
-                            wxMemoryDC memDc(bmp);
-                            memDc.Blit(0, 0, icon.GetWidth(), icon.GetHeight(), &dc, posX, posY); //blit in
-
-                            bmp = wxBitmap(bmp.ConvertToImage().ConvertToGreyscale(1.0 / 3, 1.0 / 3, 1.0 / 3)); //treat all channels equally!
-                            memDc.SelectObject(bmp);
-
-                            dc.Blit(posX, posY, icon.GetWidth(), icon.GetHeight(), &memDc, 0, 0); //blit out
-                        }
+                        wxRect rectIcon = rectTmp;
+                        rectIcon.width = iconSize; //support small thumbnail centering
+                        if (isActive)
+                            drawBitmapRtlNoMirror(dc, fileIcon, rectIcon, wxALIGN_CENTER, buffer);
+                        else
+                            drawBitmapRtlNoMirror(dc, wxBitmap(fileIcon.ConvertToImage().ConvertToGreyscale(1.0 / 3, 1.0 / 3, 1.0 / 3)), //treat all channels equally!
+                                                  rectIcon, wxALIGN_CENTER, buffer);
                     }
                 }
             }
@@ -618,7 +609,7 @@ private:
             {
                 if (colType == static_cast<ColumnType>(sortInfo->type_) && (side == LEFT_SIDE) == sortInfo->onLeft_)
                 {
-                    const wxBitmap& marker = GlobalResources::getImage(sortInfo->ascending_ ? L"sortAscending" : L"sortDescending");
+                    const wxBitmap& marker = getResourceImage(sortInfo->ascending_ ? L"sortAscending" : L"sortDescending");
                     wxPoint markerBegin = rectInside.GetTopLeft() + wxPoint((rectInside.width - marker.GetWidth()) / 2, 0);
                     dc.DrawBitmap(marker, markerBegin, true); //respect 2-pixel gap
                 }
@@ -786,7 +777,8 @@ class GridDataMiddle : public GridDataBase
 public:
     GridDataMiddle(const std::shared_ptr<const zen::GridView>& gridDataView, Grid& grid) :
         GridDataBase(grid, gridDataView),
-        showSyncAction_(true) {}
+        showSyncAction_(true),
+        toolTip(grid) {} //tool tip must not live longer than grid!
 
     void onSelectBegin(const wxPoint& clientPos, size_t row, ColumnType colType)
     {
@@ -928,9 +920,9 @@ private:
                     const BlockPosition highlightBlock = dragSelection ? dragSelection->second       : highlight ? highlight->blockPos_ : BLOCKPOS_CHECK_BOX;
 
                     if (rowHighlighted && highlightBlock == BLOCKPOS_CHECK_BOX)
-                        drawBitmapRtlMirror(dc, GlobalResources::getImage(fsObj->isActive() ? L"checkboxTrueFocus" : L"checkboxFalseFocus"), checkBoxArea, wxALIGN_CENTER, buffer);
+                        drawBitmapRtlMirror(dc, getResourceImage(fsObj->isActive() ? L"checkboxTrueFocus" : L"checkboxFalseFocus"), checkBoxArea, wxALIGN_CENTER, buffer);
                     else //default
-                        drawBitmapRtlMirror(dc, GlobalResources::getImage(fsObj->isActive() ? L"checkboxTrue"      : L"checkboxFalse"     ), checkBoxArea, wxALIGN_CENTER, buffer);
+                        drawBitmapRtlMirror(dc, getResourceImage(fsObj->isActive() ? L"checkboxTrue"      : L"checkboxFalse"     ), checkBoxArea, wxALIGN_CENTER, buffer);
 
                     rectInside.width -= CHECK_BOX_IMAGE;
                     rectInside.x += CHECK_BOX_IMAGE;
@@ -978,8 +970,8 @@ private:
                 wxRect rectInside = drawColumnLabelBorder(dc, rect);
                 drawColumnLabelBackground(dc, rectInside, highlighted);
 
-                const wxBitmap& cmpIcon  = GlobalResources::getImage(L"compareSmall");
-                const wxBitmap& syncIcon = GlobalResources::getImage(L"syncSmall");
+                const wxBitmap& cmpIcon  = getResourceImage(L"compareSmall");
+                const wxBitmap& syncIcon = getResourceImage(L"syncSmall");
 
                 const int space = 8;
                 const int imageWidthTotal = cmpIcon.GetWidth() + space + syncIcon.GetWidth();
@@ -1149,7 +1141,7 @@ private:
                     assert(false);
                     return L"";
                 }();
-                const auto& img = mirrorIfRtl(GlobalResources::getImage(imageName));
+                const auto& img = mirrorIfRtl(getResourceImage(imageName));
                 toolTip.show(getSyncOpDescription(*fsObj), posScreen, &img);
             }
             else
@@ -1178,7 +1170,7 @@ private:
                     assert(false);
                     return L"";
                 }();
-                const auto& img = mirrorIfRtl(GlobalResources::getImage(imageName));
+                const auto& img = mirrorIfRtl(getResourceImage(imageName));
                 toolTip.show(getCategoryDescription(*fsObj), posScreen, &img);
             }
         }
@@ -1199,7 +1191,7 @@ private:
     std::unique_ptr<MouseHighlight> highlight; //current mouse highlight
     std::unique_ptr<std::pair<size_t, BlockPosition>> dragSelection; //(row, block)
     std::unique_ptr<wxBitmap> buffer; //avoid costs of recreating this temporal variable
-    zen::Tooltip toolTip;
+    Tooltip toolTip;
 };
 
 //########################################################################################################
@@ -1248,10 +1240,14 @@ public:
             grid.Connect(wxEVT_SCROLLWIN_PAGEUP,     func, nullptr, this);
             grid.Connect(wxEVT_SCROLLWIN_PAGEDOWN,   func, nullptr, this);
             grid.Connect(wxEVT_SCROLLWIN_THUMBTRACK, func, nullptr, this);
-
-            grid.getMainWin().Connect(wxEVT_SET_FOCUS, func, nullptr, this);
-            //on wxEVT_KILL_FOCUS, there's no need to reset "scrollMaster"
-
+            //wxEVT_KILL_FOCUS -> there's no need to reset "scrollMaster"
+            //wxEVT_SET_FOCUS -> not good enough:
+            //e.g.: left grid has input, right grid is "scrollMaster" due to dragging scroll thumb via mouse.
+            //=> Next keyboard input on left does *not* emit focus change event, but still "scrollMaster" needs to change
+            //=> hook keyboard input instead of focus event:
+            grid.getMainWin().Connect(wxEVT_CHAR,     func, nullptr, this);
+            grid.getMainWin().Connect(wxEVT_KEY_UP,   func, nullptr, this);
+            grid.getMainWin().Connect(wxEVT_KEY_DOWN, func, nullptr, this);
         };
         connectGridAccess(gridL_, wxEventHandler(GridEventManager::onGridAccessL));
         connectGridAccess(gridC_, wxEventHandler(GridEventManager::onGridAccessC));
@@ -1556,7 +1552,7 @@ private:
 
     void loadIconsAsynchronously(wxEvent& event) //loads all (not yet) drawn icons
     {
-        std::vector<Zstring> newLoad;
+        std::list<Zstring> newLoad;
         provLeft_ .updateNewAndGetMissingIcons(newLoad);
         provRight_.updateNewAndGetMissingIcons(newLoad);
         iconBuffer_.setWorkload(newLoad);
@@ -1651,35 +1647,35 @@ wxBitmap zen::getSyncOpImage(SyncOperation syncOp)
     switch (syncOp) //evaluate comparison result and sync direction
     {
         case SO_CREATE_NEW_LEFT:
-            return GlobalResources::getImage(L"createLeftSmall");
+            return getResourceImage(L"createLeftSmall");
         case SO_CREATE_NEW_RIGHT:
-            return GlobalResources::getImage(L"createRightSmall");
+            return getResourceImage(L"createRightSmall");
         case SO_DELETE_LEFT:
-            return GlobalResources::getImage(L"deleteLeftSmall");
+            return getResourceImage(L"deleteLeftSmall");
         case SO_DELETE_RIGHT:
-            return GlobalResources::getImage(L"deleteRightSmall");
+            return getResourceImage(L"deleteRightSmall");
         case SO_MOVE_LEFT_SOURCE:
-            return GlobalResources::getImage(L"moveLeftSourceSmall");
+            return getResourceImage(L"moveLeftSourceSmall");
         case SO_MOVE_LEFT_TARGET:
-            return GlobalResources::getImage(L"moveLeftTargetSmall");
+            return getResourceImage(L"moveLeftTargetSmall");
         case SO_MOVE_RIGHT_SOURCE:
-            return GlobalResources::getImage(L"moveRightSourceSmall");
+            return getResourceImage(L"moveRightSourceSmall");
         case SO_MOVE_RIGHT_TARGET:
-            return GlobalResources::getImage(L"moveRightTargetSmall");
+            return getResourceImage(L"moveRightTargetSmall");
         case SO_OVERWRITE_RIGHT:
-            return GlobalResources::getImage(L"updateRightSmall");
+            return getResourceImage(L"updateRightSmall");
         case SO_COPY_METADATA_TO_RIGHT:
-            return GlobalResources::getImage(L"moveRightSmall");
+            return getResourceImage(L"moveRightSmall");
         case SO_OVERWRITE_LEFT:
-            return GlobalResources::getImage(L"updateLeftSmall");
+            return getResourceImage(L"updateLeftSmall");
         case SO_COPY_METADATA_TO_LEFT:
-            return GlobalResources::getImage(L"moveLeftSmall");
+            return getResourceImage(L"moveLeftSmall");
         case SO_DO_NOTHING:
-            return GlobalResources::getImage(L"noneSmall");
+            return getResourceImage(L"noneSmall");
         case SO_EQUAL:
-            return GlobalResources::getImage(L"equalSmall");
+            return getResourceImage(L"equalSmall");
         case SO_UNRESOLVED_CONFLICT:
-            return GlobalResources::getImage(L"conflictSmall");
+            return getResourceImage(L"conflictSmall");
     }
     return wxNullBitmap;
 }
@@ -1690,20 +1686,20 @@ wxBitmap zen::getCmpResultImage(CompareFilesResult cmpResult)
     switch (cmpResult)
     {
         case FILE_LEFT_SIDE_ONLY:
-            return GlobalResources::getImage(L"leftOnlySmall");
+            return getResourceImage(L"leftOnlySmall");
         case FILE_RIGHT_SIDE_ONLY:
-            return GlobalResources::getImage(L"rightOnlySmall");
+            return getResourceImage(L"rightOnlySmall");
         case FILE_LEFT_NEWER:
-            return GlobalResources::getImage(L"leftNewerSmall");
+            return getResourceImage(L"leftNewerSmall");
         case FILE_RIGHT_NEWER:
-            return GlobalResources::getImage(L"rightNewerSmall");
+            return getResourceImage(L"rightNewerSmall");
         case FILE_DIFFERENT:
-            return GlobalResources::getImage(L"differentSmall");
+            return getResourceImage(L"differentSmall");
         case FILE_EQUAL:
         case FILE_DIFFERENT_METADATA: //= sub-category of equal
-            return GlobalResources::getImage(L"equalSmall");
+            return getResourceImage(L"equalSmall");
         case FILE_CONFLICT:
-            return GlobalResources::getImage(L"conflictSmall");
+            return getResourceImage(L"conflictSmall");
     }
     return wxNullBitmap;
 }
diff --git a/ui/dir_name.cpp b/ui/dir_name.cpp
index 6d0da14b..a35de5fc 100644
--- a/ui/dir_name.cpp
+++ b/ui/dir_name.cpp
@@ -13,6 +13,7 @@
 #include <wx/statbox.h>
 #include <wx/dirdlg.h>
 #include <wx/msgdlg.h>
+#include <wx/scrolwin.h>
 #include <wx+/string_conv.h>
 #include "../lib/resolve_path.h"
 #include "folder_history_box.h"
@@ -88,34 +89,56 @@ DirectoryName<NameControl>::DirectoryName(wxWindow&     dropWindow,
 {
     //prepare drag & drop
     setupFileDrop(dropWindow_);
-    dropWindow_.Connect(EVENT_DROP_FILE, FileDropEventHandler(DirectoryName::OnFilesDropped), nullptr, this);
+    dropWindow_.Connect(EVENT_DROP_FILE, FileDropEventHandler(DirectoryName::onFilesDropped), nullptr, this);
 
     if (dropWindow2_)
     {
         setupFileDrop(*dropWindow2_);
-        dropWindow2_->Connect(EVENT_DROP_FILE, FileDropEventHandler(DirectoryName::OnFilesDropped), nullptr, this);
+        dropWindow2_->Connect(EVENT_DROP_FILE, FileDropEventHandler(DirectoryName::onFilesDropped), nullptr, this);
     }
 
     //keep dirPicker and dirName synchronous
-    dirName_     .Connect(wxEVT_COMMAND_TEXT_UPDATED,   wxCommandEventHandler      (DirectoryName::OnWriteDirManually), nullptr, this);
-    selectButton_.Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler      (DirectoryName::OnSelectDir       ), nullptr, this);
+    dirName_     .Connect(wxEVT_MOUSEWHEEL,             wxMouseEventHandler  (DirectoryName::onMouseWheel), nullptr, this);
+    dirName_     .Connect(wxEVT_COMMAND_TEXT_UPDATED,   wxCommandEventHandler(DirectoryName::onWriteDirManually), nullptr, this);
+    selectButton_.Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(DirectoryName::onSelectDir       ), nullptr, this);
 }
 
 
 template <class NameControl>
 DirectoryName<NameControl>::~DirectoryName()
 {
-    dropWindow_.Disconnect(EVENT_DROP_FILE, FileDropEventHandler(DirectoryName::OnFilesDropped), nullptr, this);
+    dropWindow_.Disconnect(EVENT_DROP_FILE, FileDropEventHandler(DirectoryName::onFilesDropped), nullptr, this);
     if (dropWindow2_)
-        dropWindow2_->Disconnect(EVENT_DROP_FILE, FileDropEventHandler(DirectoryName::OnFilesDropped), nullptr, this);
+        dropWindow2_->Disconnect(EVENT_DROP_FILE, FileDropEventHandler(DirectoryName::onFilesDropped), nullptr, this);
 
-    dirName_     .Disconnect(wxEVT_COMMAND_TEXT_UPDATED,   wxCommandEventHandler      (DirectoryName::OnWriteDirManually), nullptr, this);
-    selectButton_.Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler      (DirectoryName::OnSelectDir       ), nullptr, this);
+    dirName_     .Disconnect(wxEVT_MOUSEWHEEL,             wxMouseEventHandler  (DirectoryName::onMouseWheel), nullptr, this);
+    dirName_     .Disconnect(wxEVT_COMMAND_TEXT_UPDATED,   wxCommandEventHandler(DirectoryName::onWriteDirManually), nullptr, this);
+    selectButton_.Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(DirectoryName::onSelectDir       ), nullptr, this);
 }
 
 
 template <class NameControl>
-void DirectoryName<NameControl>::OnFilesDropped(FileDropEvent& event)
+void DirectoryName<NameControl>::onMouseWheel(wxMouseEvent& event)
+{
+    //for combobox: although switching through available items is wxWidgets default, this is NOT windows default, e.g. explorer
+    //additionally this will delete manual entries, although all the users wanted is scroll the parent window!
+
+    //redirect to parent scrolled window!
+    wxWindow* wnd = &dirName_;
+    while ((wnd = wnd->GetParent()) != nullptr) //silence MSVC warning
+        if (dynamic_cast<wxScrolledWindow*>(wnd) != nullptr)
+            if (wxEvtHandler* evtHandler = wnd->GetEventHandler())
+            {
+                evtHandler->AddPendingEvent(event);
+                break;
+            }
+
+    //	event.Skip();
+}
+
+
+template <class NameControl>
+void DirectoryName<NameControl>::onFilesDropped(FileDropEvent& event)
 {
     const auto& files = event.getFiles();
     if (files.empty())
@@ -149,7 +172,7 @@ void DirectoryName<NameControl>::OnFilesDropped(FileDropEvent& event)
 
 
 template <class NameControl>
-void DirectoryName<NameControl>::OnWriteDirManually(wxCommandEvent& event)
+void DirectoryName<NameControl>::onWriteDirManually(wxCommandEvent& event)
 {
     setDirectoryName(event.GetString(), static_cast<NameControl*>(nullptr), dirName_, staticText_);
 
@@ -160,7 +183,7 @@ void DirectoryName<NameControl>::OnWriteDirManually(wxCommandEvent& event)
 
 
 template <class NameControl>
-void DirectoryName<NameControl>::OnSelectDir(wxCommandEvent& event)
+void DirectoryName<NameControl>::onSelectDir(wxCommandEvent& event)
 {
     wxString defaultDirname; //default selection for dir picker
     {
diff --git a/ui/dir_name.h b/ui/dir_name.h
index 4d036f9d..21f2b574 100644
--- a/ui/dir_name.h
+++ b/ui/dir_name.h
@@ -47,9 +47,10 @@ public:
 private:
     virtual bool acceptDrop(const std::vector<wxString>& droppedFiles, const wxPoint& clientPos, const wxWindow& wnd) { return true; }; //return true if drop should be processed
 
-    void OnFilesDropped    (FileDropEvent& event);
-    void OnWriteDirManually(wxCommandEvent& event);
-    void OnSelectDir       (wxCommandEvent& event);
+    void onMouseWheel      (wxMouseEvent& event);
+    void onFilesDropped    (FileDropEvent& event);
+    void onWriteDirManually(wxCommandEvent& event);
+    void onSelectDir       (wxCommandEvent& event);
 
     wxWindow&     dropWindow_;
     wxWindow*     dropWindow2_;
diff --git a/ui/exec_finished_box.cpp b/ui/exec_finished_box.cpp
index 74c10493..b063ca59 100644
--- a/ui/exec_finished_box.cpp
+++ b/ui/exec_finished_box.cpp
@@ -115,7 +115,8 @@ void ExecFinishedBox::addItemHistory()
         if (!skipCmd)
         {
             for (auto it = defaultCommands.begin(); it != defaultCommands.end(); ++it)
-                if (command == it->first || command == it->second)
+                if (command == it->first ||
+                    command == it->second)
                 {
                     skipCmd = true;
                     break;
diff --git a/ui/folder_history_box.cpp b/ui/folder_history_box.cpp
index 466fbba1..c5400272 100644
--- a/ui/folder_history_box.cpp
+++ b/ui/folder_history_box.cpp
@@ -7,18 +7,13 @@
 #include "folder_history_box.h"
 #include <list>
 #include <zen/scope_guard.h>
-#include <wx/scrolwin.h>
+//#include <wx/scrolwin.h>
 #include <wx+/string_conv.h>
 #include "../lib/resolve_path.h"
 
 using namespace zen;
 
 
-namespace
-{
-const wxEventType wxEVT_VALIDATE_USER_SELECTION = wxNewEventType();
-}
-
 FolderHistoryBox::FolderHistoryBox(wxWindow* parent,
                                    wxWindowID id,
                                    const wxString& value,
@@ -30,113 +25,73 @@ FolderHistoryBox::FolderHistoryBox(wxWindow* parent,
                                    const wxValidator& validator,
                                    const wxString& name) :
     wxComboBox(parent, id, value, pos, size, n, choices, style, validator, name)
-#if wxCHECK_VERSION(2, 9, 1)
-    ,dropDownShown(false)
-#endif
 {
     //#####################################
     /*##*/ SetMinSize(wxSize(150, -1)); //## workaround yet another wxWidgets bug: default minimum size is much too large for a wxComboBox
     //#####################################
 
-    Connect(wxEVT_KEY_DOWN,                  wxKeyEventHandler    (FolderHistoryBox::OnKeyEvent  ), nullptr, this);
-    Connect(wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler(FolderHistoryBox::OnSelection ), nullptr, this);
-    Connect(wxEVT_MOUSEWHEEL,                wxMouseEventHandler  (FolderHistoryBox::OnMouseWheel), nullptr, this);
+    Connect(wxEVT_KEY_DOWN,   wxKeyEventHandler  (FolderHistoryBox::OnKeyEvent  ), nullptr, this);
 
     warn_static("mac")
+    warn_static("linux")
 
 #if defined FFS_WIN
     //on Win, this mouse click event only fires, when clicking on the small down arrow, NOT when clicking on the text field
     //thanks to wxWidgets' non-portability it's exactly the converse on Linux!
-    Connect(wxEVT_LEFT_DOWN,            wxEventHandler(FolderHistoryBox::OnMouseClick), nullptr, this);
-#elif defined FFS_LINUX  //update on each text change: maybe a little too often, but we have no choice as long as we don't have an event right before showing the drop-down list
-    Connect(wxEVT_COMMAND_TEXT_UPDATED, wxEventHandler(FolderHistoryBox::OnMouseClick), nullptr, this);
-#elif defined FFS_MAC
+    Connect(wxEVT_LEFT_DOWN, wxEventHandler(FolderHistoryBox::OnRequireHistoryUpdate), nullptr, this);
+#elif defined FFS_LINUX || defined FFS_MAC
     /*
-    calling setValueAndUpdateList()...
-    - on wxEVT_COMMAND_TEXT_UPDATED leads to endless loop (SetValue() seems to emit another wxEVT_COMMAND_TEXT_UPDATED asychronously)
-    - on wxEVT_LEFT_DOWN leads to occasional crashes, especially when double-clicking
+    we can't attach to wxEVT_COMMAND_TEXT_UPDATED, since setValueAndUpdateList() will implicitly emit wxEVT_COMMAND_TEXT_UPDATED again when calling Clear()!
+    => Crash on Suse/X11/wxWidgets 2.9.4 on startup (setting a flag to guard against recursion does not work, still crash)
 
+    On OS attaching to wxEVT_LEFT_DOWN leads to occasional crashes, especially when double-clicking
     */
 #endif
-
-#if wxCHECK_VERSION(2, 9, 1)
-    Connect(wxEVT_COMMAND_COMBOBOX_DROPDOWN, wxCommandEventHandler(FolderHistoryBox::OnShowDropDown), nullptr, this); //only supported on Win/GTK
-    Connect(wxEVT_COMMAND_COMBOBOX_CLOSEUP,  wxCommandEventHandler(FolderHistoryBox::OnHideDropDown), nullptr, this); //
-#endif
-
-    Connect(wxEVT_VALIDATE_USER_SELECTION, wxCommandEventHandler(FolderHistoryBox::OnValidateSelection), nullptr, this);
 }
 
 
-#if wxCHECK_VERSION(2, 9, 1)
-void FolderHistoryBox::OnShowDropDown(wxCommandEvent& event)
+void FolderHistoryBox::OnRequireHistoryUpdate(wxEvent& event)
 {
-    dropDownShown = true;
+    setValueAndUpdateList(GetValue());
     event.Skip();
 }
 
-
-void FolderHistoryBox::OnHideDropDown(wxCommandEvent& event)
-{
-    dropDownShown = false;
-    event.Skip();
-}
-#endif
-
 //set value and update list are technically entangled: see potential bug description below
 void FolderHistoryBox::setValueAndUpdateList(const wxString& dirname)
 {
-    //it may be a little lame to update the list on each mouse-button click, but it should be working and we dont't have to manipulate wxComboBox internals
-
-    std::list<Zstring> dirList;
-
-    //add some aliases to allow user changing to volume name and back, if possible
-    std::vector<Zstring> aliases = getDirectoryAliases(toZ(dirname));
-    dirList.insert(dirList.end(), aliases.begin(), aliases.end());
-
+    //populate selection list....
+    std::vector<wxString> dirList;
+    {
+        //add some aliases to allow user changing to volume name and back, if possible
+        std::vector<Zstring> aliases = getDirectoryAliases(toZ(dirname));
+        std::transform(aliases.begin(), aliases.end(), std::back_inserter(dirList), [](const Zstring& str) { return utfCvrtTo<wxString>(str); });
+    }
     if (sharedHistory_.get())
     {
         std::vector<Zstring> tmp = sharedHistory_->getList();
         std::sort(tmp.begin(), tmp.end(), LessFilename());
 
         if (!dirList.empty() && !tmp.empty())
-            dirList.push_back(toZ(FolderHistory::separationLine()));
+            dirList.push_back(FolderHistory::separationLine());
 
-        dirList.insert(dirList.end(), tmp.begin(), tmp.end());
+        std::transform(tmp.begin(), tmp.end(), std::back_inserter(dirList), [](const Zstring& str) { return utfCvrtTo<wxString>(str); });
     }
+
     //###########################################################################################
 
     //attention: if the target value is not part of the dropdown list, SetValue() will look for a string that *starts with* this value:
     //e.g. if the dropdown list contains "222" SetValue("22") will erroneously set and select "222" instead, while "111" would be set correctly!
     // -> by design on Windows!
-    if (std::find(dirList.begin(), dirList.end(), toZ(dirname)) == dirList.end())
-        dirList.push_front(toZ(dirname));
+    if (std::find(dirList.begin(), dirList.end(), dirname) == dirList.end())
+        dirList.insert(dirList.begin(), dirname);
 
-    Clear();
-    std::for_each(dirList.begin(), dirList.end(), [&](const Zstring& dir) { this->Append(toWx(dir)); });
+    Clear(); //emits yet another wxEVT_COMMAND_TEXT_UPDATED on Suse/X11/wxWidgets 2.9.4!!!
+    std::for_each(dirList.begin(), dirList.end(), [&](const wxString& dir) { this->Append(dir); });
     //this->SetSelection(wxNOT_FOUND); //don't select anything
     this->SetValue(dirname);          //preserve main text!
 }
 
 
-void FolderHistoryBox::OnSelection(wxCommandEvent& event)
-{
-    wxCommandEvent dummy2(wxEVT_VALIDATE_USER_SELECTION); //we cannot replace built-in commands at this position in call stack, so defer to a later time!
-    if (wxEvtHandler* handler = GetEventHandler())
-        handler->AddPendingEvent(dummy2);
-
-    event.Skip();
-}
-
-
-void FolderHistoryBox::OnValidateSelection(wxCommandEvent& event)
-{
-    //const auto& value = GetValue();
-    //if (value == FolderHistory::separationLine())
-    //    setValueAndUpdateList(wxString()); -> not good enough (resolved folder name not updated)
-}
-
-
 void FolderHistoryBox::OnKeyEvent(wxKeyEvent& event)
 {
     const int keyCode = event.GetKeyCode();
@@ -145,13 +100,9 @@ void FolderHistoryBox::OnKeyEvent(wxKeyEvent& event)
         //try to delete the currently selected config history item
         int pos = this->GetCurrentSelection();
         if (0 <= pos && pos < static_cast<int>(this->GetCount()) &&
-#if wxCHECK_VERSION(2, 9, 1)
-            dropDownShown)
-#else
             //what a mess...:
             (GetValue() != GetString(pos) || //avoid problems when a character shall be deleted instead of list item
              GetValue() == wxEmptyString)) //exception: always allow removing empty entry
-#endif
         {
             //save old (selected) value: deletion seems to have influence on this
             const wxString currentVal = this->GetValue();
@@ -172,22 +123,3 @@ void FolderHistoryBox::OnKeyEvent(wxKeyEvent& event)
     }
     event.Skip();
 }
-
-
-void FolderHistoryBox::OnMouseWheel(wxMouseEvent& event)
-{
-    //although switching to available items is wxWidgets default, this is NOT windows default, e.g. explorer
-    //additionally this will delete manual entries, although all the users wanted is scroll the parent window!
-
-    //redirect to parent scrolled window!
-    wxWindow* wnd = this;
-    while ((wnd = wnd->GetParent()) != nullptr) //silence MSVC warning
-        if (dynamic_cast<wxScrolledWindow*>(wnd) != nullptr)
-            if (wxEvtHandler* evtHandler = wnd->GetEventHandler())
-            {
-                evtHandler->AddPendingEvent(event);
-                break;
-            }
-
-    //	event.Skip();
-}
diff --git a/ui/folder_history_box.h b/ui/folder_history_box.h
index 695ee930..210f89c0 100644
--- a/ui/folder_history_box.h
+++ b/ui/folder_history_box.h
@@ -80,27 +80,16 @@ public:
 
     void setValue(const wxString& dirname)
     {
-        setValueAndUpdateList(dirname); //required for setting value correctly + Linux to ensure the dropdown is shown as being populated
+        setValueAndUpdateList(dirname); //required for setting value correctly; Linux: ensure the dropdown is shown as being populated
     }
 
     // GetValue
 
 private:
     void OnKeyEvent(wxKeyEvent& event);
-    void OnMouseWheel(wxMouseEvent& event);
-    void OnSelection(wxCommandEvent& event);
-    void OnValidateSelection(wxCommandEvent& event);
-    void OnMouseClick(wxEvent& event) { setValueAndUpdateList(GetValue()); event.Skip(); }
-
+    void OnRequireHistoryUpdate(wxEvent& event);
     void setValueAndUpdateList(const wxString& dirname);
 
-#if wxCHECK_VERSION(2, 9, 1)
-    void OnShowDropDown(wxCommandEvent& event);
-    void OnHideDropDown(wxCommandEvent& event);
-
-    bool dropDownShown;
-#endif
-
     std::shared_ptr<FolderHistory> sharedHistory_;
 };
 
diff --git a/ui/folder_pair.h b/ui/folder_pair.h
index 421aadba..5a629ff5 100644
--- a/ui/folder_pair.h
+++ b/ui/folder_pair.h
@@ -46,35 +46,35 @@ public:
     {
         if (altCompConfig.get())
         {
-            setImage(*basicPanel_.m_bpButtonAltCompCfg, GlobalResources::getImage(L"cmpConfigSmall"));
+            setImage(*basicPanel_.m_bpButtonAltCompCfg, getResourceImage(L"cmpConfigSmall"));
             basicPanel_.m_bpButtonAltCompCfg->SetToolTip(_("Selected variant:") +  L" " + getVariantName(altCompConfig->compareVar));
         }
         else
         {
-            setImage(*basicPanel_.m_bpButtonAltCompCfg, greyScale(GlobalResources::getImage(L"cmpConfigSmall")));
+            setImage(*basicPanel_.m_bpButtonAltCompCfg, greyScale(getResourceImage(L"cmpConfigSmall")));
             basicPanel_.m_bpButtonAltCompCfg->SetToolTip(_("Select alternate comparison settings"));
         }
 
         if (altSyncConfig.get())
         {
-            setImage(*basicPanel_.m_bpButtonAltSyncCfg, GlobalResources::getImage(L"syncConfigSmall"));
+            setImage(*basicPanel_.m_bpButtonAltSyncCfg, getResourceImage(L"syncConfigSmall"));
             basicPanel_.m_bpButtonAltSyncCfg->SetToolTip(_("Selected variant:") +  L" " + getVariantName(altSyncConfig->directionCfg.var));
         }
         else
         {
-            setImage(*basicPanel_.m_bpButtonAltSyncCfg, greyScale(GlobalResources::getImage(L"syncConfigSmall")));
+            setImage(*basicPanel_.m_bpButtonAltSyncCfg, greyScale(getResourceImage(L"syncConfigSmall")));
             basicPanel_.m_bpButtonAltSyncCfg->SetToolTip(_("Select alternate synchronization settings"));
         }
 
         //test for Null-filter
         if (!isNullFilter(localFilter))
         {
-            setImage(*basicPanel_.m_bpButtonLocalFilter, GlobalResources::getImage(L"filterSmall"));
+            setImage(*basicPanel_.m_bpButtonLocalFilter, getResourceImage(L"filterSmall"));
             basicPanel_.m_bpButtonLocalFilter->SetToolTip(_("Filter is active"));
         }
         else
         {
-            setImage(*basicPanel_.m_bpButtonLocalFilter, greyScale(GlobalResources::getImage(L"filterSmall")));
+            setImage(*basicPanel_.m_bpButtonLocalFilter, greyScale(getResourceImage(L"filterSmall")));
             basicPanel_.m_bpButtonLocalFilter->SetToolTip(_("No filter selected"));
         }
     }
@@ -92,7 +92,7 @@ protected:
         basicPanel_.m_bpButtonAltSyncCfg-> Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(FolderPairPanelBasic::OnAltSyncCfg    ), nullptr, this);
         basicPanel_.m_bpButtonLocalFilter->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(FolderPairPanelBasic::OnLocalFilterCfg), nullptr, this);
 
-        basicPanel_.m_bpButtonRemovePair->SetBitmapLabel(GlobalResources::getImage(L"item_delete"));
+        basicPanel_.m_bpButtonRemovePair->SetBitmapLabel(getResourceImage(L"item_delete"));
     }
 
     virtual void removeAltCompCfg()
diff --git a/ui/gui_generated.cpp b/ui/gui_generated.cpp
index 37d768cf..6ce104e7 100644
--- a/ui/gui_generated.cpp
+++ b/ui/gui_generated.cpp
@@ -20,1036 +20,1037 @@
 
 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_menuItemNew = new wxMenuItem( m_menuFile, wxID_NEW, wxString( _("&New") ) + wxT('\t') + wxT("Ctrl+N"), wxEmptyString, wxITEM_NORMAL );
-	#ifdef __WXMSW__
-	m_menuItemNew->SetBitmaps( wxNullBitmap );
-	#elif defined( __WXGTK__ )
-	m_menuItemNew->SetBitmap( wxNullBitmap );
-	#endif
-	m_menuFile->Append( m_menuItemNew );
-	
-	m_menuItemLoad = new wxMenuItem( m_menuFile, wxID_OPEN, wxString( _("&Open...") ) + wxT('\t') + wxT("Ctrl+O"), wxEmptyString, wxITEM_NORMAL );
-	m_menuFile->Append( m_menuItemLoad );
-	
-	m_menuItemSave = new wxMenuItem( m_menuFile, wxID_SAVE, wxString( _("&Save") ) + wxT('\t') + wxT("Ctrl+S"), wxEmptyString, wxITEM_NORMAL );
-	m_menuFile->Append( m_menuItemSave );
-	
-	m_menuItemSaveAs = new wxMenuItem( m_menuFile, wxID_SAVEAS, wxString( _("Save &as...") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menuFile->Append( m_menuItemSaveAs );
-	
-	m_menuItem7 = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("Save as &batch job...") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menuFile->Append( m_menuItem7 );
-	
-	m_menuFile->AppendSeparator();
-	
-	m_menuItem10 = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("1. &Compare") ) + wxT('\t') + wxT("F5"), wxEmptyString, wxITEM_NORMAL );
-	#ifdef __WXMSW__
-	m_menuItem10->SetBitmaps( wxNullBitmap );
-	#elif defined( __WXGTK__ )
-	m_menuItem10->SetBitmap( wxNullBitmap );
-	#endif
-	m_menuFile->Append( m_menuItem10 );
-	
-	m_menuItem11 = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("2. &Synchronize") ) + wxT('\t') + wxT("F6"), wxEmptyString, wxITEM_NORMAL );
-	#ifdef __WXMSW__
-	m_menuItem11->SetBitmaps( wxNullBitmap );
-	#elif defined( __WXGTK__ )
-	m_menuItem11->SetBitmap( wxNullBitmap );
-	#endif
-	m_menuFile->Append( m_menuItem11 );
-	
-	m_menuFile->AppendSeparator();
-	
-	wxMenuItem* m_menuItem4;
-	m_menuItem4 = new wxMenuItem( m_menuFile, wxID_EXIT, wxString( _("&Quit") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menuFile->Append( m_menuItem4 );
-	
-	m_menubar1->Append( m_menuFile, _("&Program") ); 
-	
-	m_menuAdvanced = new wxMenu();
-	m_menuLanguages = new wxMenu();
-	m_menuAdvanced->Append( -1, _("&Language"), m_menuLanguages );
-	
-	m_menuAdvanced->AppendSeparator();
-	
-	m_menuItemGlobSett = new wxMenuItem( m_menuAdvanced, wxID_PREFERENCES, wxString( _("&Global settings...") ) , wxEmptyString, wxITEM_NORMAL );
-	m_menuAdvanced->Append( m_menuItemGlobSett );
-	
-	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();
-	m_menuItemManual = new wxMenuItem( m_menuHelp, wxID_HELP, wxString( _("&Content") ) + wxT('\t') + wxT("F1"), wxEmptyString, wxITEM_NORMAL );
-	m_menuHelp->Append( m_menuItemManual );
-	
-	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 );
-	
-	bSizerPanelHolder = new wxBoxSizer( wxVERTICAL );
-	
-	m_panelTopButtons = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxRAISED_BORDER|wxTAB_TRAVERSAL );
-	bSizerTopButtons = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizerTopButtons->Add( 15, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	wxFlexGridSizer* fgSizer121;
-	fgSizer121 = new wxFlexGridSizer( 2, 2, 0, 0 );
-	fgSizer121->SetFlexibleDirection( wxBOTH );
-	fgSizer121->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	m_staticTextCmpVariant = new wxStaticText( m_panelTopButtons, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextCmpVariant->Wrap( -1 );
-	m_staticTextCmpVariant->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	m_staticTextCmpVariant->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
-	
-	fgSizer121->Add( m_staticTextCmpVariant, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxTOP, 1 );
-	
-	
-	fgSizer121->Add( 0, 0, 1, 0, 5 );
-	
-	wxBoxSizer* bSizer30;
-	bSizer30 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_buttonCompare = new zen::BitmapButton( m_panelTopButtons, wxID_OK, _("Compare"), wxDefaultPosition, wxSize( 180,-1 ), 0 );
-	m_buttonCompare->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	m_buttonCompare->SetToolTip( _("dummy") );
-	
-	bSizer30->Add( m_buttonCompare, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	m_buttonAbort = new zen::BitmapButton( m_panelTopButtons, wxID_CANCEL, _("&Abort"), wxDefaultPosition, wxSize( 180,-1 ), 0 );
-	m_buttonAbort->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	m_buttonAbort->Enable( false );
-	m_buttonAbort->Hide();
-	
-	bSizer30->Add( m_buttonAbort, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	
-	fgSizer121->Add( bSizer30, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	m_bpButtonCmpConfig = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 46,46 ), wxBU_AUTODRAW );
-	m_bpButtonCmpConfig->SetToolTip( _("Comparison settings") );
-	
-	fgSizer121->Add( m_bpButtonCmpConfig, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 3 );
-	
-	
-	bSizerTopButtons->Add( fgSizer121, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 );
-	
-	
-	bSizerTopButtons->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 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_panelTopButtons, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextSyncVariant->Wrap( -1 );
-	m_staticTextSyncVariant->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	m_staticTextSyncVariant->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
-	
-	fgSizer12->Add( m_staticTextSyncVariant, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP, 1 );
-	
-	m_bpButtonSyncConfig = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 46,46 ), wxBU_AUTODRAW );
-	m_bpButtonSyncConfig->SetToolTip( _("Synchronization settings") );
-	
-	fgSizer12->Add( m_bpButtonSyncConfig, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 3 );
-	
-	m_buttonSync = new zen::BitmapButton( m_panelTopButtons, wxID_ANY, _("Synchronize"), wxDefaultPosition, wxSize( 180,-1 ), 0 );
-	m_buttonSync->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	m_buttonSync->SetToolTip( _("dummy") );
-	
-	fgSizer12->Add( m_buttonSync, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	
-	bSizerTopButtons->Add( fgSizer12, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 );
-	
-	
-	bSizerTopButtons->Add( 15, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	m_panelTopButtons->SetSizer( bSizerTopButtons );
-	m_panelTopButtons->Layout();
-	bSizerTopButtons->Fit( m_panelTopButtons );
-	bSizerPanelHolder->Add( m_panelTopButtons, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	m_panelDirectoryPairs = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSTATIC_BORDER|wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer1601;
-	bSizer1601 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer91;
-	bSizer91 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_panelTopLeft = new wxPanel( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panelTopLeft->SetMinSize( wxSize( 1,-1 ) );
-	
-	wxFlexGridSizer* fgSizer8;
-	fgSizer8 = new wxFlexGridSizer( 0, 2, 0, 0 );
-	fgSizer8->AddGrowableCol( 1 );
-	fgSizer8->SetFlexibleDirection( wxBOTH );
-	fgSizer8->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_ALL );
-	
-	
-	fgSizer8->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticTextResolvedPathL = new wxStaticText( m_panelTopLeft, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextResolvedPathL->Wrap( -1 );
-	fgSizer8->Add( m_staticTextResolvedPathL, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2 );
-	
-	wxBoxSizer* bSizer159;
-	bSizer159 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bpButtonAddPair = new wxBitmapButton( m_panelTopLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 25,25 ), wxBU_AUTODRAW );
-	m_bpButtonAddPair->SetToolTip( _("Add folder pair") );
-	
-	bSizer159->Add( m_bpButtonAddPair, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonRemovePair = new wxBitmapButton( m_panelTopLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 25,25 ), wxBU_AUTODRAW );
-	m_bpButtonRemovePair->SetToolTip( _("Remove folder pair") );
-	
-	bSizer159->Add( m_bpButtonRemovePair, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	fgSizer8->Add( bSizer159, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	wxBoxSizer* bSizer182;
-	bSizer182 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_directoryLeft = new FolderHistoryBox( m_panelTopLeft, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
-	bSizer182->Add( m_directoryLeft, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_buttonSelectDirLeft = new wxButton( m_panelTopLeft, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_buttonSelectDirLeft->SetToolTip( _("Select a folder") );
-	
-	bSizer182->Add( m_buttonSelectDirLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	fgSizer8->Add( bSizer182, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	
-	m_panelTopLeft->SetSizer( fgSizer8 );
-	m_panelTopLeft->Layout();
-	fgSizer8->Fit( m_panelTopLeft );
-	bSizer91->Add( m_panelTopLeft, 1, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_panelTopMiddle = new wxPanel( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer1771;
-	bSizer1771 = new wxBoxSizer( wxVERTICAL );
-	
-	
-	bSizer1771->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_bpButtonSwapSides = new wxBitmapButton( m_panelTopMiddle, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
-	m_bpButtonSwapSides->SetToolTip( _("Swap sides") );
-	
-	bSizer1771->Add( m_bpButtonSwapSides, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer160;
-	bSizer160 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bpButtonAltCompCfg = new wxBitmapButton( m_panelTopMiddle, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 25,25 ), wxBU_AUTODRAW );
-	bSizer160->Add( m_bpButtonAltCompCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonLocalFilter = new wxBitmapButton( m_panelTopMiddle, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 25,25 ), wxBU_AUTODRAW );
-	bSizer160->Add( m_bpButtonLocalFilter, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 2 );
-	
-	m_bpButtonAltSyncCfg = new wxBitmapButton( m_panelTopMiddle, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 25,25 ), wxBU_AUTODRAW );
-	bSizer160->Add( m_bpButtonAltSyncCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer1771->Add( bSizer160, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	bSizer1771->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	m_panelTopMiddle->SetSizer( bSizer1771 );
-	m_panelTopMiddle->Layout();
-	bSizer1771->Fit( m_panelTopMiddle );
-	bSizer91->Add( m_panelTopMiddle, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	m_panelTopRight = new wxPanel( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panelTopRight->SetMinSize( wxSize( 1,-1 ) );
-	
-	wxBoxSizer* bSizer183;
-	bSizer183 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticTextResolvedPathR = new wxStaticText( m_panelTopRight, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextResolvedPathR->Wrap( -1 );
-	bSizer183->Add( m_staticTextResolvedPathR, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2 );
-	
-	wxBoxSizer* bSizer179;
-	bSizer179 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_directoryRight = new FolderHistoryBox( m_panelTopRight, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
-	bSizer179->Add( m_directoryRight, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_buttonSelectDirRight = new wxButton( m_panelTopRight, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_buttonSelectDirRight->SetToolTip( _("Select a folder") );
-	
-	bSizer179->Add( m_buttonSelectDirRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer183->Add( bSizer179, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	
-	m_panelTopRight->SetSizer( bSizer183 );
-	m_panelTopRight->Layout();
-	bSizer183->Fit( m_panelTopRight );
-	bSizer91->Add( m_panelTopRight, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	
-	bSizer1601->Add( bSizer91, 0, wxEXPAND, 5 );
-	
-	m_scrolledWindowFolderPairs = new wxScrolledWindow( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxHSCROLL|wxVSCROLL );
-	m_scrolledWindowFolderPairs->SetScrollRate( 10, 10 );
-	m_scrolledWindowFolderPairs->SetMinSize( wxSize( -1,0 ) );
-	
-	bSizerAddFolderPairs = new wxBoxSizer( wxVERTICAL );
-	
-	
-	m_scrolledWindowFolderPairs->SetSizer( bSizerAddFolderPairs );
-	m_scrolledWindowFolderPairs->Layout();
-	bSizerAddFolderPairs->Fit( m_scrolledWindowFolderPairs );
-	bSizer1601->Add( m_scrolledWindowFolderPairs, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	
-	m_panelDirectoryPairs->SetSizer( bSizer1601 );
-	m_panelDirectoryPairs->Layout();
-	bSizer1601->Fit( m_panelDirectoryPairs );
-	bSizerPanelHolder->Add( m_panelDirectoryPairs, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	m_gridNavi = new zen::Grid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
-	m_gridNavi->SetScrollRate( 5, 5 );
-	bSizerPanelHolder->Add( m_gridNavi, 1, wxEXPAND, 5 );
-	
-	m_panelCenter = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer1711;
-	bSizer1711 = new wxBoxSizer( wxVERTICAL );
-	
-	m_splitterMain = new zen::TripleSplitter( m_panelCenter, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer1781;
-	bSizer1781 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_gridMainL = new zen::Grid( m_splitterMain, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
-	m_gridMainL->SetScrollRate( 5, 5 );
-	bSizer1781->Add( m_gridMainL, 1, wxEXPAND, 5 );
-	
-	m_gridMainC = new zen::Grid( m_splitterMain, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
-	m_gridMainC->SetScrollRate( 5, 5 );
-	bSizer1781->Add( m_gridMainC, 0, wxEXPAND, 5 );
-	
-	m_gridMainR = new zen::Grid( m_splitterMain, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
-	m_gridMainR->SetScrollRate( 5, 5 );
-	bSizer1781->Add( m_gridMainR, 1, wxEXPAND, 5 );
-	
-	
-	m_splitterMain->SetSizer( bSizer1781 );
-	m_splitterMain->Layout();
-	bSizer1781->Fit( m_splitterMain );
-	bSizer1711->Add( m_splitterMain, 1, wxEXPAND, 5 );
-	
-	m_panelStatusBar = new wxPanel( m_panelCenter, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSTATIC_BORDER|wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer451;
-	bSizer451 = new wxBoxSizer( wxHORIZONTAL );
-	
-	bSizer451->SetMinSize( wxSize( -1,22 ) ); 
-	bSizerFileStatus = new wxBoxSizer( wxHORIZONTAL );
-	
-	bSizerStatusLeft = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer53;
-	bSizer53 = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizer53->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizerStatusLeftDirectories = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapSmallDirectoryLeft = new wxStaticBitmap( m_panelStatusBar, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizerStatusLeftDirectories->Add( m_bitmapSmallDirectoryLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerStatusLeftDirectories->Add( 2, 0, 0, 0, 5 );
-	
-	m_staticTextStatusLeftDirs = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextStatusLeftDirs->Wrap( -1 );
-	bSizerStatusLeftDirectories->Add( m_staticTextStatusLeftDirs, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	bSizer53->Add( bSizerStatusLeftDirectories, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizerStatusLeftFiles = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizerStatusLeftFiles->Add( 10, 0, 0, 0, 5 );
-	
-	m_bitmapSmallFileLeft = new wxStaticBitmap( m_panelStatusBar, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizerStatusLeftFiles->Add( m_bitmapSmallFileLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerStatusLeftFiles->Add( 2, 0, 0, 0, 5 );
-	
-	m_staticTextStatusLeftFiles = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextStatusLeftFiles->Wrap( -1 );
-	bSizerStatusLeftFiles->Add( m_staticTextStatusLeftFiles, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerStatusLeftFiles->Add( 10, 0, 0, 0, 5 );
-	
-	m_staticTextStatusLeftBytes = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextStatusLeftBytes->Wrap( -1 );
-	bSizerStatusLeftFiles->Add( m_staticTextStatusLeftBytes, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer53->Add( bSizerStatusLeftFiles, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer53->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerStatusLeft->Add( bSizer53, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticline9 = new wxStaticLine( m_panelStatusBar, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-	bSizerStatusLeft->Add( m_staticline9, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP, 2 );
-	
-	
-	bSizerFileStatus->Add( bSizerStatusLeft, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerFileStatus->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( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizerFileStatus->Add( m_staticTextStatusMiddle, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerFileStatus->Add( 26, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizerStatusRight = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticline10 = new wxStaticLine( m_panelStatusBar, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-	bSizerStatusRight->Add( m_staticline10, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP, 2 );
-	
-	wxBoxSizer* bSizer52;
-	bSizer52 = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizer52->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizerStatusRightDirectories = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapSmallDirectoryRight = new wxStaticBitmap( m_panelStatusBar, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizerStatusRightDirectories->Add( m_bitmapSmallDirectoryRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerStatusRightDirectories->Add( 2, 0, 0, 0, 5 );
-	
-	m_staticTextStatusRightDirs = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextStatusRightDirs->Wrap( -1 );
-	bSizerStatusRightDirectories->Add( m_staticTextStatusRightDirs, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer52->Add( bSizerStatusRightDirectories, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizerStatusRightFiles = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizerStatusRightFiles->Add( 10, 0, 0, 0, 5 );
-	
-	m_bitmapSmallFileRight = new wxStaticBitmap( m_panelStatusBar, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizerStatusRightFiles->Add( m_bitmapSmallFileRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerStatusRightFiles->Add( 2, 0, 0, 0, 5 );
-	
-	m_staticTextStatusRightFiles = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextStatusRightFiles->Wrap( -1 );
-	bSizerStatusRightFiles->Add( m_staticTextStatusRightFiles, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerStatusRightFiles->Add( 10, 0, 0, 0, 5 );
-	
-	m_staticTextStatusRightBytes = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextStatusRightBytes->Wrap( -1 );
-	bSizerStatusRightFiles->Add( m_staticTextStatusRightBytes, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer52->Add( bSizerStatusRightFiles, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer52->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerStatusRight->Add( bSizer52, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerFileStatus->Add( bSizerStatusRight, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer451->Add( bSizerFileStatus, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	m_staticTextFullStatus = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextFullStatus->Wrap( -1 );
-	m_staticTextFullStatus->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer451->Add( m_staticTextFullStatus, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	
-	m_panelStatusBar->SetSizer( bSizer451 );
-	m_panelStatusBar->Layout();
-	bSizer451->Fit( m_panelStatusBar );
-	bSizer1711->Add( m_panelStatusBar, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	
-	m_panelCenter->SetSizer( bSizer1711 );
-	m_panelCenter->Layout();
-	bSizer1711->Fit( m_panelCenter );
-	bSizerPanelHolder->Add( m_panelCenter, 1, wxEXPAND, 5 );
-	
-	m_panelConfig = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	bSizerConfig = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer151;
-	bSizer151 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bpButtonOpen = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	m_bpButtonOpen->SetToolTip( _("dummy") );
-	
-	bSizer151->Add( m_bpButtonOpen, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonSave = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	m_bpButtonSave->SetToolTip( _("dummy") );
-	
-	bSizer151->Add( m_bpButtonSave, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonBatchJob = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	m_bpButtonBatchJob->SetToolTip( _("Save as batch job") );
-	
-	bSizer151->Add( m_bpButtonBatchJob, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerConfig->Add( bSizer151, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_listBoxHistory = new wxListBox( m_panelConfig, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_EXTENDED|wxLB_NEEDED_SB|wxLB_SORT ); 
-	m_listBoxHistory->SetMinSize( wxSize( -1,40 ) );
-	
-	bSizerConfig->Add( m_listBoxHistory, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	m_panelConfig->SetSizer( bSizerConfig );
-	m_panelConfig->Layout();
-	bSizerConfig->Fit( m_panelConfig );
-	bSizerPanelHolder->Add( m_panelConfig, 0, 0, 5 );
-	
-	m_panelFilter = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer171;
-	bSizer171 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bpButtonFilter = new wxBitmapButton( m_panelFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW|wxFULL_REPAINT_ON_RESIZE );
-	bSizer171->Add( m_bpButtonFilter, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_checkBoxHideExcluded = new wxCheckBox( m_panelFilter, wxID_ANY, _("Hide excluded items"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_checkBoxHideExcluded->SetToolTip( _("Show filtered or temporarily excluded files") );
-	
-	bSizer171->Add( m_checkBoxHideExcluded, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	
-	m_panelFilter->SetSizer( bSizer171 );
-	m_panelFilter->Layout();
-	bSizer171->Fit( m_panelFilter );
-	bSizerPanelHolder->Add( m_panelFilter, 0, 0, 5 );
-	
-	m_panelStatistics = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	bSizer1801 = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizer1801->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	bSizerStatistics = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer1712;
-	bSizer1712 = new wxBoxSizer( wxVERTICAL );
-	
-	m_bitmapCreateLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_bitmapCreateLeft->SetToolTip( _("Number of files and folders that will be created") );
-	
-	bSizer1712->Add( m_bitmapCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	bSizer1712->Add( 5, 2, 0, 0, 5 );
-	
-	
-	bSizer1712->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticTextCreateLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextCreateLeft->Wrap( -1 );
-	m_staticTextCreateLeft->SetToolTip( _("Number of files and folders that will be created") );
-	
-	bSizer1712->Add( m_staticTextCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	bSizerStatistics->Add( bSizer1712, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	
-	bSizerStatistics->Add( 5, 5, 0, 0, 5 );
-	
-	wxBoxSizer* bSizer172;
-	bSizer172 = new wxBoxSizer( wxVERTICAL );
-	
-	m_bitmapUpdateLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_bitmapUpdateLeft->SetToolTip( _("Number of files that will be overwritten") );
-	
-	bSizer172->Add( m_bitmapUpdateLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer172->Add( 5, 2, 0, 0, 5 );
-	
-	
-	bSizer172->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticTextUpdateLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextUpdateLeft->Wrap( -1 );
-	m_staticTextUpdateLeft->SetToolTip( _("Number of files that will be overwritten") );
-	
-	bSizer172->Add( m_staticTextUpdateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	bSizerStatistics->Add( bSizer172, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	
-	bSizerStatistics->Add( 5, 5, 0, 0, 5 );
-	
-	wxBoxSizer* bSizer173;
-	bSizer173 = new wxBoxSizer( wxVERTICAL );
-	
-	m_bitmapDeleteLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_bitmapDeleteLeft->SetToolTip( _("Number of files and folders that will be deleted") );
-	
-	bSizer173->Add( m_bitmapDeleteLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer173->Add( 5, 2, 0, 0, 5 );
-	
-	
-	bSizer173->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticTextDeleteLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextDeleteLeft->Wrap( -1 );
-	m_staticTextDeleteLeft->SetToolTip( _("Number of files and folders that will be deleted") );
-	
-	bSizer173->Add( m_staticTextDeleteLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerStatistics->Add( bSizer173, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	
-	bSizerStatistics->Add( 5, 5, 0, 0, 5 );
-	
-	bSizerData = new wxBoxSizer( wxVERTICAL );
-	
-	m_bitmapData = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_bitmapData->SetToolTip( _("Total bytes to copy") );
-	
-	bSizerData->Add( m_bitmapData, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	bSizerData->Add( 5, 2, 0, 0, 5 );
-	
-	
-	bSizerData->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticTextData = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextData->Wrap( -1 );
-	m_staticTextData->SetToolTip( _("Total bytes to copy") );
-	
-	bSizerData->Add( m_staticTextData, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerStatistics->Add( bSizerData, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	
-	bSizerStatistics->Add( 5, 5, 0, 0, 5 );
-	
-	wxBoxSizer* bSizer176;
-	bSizer176 = new wxBoxSizer( wxVERTICAL );
-	
-	m_bitmapDeleteRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_bitmapDeleteRight->SetToolTip( _("Number of files and folders that will be deleted") );
-	
-	bSizer176->Add( m_bitmapDeleteRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer176->Add( 5, 2, 0, 0, 5 );
-	
-	
-	bSizer176->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticTextDeleteRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextDeleteRight->Wrap( -1 );
-	m_staticTextDeleteRight->SetToolTip( _("Number of files and folders that will be deleted") );
-	
-	bSizer176->Add( m_staticTextDeleteRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerStatistics->Add( bSizer176, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	
-	bSizerStatistics->Add( 5, 5, 0, 0, 5 );
-	
-	wxBoxSizer* bSizer177;
-	bSizer177 = new wxBoxSizer( wxVERTICAL );
-	
-	m_bitmapUpdateRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_bitmapUpdateRight->SetToolTip( _("Number of files that will be overwritten") );
-	
-	bSizer177->Add( m_bitmapUpdateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	bSizer177->Add( 5, 2, 0, 0, 5 );
-	
-	
-	bSizer177->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticTextUpdateRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextUpdateRight->Wrap( -1 );
-	m_staticTextUpdateRight->SetToolTip( _("Number of files that will be overwritten") );
-	
-	bSizer177->Add( m_staticTextUpdateRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerStatistics->Add( bSizer177, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	
-	bSizerStatistics->Add( 5, 5, 0, 0, 5 );
-	
-	wxBoxSizer* bSizer178;
-	bSizer178 = new wxBoxSizer( wxVERTICAL );
-	
-	m_bitmapCreateRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_bitmapCreateRight->SetToolTip( _("Number of files and folders that will be created") );
-	
-	bSizer178->Add( m_bitmapCreateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	bSizer178->Add( 5, 2, 0, 0, 5 );
-	
-	
-	bSizer178->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticTextCreateRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextCreateRight->Wrap( -1 );
-	m_staticTextCreateRight->SetToolTip( _("Number of files and folders that will be created") );
-	
-	bSizer178->Add( m_staticTextCreateRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerStatistics->Add( bSizer178, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	
-	bSizer1801->Add( bSizerStatistics, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer1801->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	m_panelStatistics->SetSizer( bSizer1801 );
-	m_panelStatistics->Layout();
-	bSizer1801->Fit( m_panelStatistics );
-	bSizerPanelHolder->Add( m_panelStatistics, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_panelViewFilter = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	bSizerViewFilter = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizerViewFilter->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_bpButtonShowCreateLeft = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonShowCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonShowUpdateLeft = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonShowUpdateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonShowDeleteLeft = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonShowDeleteLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonShowLeftOnly = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonShowLeftOnly, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonShowLeftNewer = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonShowLeftNewer, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonShowEqual = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonShowEqual, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonShowDifferent = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonShowDifferent, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonShowDoNothing = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonShowDoNothing, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonShowRightNewer = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonShowRightNewer, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonShowRightOnly = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonShowRightOnly, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonShowDeleteRight = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonShowDeleteRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonShowUpdateRight = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonShowUpdateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonShowCreateRight = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonShowCreateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonShowConflict = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonShowConflict, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	bSizerViewFilter->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	m_panelViewFilter->SetSizer( bSizerViewFilter );
-	m_panelViewFilter->Layout();
-	bSizerViewFilter->Fit( m_panelViewFilter );
-	bSizerPanelHolder->Add( m_panelViewFilter, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	this->SetSizer( bSizerPanelHolder );
-	this->Layout();
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainDialogGenerated::OnClose ) );
-	this->Connect( m_menuItemNew->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigNew ) );
-	this->Connect( m_menuItemLoad->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigLoad ) );
-	this->Connect( m_menuItemSave->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigSave ) );
-	this->Connect( m_menuItemSaveAs->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigSaveAs ) );
-	this->Connect( m_menuItem7->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnSaveAsBatchJob ) );
-	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_menuItem4->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuQuit ) );
-	this->Connect( m_menuItemGlobSett->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuGlobalSettings ) );
-	this->Connect( m_menuItem5->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuExportFileList ) );
-	this->Connect( m_menuItemManual->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_bpButtonCmpConfig->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnCompSettingsContext ), NULL, this );
-	m_bpButtonSyncConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncSettings ), NULL, this );
-	m_bpButtonSyncConfig->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnSyncSettingsContext ), NULL, this );
-	m_buttonSync->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnStartSync ), NULL, this );
-	m_bpButtonAddPair->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnAddFolderPair ), NULL, this );
-	m_bpButtonRemovePair->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnRemoveTopFolderPair ), NULL, this );
-	m_bpButtonSwapSides->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSwapSides ), NULL, this );
-	m_bpButtonOpen->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigLoad ), NULL, this );
-	m_bpButtonSave->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigSave ), NULL, this );
-	m_bpButtonBatchJob->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSaveAsBatchJob ), NULL, this );
-	m_listBoxHistory->Connect( wxEVT_CHAR, wxKeyEventHandler( MainDialogGenerated::OnCfgHistoryKeyEvent ), NULL, this );
-	m_listBoxHistory->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnLoadFromHistory ), NULL, this );
-	m_listBoxHistory->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( MainDialogGenerated::OnLoadFromHistoryDoubleClick ), NULL, this );
-	m_listBoxHistory->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnCfgHistoryRightClick ), NULL, this );
-	m_bpButtonFilter->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigureFilter ), NULL, this );
-	m_bpButtonFilter->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnGlobalFilterContext ), NULL, this );
-	m_checkBoxHideExcluded->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnShowExcluded ), NULL, this );
-	m_bpButtonShowCreateLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-	m_bpButtonShowCreateLeft->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
-	m_bpButtonShowUpdateLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-	m_bpButtonShowUpdateLeft->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
-	m_bpButtonShowDeleteLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-	m_bpButtonShowDeleteLeft->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
-	m_bpButtonShowLeftOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-	m_bpButtonShowLeftOnly->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
-	m_bpButtonShowLeftNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-	m_bpButtonShowLeftNewer->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
-	m_bpButtonShowEqual->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-	m_bpButtonShowEqual->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
-	m_bpButtonShowDifferent->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-	m_bpButtonShowDifferent->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
-	m_bpButtonShowDoNothing->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-	m_bpButtonShowDoNothing->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
-	m_bpButtonShowRightNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-	m_bpButtonShowRightNewer->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
-	m_bpButtonShowRightOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-	m_bpButtonShowRightOnly->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
-	m_bpButtonShowDeleteRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-	m_bpButtonShowDeleteRight->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
-	m_bpButtonShowUpdateRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-	m_bpButtonShowUpdateRight->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
-	m_bpButtonShowCreateRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-	m_bpButtonShowCreateRight->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
-	m_bpButtonShowConflict->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-	m_bpButtonShowConflict->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
+    this->SetSizeHints( wxSize( 640,400 ), wxDefaultSize );
+
+    m_menubar1 = new wxMenuBar( 0 );
+    m_menuFile = new wxMenu();
+    m_menuItemNew = new wxMenuItem( m_menuFile, wxID_NEW, wxString( _("&New") ) + wxT('\t') + wxT("Ctrl+N"), wxEmptyString, wxITEM_NORMAL );
+#ifdef __WXMSW__
+    m_menuItemNew->SetBitmaps( wxNullBitmap );
+#elif defined( __WXGTK__ )
+    m_menuItemNew->SetBitmap( wxNullBitmap );
+#endif
+    m_menuFile->Append( m_menuItemNew );
+
+    m_menuItemLoad = new wxMenuItem( m_menuFile, wxID_OPEN, wxString( _("&Open...") ) + wxT('\t') + wxT("Ctrl+O"), wxEmptyString, wxITEM_NORMAL );
+    m_menuFile->Append( m_menuItemLoad );
+
+    m_menuItemSave = new wxMenuItem( m_menuFile, wxID_SAVE, wxString( _("&Save") ) + wxT('\t') + wxT("Ctrl+S"), wxEmptyString, wxITEM_NORMAL );
+    m_menuFile->Append( m_menuItemSave );
+
+    m_menuItemSaveAs = new wxMenuItem( m_menuFile, wxID_SAVEAS, wxString( _("Save &as...") ) , wxEmptyString, wxITEM_NORMAL );
+    m_menuFile->Append( m_menuItemSaveAs );
+
+    m_menuItem7 = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("Save as &batch job...") ) , wxEmptyString, wxITEM_NORMAL );
+    m_menuFile->Append( m_menuItem7 );
+
+    m_menuFile->AppendSeparator();
+
+    m_menuItem10 = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("1. &Compare") ) + wxT('\t') + wxT("F5"), wxEmptyString, wxITEM_NORMAL );
+#ifdef __WXMSW__
+    m_menuItem10->SetBitmaps( wxNullBitmap );
+#elif defined( __WXGTK__ )
+    m_menuItem10->SetBitmap( wxNullBitmap );
+#endif
+    m_menuFile->Append( m_menuItem10 );
+
+    m_menuItem11 = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("2. &Synchronize") ) + wxT('\t') + wxT("F6"), wxEmptyString, wxITEM_NORMAL );
+#ifdef __WXMSW__
+    m_menuItem11->SetBitmaps( wxNullBitmap );
+#elif defined( __WXGTK__ )
+    m_menuItem11->SetBitmap( wxNullBitmap );
+#endif
+    m_menuFile->Append( m_menuItem11 );
+
+    m_menuFile->AppendSeparator();
+
+    wxMenuItem* m_menuItem4;
+    m_menuItem4 = new wxMenuItem( m_menuFile, wxID_EXIT, wxString( _("&Quit") ) , wxEmptyString, wxITEM_NORMAL );
+    m_menuFile->Append( m_menuItem4 );
+
+    m_menubar1->Append( m_menuFile, _("&Program") );
+
+    m_menuAdvanced = new wxMenu();
+    m_menuLanguages = new wxMenu();
+    m_menuAdvanced->Append( -1, _("&Language"), m_menuLanguages );
+
+    m_menuAdvanced->AppendSeparator();
+
+    m_menuItemGlobSett = new wxMenuItem( m_menuAdvanced, wxID_PREFERENCES, wxString( _("&Global settings...") ) , wxEmptyString, wxITEM_NORMAL );
+    m_menuAdvanced->Append( m_menuItemGlobSett );
+
+    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();
+    m_menuItemManual = new wxMenuItem( m_menuHelp, wxID_HELP, wxString( _("&Content") ) + wxT('\t') + wxT("F1"), wxEmptyString, wxITEM_NORMAL );
+    m_menuHelp->Append( m_menuItemManual );
+
+    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 );
+
+    bSizerPanelHolder = new wxBoxSizer( wxVERTICAL );
+
+    m_panelTopButtons = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxRAISED_BORDER|wxTAB_TRAVERSAL );
+    bSizerTopButtons = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizerTopButtons->Add( 15, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    wxFlexGridSizer* fgSizer121;
+    fgSizer121 = new wxFlexGridSizer( 2, 2, 0, 0 );
+    fgSizer121->SetFlexibleDirection( wxBOTH );
+    fgSizer121->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    m_staticTextCmpVariant = new wxStaticText( m_panelTopButtons, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextCmpVariant->Wrap( -1 );
+    m_staticTextCmpVariant->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+    m_staticTextCmpVariant->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+
+    fgSizer121->Add( m_staticTextCmpVariant, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxTOP, 1 );
+
+
+    fgSizer121->Add( 0, 0, 1, 0, 5 );
+
+    wxBoxSizer* bSizer30;
+    bSizer30 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_buttonCompare = new zen::BitmapButton( m_panelTopButtons, wxID_OK, _("Compare"), wxDefaultPosition, wxSize( 180,-1 ), 0 );
+    m_buttonCompare->SetDefault();
+    m_buttonCompare->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+    m_buttonCompare->SetToolTip( _("dummy") );
+
+    bSizer30->Add( m_buttonCompare, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    m_buttonCancel = new zen::BitmapButton( m_panelTopButtons, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( 180,-1 ), 0 );
+    m_buttonCancel->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+    m_buttonCancel->Enable( false );
+    m_buttonCancel->Hide();
+
+    bSizer30->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+
+    fgSizer121->Add( bSizer30, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    m_bpButtonCmpConfig = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 46,46 ), wxBU_AUTODRAW );
+    m_bpButtonCmpConfig->SetToolTip( _("Comparison settings") );
+
+    fgSizer121->Add( m_bpButtonCmpConfig, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 3 );
+
+
+    bSizerTopButtons->Add( fgSizer121, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 );
+
+
+    bSizerTopButtons->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 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_panelTopButtons, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextSyncVariant->Wrap( -1 );
+    m_staticTextSyncVariant->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+    m_staticTextSyncVariant->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+
+    fgSizer12->Add( m_staticTextSyncVariant, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP, 1 );
+
+    m_bpButtonSyncConfig = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 46,46 ), wxBU_AUTODRAW );
+    m_bpButtonSyncConfig->SetToolTip( _("Synchronization settings") );
+
+    fgSizer12->Add( m_bpButtonSyncConfig, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 3 );
+
+    m_buttonSync = new zen::BitmapButton( m_panelTopButtons, wxID_ANY, _("Synchronize"), wxDefaultPosition, wxSize( 180,-1 ), 0 );
+    m_buttonSync->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+    m_buttonSync->SetToolTip( _("dummy") );
+
+    fgSizer12->Add( m_buttonSync, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+
+    bSizerTopButtons->Add( fgSizer12, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 );
+
+
+    bSizerTopButtons->Add( 15, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    m_panelTopButtons->SetSizer( bSizerTopButtons );
+    m_panelTopButtons->Layout();
+    bSizerTopButtons->Fit( m_panelTopButtons );
+    bSizerPanelHolder->Add( m_panelTopButtons, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+    m_panelDirectoryPairs = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSTATIC_BORDER|wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer1601;
+    bSizer1601 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer91;
+    bSizer91 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_panelTopLeft = new wxPanel( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panelTopLeft->SetMinSize( wxSize( 1,-1 ) );
+
+    wxFlexGridSizer* fgSizer8;
+    fgSizer8 = new wxFlexGridSizer( 0, 2, 0, 0 );
+    fgSizer8->AddGrowableCol( 1 );
+    fgSizer8->SetFlexibleDirection( wxBOTH );
+    fgSizer8->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_ALL );
+
+
+    fgSizer8->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticTextResolvedPathL = new wxStaticText( m_panelTopLeft, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextResolvedPathL->Wrap( -1 );
+    fgSizer8->Add( m_staticTextResolvedPathL, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2 );
+
+    wxBoxSizer* bSizer159;
+    bSizer159 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bpButtonAddPair = new wxBitmapButton( m_panelTopLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 25,25 ), wxBU_AUTODRAW );
+    m_bpButtonAddPair->SetToolTip( _("Add folder pair") );
+
+    bSizer159->Add( m_bpButtonAddPair, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonRemovePair = new wxBitmapButton( m_panelTopLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 25,25 ), wxBU_AUTODRAW );
+    m_bpButtonRemovePair->SetToolTip( _("Remove folder pair") );
+
+    bSizer159->Add( m_bpButtonRemovePair, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    fgSizer8->Add( bSizer159, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    wxBoxSizer* bSizer182;
+    bSizer182 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_directoryLeft = new FolderHistoryBox( m_panelTopLeft, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+    bSizer182->Add( m_directoryLeft, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_buttonSelectDirLeft = new wxButton( m_panelTopLeft, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonSelectDirLeft->SetToolTip( _("Select a folder") );
+
+    bSizer182->Add( m_buttonSelectDirLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    fgSizer8->Add( bSizer182, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+
+    m_panelTopLeft->SetSizer( fgSizer8 );
+    m_panelTopLeft->Layout();
+    fgSizer8->Fit( m_panelTopLeft );
+    bSizer91->Add( m_panelTopLeft, 1, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_panelTopMiddle = new wxPanel( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer1771;
+    bSizer1771 = new wxBoxSizer( wxVERTICAL );
+
+
+    bSizer1771->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_bpButtonSwapSides = new wxBitmapButton( m_panelTopMiddle, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+    m_bpButtonSwapSides->SetToolTip( _("Swap sides") );
+
+    bSizer1771->Add( m_bpButtonSwapSides, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer160;
+    bSizer160 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bpButtonAltCompCfg = new wxBitmapButton( m_panelTopMiddle, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 25,25 ), wxBU_AUTODRAW );
+    bSizer160->Add( m_bpButtonAltCompCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonLocalFilter = new wxBitmapButton( m_panelTopMiddle, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 25,25 ), wxBU_AUTODRAW );
+    bSizer160->Add( m_bpButtonLocalFilter, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 2 );
+
+    m_bpButtonAltSyncCfg = new wxBitmapButton( m_panelTopMiddle, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 25,25 ), wxBU_AUTODRAW );
+    bSizer160->Add( m_bpButtonAltSyncCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer1771->Add( bSizer160, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    bSizer1771->Add( 0, 0, 1, wxEXPAND, 5 );
+
+
+    m_panelTopMiddle->SetSizer( bSizer1771 );
+    m_panelTopMiddle->Layout();
+    bSizer1771->Fit( m_panelTopMiddle );
+    bSizer91->Add( m_panelTopMiddle, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    m_panelTopRight = new wxPanel( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panelTopRight->SetMinSize( wxSize( 1,-1 ) );
+
+    wxBoxSizer* bSizer183;
+    bSizer183 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticTextResolvedPathR = new wxStaticText( m_panelTopRight, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextResolvedPathR->Wrap( -1 );
+    bSizer183->Add( m_staticTextResolvedPathR, 0, wxALIGN_CENTER_VERTICAL|wxALL, 2 );
+
+    wxBoxSizer* bSizer179;
+    bSizer179 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_directoryRight = new FolderHistoryBox( m_panelTopRight, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+    bSizer179->Add( m_directoryRight, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_buttonSelectDirRight = new wxButton( m_panelTopRight, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonSelectDirRight->SetToolTip( _("Select a folder") );
+
+    bSizer179->Add( m_buttonSelectDirRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer183->Add( bSizer179, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+
+    m_panelTopRight->SetSizer( bSizer183 );
+    m_panelTopRight->Layout();
+    bSizer183->Fit( m_panelTopRight );
+    bSizer91->Add( m_panelTopRight, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+
+    bSizer1601->Add( bSizer91, 0, wxEXPAND, 5 );
+
+    m_scrolledWindowFolderPairs = new wxScrolledWindow( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxHSCROLL|wxVSCROLL );
+    m_scrolledWindowFolderPairs->SetScrollRate( 10, 10 );
+    m_scrolledWindowFolderPairs->SetMinSize( wxSize( -1,0 ) );
+
+    bSizerAddFolderPairs = new wxBoxSizer( wxVERTICAL );
+
+
+    m_scrolledWindowFolderPairs->SetSizer( bSizerAddFolderPairs );
+    m_scrolledWindowFolderPairs->Layout();
+    bSizerAddFolderPairs->Fit( m_scrolledWindowFolderPairs );
+    bSizer1601->Add( m_scrolledWindowFolderPairs, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+
+    m_panelDirectoryPairs->SetSizer( bSizer1601 );
+    m_panelDirectoryPairs->Layout();
+    bSizer1601->Fit( m_panelDirectoryPairs );
+    bSizerPanelHolder->Add( m_panelDirectoryPairs, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+    m_gridNavi = new zen::Grid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
+    m_gridNavi->SetScrollRate( 5, 5 );
+    bSizerPanelHolder->Add( m_gridNavi, 1, wxEXPAND, 5 );
+
+    m_panelCenter = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer1711;
+    bSizer1711 = new wxBoxSizer( wxVERTICAL );
+
+    m_splitterMain = new zen::TripleSplitter( m_panelCenter, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer1781;
+    bSizer1781 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_gridMainL = new zen::Grid( m_splitterMain, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
+    m_gridMainL->SetScrollRate( 5, 5 );
+    bSizer1781->Add( m_gridMainL, 1, wxEXPAND, 5 );
+
+    m_gridMainC = new zen::Grid( m_splitterMain, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
+    m_gridMainC->SetScrollRate( 5, 5 );
+    bSizer1781->Add( m_gridMainC, 0, wxEXPAND, 5 );
+
+    m_gridMainR = new zen::Grid( m_splitterMain, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
+    m_gridMainR->SetScrollRate( 5, 5 );
+    bSizer1781->Add( m_gridMainR, 1, wxEXPAND, 5 );
+
+
+    m_splitterMain->SetSizer( bSizer1781 );
+    m_splitterMain->Layout();
+    bSizer1781->Fit( m_splitterMain );
+    bSizer1711->Add( m_splitterMain, 1, wxEXPAND, 5 );
+
+    m_panelStatusBar = new wxPanel( m_panelCenter, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSTATIC_BORDER|wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer451;
+    bSizer451 = new wxBoxSizer( wxHORIZONTAL );
+
+    bSizer451->SetMinSize( wxSize( -1,22 ) );
+    bSizerFileStatus = new wxBoxSizer( wxHORIZONTAL );
+
+    bSizerStatusLeft = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer53;
+    bSizer53 = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizer53->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizerStatusLeftDirectories = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapSmallDirectoryLeft = new wxStaticBitmap( m_panelStatusBar, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizerStatusLeftDirectories->Add( m_bitmapSmallDirectoryLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerStatusLeftDirectories->Add( 2, 0, 0, 0, 5 );
+
+    m_staticTextStatusLeftDirs = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextStatusLeftDirs->Wrap( -1 );
+    bSizerStatusLeftDirectories->Add( m_staticTextStatusLeftDirs, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    bSizer53->Add( bSizerStatusLeftDirectories, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizerStatusLeftFiles = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizerStatusLeftFiles->Add( 10, 0, 0, 0, 5 );
+
+    m_bitmapSmallFileLeft = new wxStaticBitmap( m_panelStatusBar, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizerStatusLeftFiles->Add( m_bitmapSmallFileLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerStatusLeftFiles->Add( 2, 0, 0, 0, 5 );
+
+    m_staticTextStatusLeftFiles = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextStatusLeftFiles->Wrap( -1 );
+    bSizerStatusLeftFiles->Add( m_staticTextStatusLeftFiles, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerStatusLeftFiles->Add( 10, 0, 0, 0, 5 );
+
+    m_staticTextStatusLeftBytes = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextStatusLeftBytes->Wrap( -1 );
+    bSizerStatusLeftFiles->Add( m_staticTextStatusLeftBytes, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer53->Add( bSizerStatusLeftFiles, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer53->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerStatusLeft->Add( bSizer53, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticline9 = new wxStaticLine( m_panelStatusBar, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    bSizerStatusLeft->Add( m_staticline9, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP, 2 );
+
+
+    bSizerFileStatus->Add( bSizerStatusLeft, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerFileStatus->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( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizerFileStatus->Add( m_staticTextStatusMiddle, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerFileStatus->Add( 26, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizerStatusRight = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticline10 = new wxStaticLine( m_panelStatusBar, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    bSizerStatusRight->Add( m_staticline10, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP, 2 );
+
+    wxBoxSizer* bSizer52;
+    bSizer52 = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizer52->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizerStatusRightDirectories = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapSmallDirectoryRight = new wxStaticBitmap( m_panelStatusBar, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizerStatusRightDirectories->Add( m_bitmapSmallDirectoryRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerStatusRightDirectories->Add( 2, 0, 0, 0, 5 );
+
+    m_staticTextStatusRightDirs = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextStatusRightDirs->Wrap( -1 );
+    bSizerStatusRightDirectories->Add( m_staticTextStatusRightDirs, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer52->Add( bSizerStatusRightDirectories, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizerStatusRightFiles = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizerStatusRightFiles->Add( 10, 0, 0, 0, 5 );
+
+    m_bitmapSmallFileRight = new wxStaticBitmap( m_panelStatusBar, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizerStatusRightFiles->Add( m_bitmapSmallFileRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerStatusRightFiles->Add( 2, 0, 0, 0, 5 );
+
+    m_staticTextStatusRightFiles = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextStatusRightFiles->Wrap( -1 );
+    bSizerStatusRightFiles->Add( m_staticTextStatusRightFiles, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerStatusRightFiles->Add( 10, 0, 0, 0, 5 );
+
+    m_staticTextStatusRightBytes = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextStatusRightBytes->Wrap( -1 );
+    bSizerStatusRightFiles->Add( m_staticTextStatusRightBytes, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer52->Add( bSizerStatusRightFiles, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer52->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerStatusRight->Add( bSizer52, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerFileStatus->Add( bSizerStatusRight, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer451->Add( bSizerFileStatus, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    m_staticTextFullStatus = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextFullStatus->Wrap( -1 );
+    m_staticTextFullStatus->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer451->Add( m_staticTextFullStatus, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+
+    m_panelStatusBar->SetSizer( bSizer451 );
+    m_panelStatusBar->Layout();
+    bSizer451->Fit( m_panelStatusBar );
+    bSizer1711->Add( m_panelStatusBar, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+
+    m_panelCenter->SetSizer( bSizer1711 );
+    m_panelCenter->Layout();
+    bSizer1711->Fit( m_panelCenter );
+    bSizerPanelHolder->Add( m_panelCenter, 1, wxEXPAND, 5 );
+
+    m_panelConfig = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    bSizerConfig = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer151;
+    bSizer151 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bpButtonOpen = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
+    m_bpButtonOpen->SetToolTip( _("dummy") );
+
+    bSizer151->Add( m_bpButtonOpen, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonSave = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
+    m_bpButtonSave->SetToolTip( _("dummy") );
+
+    bSizer151->Add( m_bpButtonSave, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonBatchJob = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
+    m_bpButtonBatchJob->SetToolTip( _("Save as batch job") );
+
+    bSizer151->Add( m_bpButtonBatchJob, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerConfig->Add( bSizer151, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_listBoxHistory = new wxListBox( m_panelConfig, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_EXTENDED|wxLB_NEEDED_SB|wxLB_SORT );
+    m_listBoxHistory->SetMinSize( wxSize( -1,40 ) );
+
+    bSizerConfig->Add( m_listBoxHistory, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    m_panelConfig->SetSizer( bSizerConfig );
+    m_panelConfig->Layout();
+    bSizerConfig->Fit( m_panelConfig );
+    bSizerPanelHolder->Add( m_panelConfig, 0, 0, 5 );
+
+    m_panelFilter = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer171;
+    bSizer171 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bpButtonFilter = new wxBitmapButton( m_panelFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW|wxFULL_REPAINT_ON_RESIZE );
+    bSizer171->Add( m_bpButtonFilter, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    m_checkBoxHideExcluded = new wxCheckBox( m_panelFilter, wxID_ANY, _("Hide excluded items"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_checkBoxHideExcluded->SetToolTip( _("Show filtered or temporarily excluded files") );
+
+    bSizer171->Add( m_checkBoxHideExcluded, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+
+    m_panelFilter->SetSizer( bSizer171 );
+    m_panelFilter->Layout();
+    bSizer171->Fit( m_panelFilter );
+    bSizerPanelHolder->Add( m_panelFilter, 0, 0, 5 );
+
+    m_panelStatistics = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    bSizer1801 = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizer1801->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    bSizerStatistics = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer1712;
+    bSizer1712 = new wxBoxSizer( wxVERTICAL );
+
+    m_bitmapCreateLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    m_bitmapCreateLeft->SetToolTip( _("Number of files and folders that will be created") );
+
+    bSizer1712->Add( m_bitmapCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    bSizer1712->Add( 5, 2, 0, 0, 5 );
+
+
+    bSizer1712->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticTextCreateLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextCreateLeft->Wrap( -1 );
+    m_staticTextCreateLeft->SetToolTip( _("Number of files and folders that will be created") );
+
+    bSizer1712->Add( m_staticTextCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    bSizerStatistics->Add( bSizer1712, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+
+    bSizerStatistics->Add( 5, 5, 0, 0, 5 );
+
+    wxBoxSizer* bSizer172;
+    bSizer172 = new wxBoxSizer( wxVERTICAL );
+
+    m_bitmapUpdateLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    m_bitmapUpdateLeft->SetToolTip( _("Number of files that will be overwritten") );
+
+    bSizer172->Add( m_bitmapUpdateLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer172->Add( 5, 2, 0, 0, 5 );
+
+
+    bSizer172->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticTextUpdateLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextUpdateLeft->Wrap( -1 );
+    m_staticTextUpdateLeft->SetToolTip( _("Number of files that will be overwritten") );
+
+    bSizer172->Add( m_staticTextUpdateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    bSizerStatistics->Add( bSizer172, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+
+    bSizerStatistics->Add( 5, 5, 0, 0, 5 );
+
+    wxBoxSizer* bSizer173;
+    bSizer173 = new wxBoxSizer( wxVERTICAL );
+
+    m_bitmapDeleteLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    m_bitmapDeleteLeft->SetToolTip( _("Number of files and folders that will be deleted") );
+
+    bSizer173->Add( m_bitmapDeleteLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer173->Add( 5, 2, 0, 0, 5 );
+
+
+    bSizer173->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticTextDeleteLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextDeleteLeft->Wrap( -1 );
+    m_staticTextDeleteLeft->SetToolTip( _("Number of files and folders that will be deleted") );
+
+    bSizer173->Add( m_staticTextDeleteLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerStatistics->Add( bSizer173, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+
+    bSizerStatistics->Add( 5, 5, 0, 0, 5 );
+
+    bSizerData = new wxBoxSizer( wxVERTICAL );
+
+    m_bitmapData = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    m_bitmapData->SetToolTip( _("Total bytes to copy") );
+
+    bSizerData->Add( m_bitmapData, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    bSizerData->Add( 5, 2, 0, 0, 5 );
+
+
+    bSizerData->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticTextData = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextData->Wrap( -1 );
+    m_staticTextData->SetToolTip( _("Total bytes to copy") );
+
+    bSizerData->Add( m_staticTextData, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerStatistics->Add( bSizerData, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+
+    bSizerStatistics->Add( 5, 5, 0, 0, 5 );
+
+    wxBoxSizer* bSizer176;
+    bSizer176 = new wxBoxSizer( wxVERTICAL );
+
+    m_bitmapDeleteRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    m_bitmapDeleteRight->SetToolTip( _("Number of files and folders that will be deleted") );
+
+    bSizer176->Add( m_bitmapDeleteRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer176->Add( 5, 2, 0, 0, 5 );
+
+
+    bSizer176->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticTextDeleteRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextDeleteRight->Wrap( -1 );
+    m_staticTextDeleteRight->SetToolTip( _("Number of files and folders that will be deleted") );
+
+    bSizer176->Add( m_staticTextDeleteRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerStatistics->Add( bSizer176, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+
+    bSizerStatistics->Add( 5, 5, 0, 0, 5 );
+
+    wxBoxSizer* bSizer177;
+    bSizer177 = new wxBoxSizer( wxVERTICAL );
+
+    m_bitmapUpdateRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    m_bitmapUpdateRight->SetToolTip( _("Number of files that will be overwritten") );
+
+    bSizer177->Add( m_bitmapUpdateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    bSizer177->Add( 5, 2, 0, 0, 5 );
+
+
+    bSizer177->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticTextUpdateRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextUpdateRight->Wrap( -1 );
+    m_staticTextUpdateRight->SetToolTip( _("Number of files that will be overwritten") );
+
+    bSizer177->Add( m_staticTextUpdateRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerStatistics->Add( bSizer177, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+
+    bSizerStatistics->Add( 5, 5, 0, 0, 5 );
+
+    wxBoxSizer* bSizer178;
+    bSizer178 = new wxBoxSizer( wxVERTICAL );
+
+    m_bitmapCreateRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    m_bitmapCreateRight->SetToolTip( _("Number of files and folders that will be created") );
+
+    bSizer178->Add( m_bitmapCreateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    bSizer178->Add( 5, 2, 0, 0, 5 );
+
+
+    bSizer178->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticTextCreateRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextCreateRight->Wrap( -1 );
+    m_staticTextCreateRight->SetToolTip( _("Number of files and folders that will be created") );
+
+    bSizer178->Add( m_staticTextCreateRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerStatistics->Add( bSizer178, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+
+    bSizer1801->Add( bSizerStatistics, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer1801->Add( 0, 0, 1, wxEXPAND, 5 );
+
+
+    m_panelStatistics->SetSizer( bSizer1801 );
+    m_panelStatistics->Layout();
+    bSizer1801->Fit( m_panelStatistics );
+    bSizerPanelHolder->Add( m_panelStatistics, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_panelViewFilter = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    bSizerViewFilter = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizerViewFilter->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_bpButtonShowCreateLeft = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonShowCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonShowUpdateLeft = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonShowUpdateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonShowDeleteLeft = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonShowDeleteLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonShowLeftOnly = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonShowLeftOnly, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonShowLeftNewer = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonShowLeftNewer, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonShowEqual = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonShowEqual, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonShowDifferent = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonShowDifferent, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonShowDoNothing = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonShowDoNothing, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonShowRightNewer = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonShowRightNewer, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonShowRightOnly = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonShowRightOnly, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonShowDeleteRight = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonShowDeleteRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonShowUpdateRight = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonShowUpdateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonShowCreateRight = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonShowCreateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonShowConflict = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonShowConflict, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    bSizerViewFilter->Add( 0, 0, 1, wxEXPAND, 5 );
+
+
+    m_panelViewFilter->SetSizer( bSizerViewFilter );
+    m_panelViewFilter->Layout();
+    bSizerViewFilter->Fit( m_panelViewFilter );
+    bSizerPanelHolder->Add( m_panelViewFilter, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    this->SetSizer( bSizerPanelHolder );
+    this->Layout();
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainDialogGenerated::OnClose ) );
+    this->Connect( m_menuItemNew->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigNew ) );
+    this->Connect( m_menuItemLoad->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigLoad ) );
+    this->Connect( m_menuItemSave->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigSave ) );
+    this->Connect( m_menuItemSaveAs->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigSaveAs ) );
+    this->Connect( m_menuItem7->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnSaveAsBatchJob ) );
+    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_menuItem4->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuQuit ) );
+    this->Connect( m_menuItemGlobSett->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuGlobalSettings ) );
+    this->Connect( m_menuItem5->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuExportFileList ) );
+    this->Connect( m_menuItemManual->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_bpButtonCmpConfig->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnCompSettingsContext ), NULL, this );
+    m_bpButtonSyncConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncSettings ), NULL, this );
+    m_bpButtonSyncConfig->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnSyncSettingsContext ), NULL, this );
+    m_buttonSync->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnStartSync ), NULL, this );
+    m_bpButtonAddPair->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnAddFolderPair ), NULL, this );
+    m_bpButtonRemovePair->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnRemoveTopFolderPair ), NULL, this );
+    m_bpButtonSwapSides->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSwapSides ), NULL, this );
+    m_bpButtonOpen->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigLoad ), NULL, this );
+    m_bpButtonSave->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigSave ), NULL, this );
+    m_bpButtonBatchJob->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSaveAsBatchJob ), NULL, this );
+    m_listBoxHistory->Connect( wxEVT_CHAR, wxKeyEventHandler( MainDialogGenerated::OnCfgHistoryKeyEvent ), NULL, this );
+    m_listBoxHistory->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnLoadFromHistory ), NULL, this );
+    m_listBoxHistory->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( MainDialogGenerated::OnLoadFromHistoryDoubleClick ), NULL, this );
+    m_listBoxHistory->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnCfgHistoryRightClick ), NULL, this );
+    m_bpButtonFilter->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigureFilter ), NULL, this );
+    m_bpButtonFilter->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnGlobalFilterContext ), NULL, this );
+    m_checkBoxHideExcluded->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnShowExcluded ), NULL, this );
+    m_bpButtonShowCreateLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+    m_bpButtonShowCreateLeft->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
+    m_bpButtonShowUpdateLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+    m_bpButtonShowUpdateLeft->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
+    m_bpButtonShowDeleteLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+    m_bpButtonShowDeleteLeft->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
+    m_bpButtonShowLeftOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+    m_bpButtonShowLeftOnly->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
+    m_bpButtonShowLeftNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+    m_bpButtonShowLeftNewer->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
+    m_bpButtonShowEqual->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+    m_bpButtonShowEqual->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
+    m_bpButtonShowDifferent->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+    m_bpButtonShowDifferent->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
+    m_bpButtonShowDoNothing->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+    m_bpButtonShowDoNothing->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
+    m_bpButtonShowRightNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+    m_bpButtonShowRightNewer->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
+    m_bpButtonShowRightOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+    m_bpButtonShowRightOnly->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
+    m_bpButtonShowDeleteRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+    m_bpButtonShowDeleteRight->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
+    m_bpButtonShowUpdateRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+    m_bpButtonShowUpdateRight->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
+    m_bpButtonShowCreateRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+    m_bpButtonShowCreateRight->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
+    m_bpButtonShowConflict->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+    m_bpButtonShowConflict->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
 }
 
 MainDialogGenerated::~MainDialogGenerated()
 {
-	// Disconnect Events
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainDialogGenerated::OnClose ) );
-	this->Disconnect( wxID_NEW, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigNew ) );
-	this->Disconnect( wxID_OPEN, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigLoad ) );
-	this->Disconnect( wxID_SAVE, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigSave ) );
-	this->Disconnect( wxID_SAVEAS, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigSaveAs ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnSaveAsBatchJob ) );
-	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_EXIT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuQuit ) );
-	this->Disconnect( wxID_PREFERENCES, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuGlobalSettings ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuExportFileList ) );
-	this->Disconnect( wxID_HELP, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnShowHelp ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuCheckVersion ) );
-	this->Disconnect( wxID_ABOUT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuAbout ) );
-	m_buttonCompare->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnCompare ), NULL, this );
-	m_bpButtonCmpConfig->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnCmpSettings ), NULL, this );
-	m_bpButtonCmpConfig->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnCompSettingsContext ), NULL, this );
-	m_bpButtonSyncConfig->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncSettings ), NULL, this );
-	m_bpButtonSyncConfig->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnSyncSettingsContext ), NULL, this );
-	m_buttonSync->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnStartSync ), NULL, this );
-	m_bpButtonAddPair->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnAddFolderPair ), NULL, this );
-	m_bpButtonRemovePair->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnRemoveTopFolderPair ), NULL, this );
-	m_bpButtonSwapSides->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSwapSides ), NULL, this );
-	m_bpButtonOpen->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigLoad ), NULL, this );
-	m_bpButtonSave->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigSave ), NULL, this );
-	m_bpButtonBatchJob->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSaveAsBatchJob ), NULL, this );
-	m_listBoxHistory->Disconnect( wxEVT_CHAR, wxKeyEventHandler( MainDialogGenerated::OnCfgHistoryKeyEvent ), NULL, this );
-	m_listBoxHistory->Disconnect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnLoadFromHistory ), NULL, this );
-	m_listBoxHistory->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( MainDialogGenerated::OnLoadFromHistoryDoubleClick ), NULL, this );
-	m_listBoxHistory->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnCfgHistoryRightClick ), NULL, this );
-	m_bpButtonFilter->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigureFilter ), NULL, this );
-	m_bpButtonFilter->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnGlobalFilterContext ), NULL, this );
-	m_checkBoxHideExcluded->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnShowExcluded ), NULL, this );
-	m_bpButtonShowCreateLeft->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-	m_bpButtonShowCreateLeft->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
-	m_bpButtonShowUpdateLeft->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-	m_bpButtonShowUpdateLeft->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
-	m_bpButtonShowDeleteLeft->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-	m_bpButtonShowDeleteLeft->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
-	m_bpButtonShowLeftOnly->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-	m_bpButtonShowLeftOnly->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
-	m_bpButtonShowLeftNewer->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-	m_bpButtonShowLeftNewer->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
-	m_bpButtonShowEqual->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-	m_bpButtonShowEqual->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
-	m_bpButtonShowDifferent->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-	m_bpButtonShowDifferent->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
-	m_bpButtonShowDoNothing->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-	m_bpButtonShowDoNothing->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
-	m_bpButtonShowRightNewer->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-	m_bpButtonShowRightNewer->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
-	m_bpButtonShowRightOnly->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-	m_bpButtonShowRightOnly->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
-	m_bpButtonShowDeleteRight->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-	m_bpButtonShowDeleteRight->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
-	m_bpButtonShowUpdateRight->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-	m_bpButtonShowUpdateRight->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
-	m_bpButtonShowCreateRight->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-	m_bpButtonShowCreateRight->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
-	m_bpButtonShowConflict->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
-	m_bpButtonShowConflict->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
-	
+    // Disconnect Events
+    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainDialogGenerated::OnClose ) );
+    this->Disconnect( wxID_NEW, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigNew ) );
+    this->Disconnect( wxID_OPEN, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigLoad ) );
+    this->Disconnect( wxID_SAVE, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigSave ) );
+    this->Disconnect( wxID_SAVEAS, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnConfigSaveAs ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnSaveAsBatchJob ) );
+    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_EXIT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuQuit ) );
+    this->Disconnect( wxID_PREFERENCES, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuGlobalSettings ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuExportFileList ) );
+    this->Disconnect( wxID_HELP, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnShowHelp ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuCheckVersion ) );
+    this->Disconnect( wxID_ABOUT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuAbout ) );
+    m_buttonCompare->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnCompare ), NULL, this );
+    m_bpButtonCmpConfig->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnCmpSettings ), NULL, this );
+    m_bpButtonCmpConfig->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnCompSettingsContext ), NULL, this );
+    m_bpButtonSyncConfig->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncSettings ), NULL, this );
+    m_bpButtonSyncConfig->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnSyncSettingsContext ), NULL, this );
+    m_buttonSync->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnStartSync ), NULL, this );
+    m_bpButtonAddPair->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnAddFolderPair ), NULL, this );
+    m_bpButtonRemovePair->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnRemoveTopFolderPair ), NULL, this );
+    m_bpButtonSwapSides->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSwapSides ), NULL, this );
+    m_bpButtonOpen->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigLoad ), NULL, this );
+    m_bpButtonSave->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigSave ), NULL, this );
+    m_bpButtonBatchJob->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSaveAsBatchJob ), NULL, this );
+    m_listBoxHistory->Disconnect( wxEVT_CHAR, wxKeyEventHandler( MainDialogGenerated::OnCfgHistoryKeyEvent ), NULL, this );
+    m_listBoxHistory->Disconnect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnLoadFromHistory ), NULL, this );
+    m_listBoxHistory->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( MainDialogGenerated::OnLoadFromHistoryDoubleClick ), NULL, this );
+    m_listBoxHistory->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnCfgHistoryRightClick ), NULL, this );
+    m_bpButtonFilter->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigureFilter ), NULL, this );
+    m_bpButtonFilter->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnGlobalFilterContext ), NULL, this );
+    m_checkBoxHideExcluded->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnShowExcluded ), NULL, this );
+    m_bpButtonShowCreateLeft->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+    m_bpButtonShowCreateLeft->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
+    m_bpButtonShowUpdateLeft->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+    m_bpButtonShowUpdateLeft->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
+    m_bpButtonShowDeleteLeft->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+    m_bpButtonShowDeleteLeft->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
+    m_bpButtonShowLeftOnly->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+    m_bpButtonShowLeftOnly->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
+    m_bpButtonShowLeftNewer->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+    m_bpButtonShowLeftNewer->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
+    m_bpButtonShowEqual->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+    m_bpButtonShowEqual->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
+    m_bpButtonShowDifferent->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+    m_bpButtonShowDifferent->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
+    m_bpButtonShowDoNothing->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+    m_bpButtonShowDoNothing->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
+    m_bpButtonShowRightNewer->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+    m_bpButtonShowRightNewer->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
+    m_bpButtonShowRightOnly->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+    m_bpButtonShowRightOnly->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
+    m_bpButtonShowDeleteRight->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+    m_bpButtonShowDeleteRight->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
+    m_bpButtonShowUpdateRight->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+    m_bpButtonShowUpdateRight->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
+    m_bpButtonShowCreateRight->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+    m_bpButtonShowCreateRight->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), NULL, this );
+    m_bpButtonShowConflict->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnToggleViewButton ), NULL, this );
+    m_bpButtonShowConflict->Disconnect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::OnViewButtonRightClick ), 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 );
-	m_panelLeft->SetMinSize( wxSize( 1,-1 ) );
-	
-	wxBoxSizer* bSizer134;
-	bSizer134 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bpButtonRemovePair = new wxBitmapButton( m_panelLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 25,25 ), wxBU_AUTODRAW );
-	m_bpButtonRemovePair->SetToolTip( _("Remove folder pair") );
-	
-	bSizer134->Add( m_bpButtonRemovePair, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_directoryLeft = new FolderHistoryBox( m_panelLeft, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
-	bSizer134->Add( m_directoryLeft, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_buttonSelectDirLeft = new wxButton( m_panelLeft, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_buttonSelectDirLeft->SetToolTip( _("Select a folder") );
-	
-	bSizer134->Add( m_buttonSelectDirLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	m_panelLeft->SetSizer( bSizer134 );
-	m_panelLeft->Layout();
-	bSizer134->Fit( m_panelLeft );
-	bSizer74->Add( m_panelLeft, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxEXPAND, 5 );
-	
-	m_panel20 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer95;
-	bSizer95 = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizer95->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_bpButtonAltCompCfg = new wxBitmapButton( m_panel20, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 25,25 ), wxBU_AUTODRAW );
-	bSizer95->Add( m_bpButtonAltCompCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonLocalFilter = new wxBitmapButton( m_panel20, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 25,25 ), wxBU_AUTODRAW );
-	bSizer95->Add( m_bpButtonLocalFilter, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 2 );
-	
-	m_bpButtonAltSyncCfg = new wxBitmapButton( m_panel20, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 25,25 ), wxBU_AUTODRAW );
-	bSizer95->Add( m_bpButtonAltSyncCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer95->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	m_panel20->SetSizer( bSizer95 );
-	m_panel20->Layout();
-	bSizer95->Fit( m_panel20 );
-	bSizer74->Add( m_panel20, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-	
-	m_panelRight = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panelRight->SetMinSize( wxSize( 1,-1 ) );
-	
-	wxBoxSizer* bSizer135;
-	bSizer135 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_directoryRight = new FolderHistoryBox( m_panelRight, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
-	bSizer135->Add( m_directoryRight, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_buttonSelectDirRight = new wxButton( m_panelRight, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_buttonSelectDirRight->SetToolTip( _("Select a folder") );
-	
-	bSizer135->Add( m_buttonSelectDirRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	m_panelRight->SetSizer( bSizer135 );
-	m_panelRight->Layout();
-	bSizer135->Fit( m_panelRight );
-	bSizer74->Add( m_panelRight, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxEXPAND, 5 );
-	
-	
-	this->SetSizer( bSizer74 );
-	this->Layout();
-	bSizer74->Fit( this );
+    wxBoxSizer* bSizer74;
+    bSizer74 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_panelLeft = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panelLeft->SetMinSize( wxSize( 1,-1 ) );
+
+    wxBoxSizer* bSizer134;
+    bSizer134 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bpButtonRemovePair = new wxBitmapButton( m_panelLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 25,25 ), wxBU_AUTODRAW );
+    m_bpButtonRemovePair->SetToolTip( _("Remove folder pair") );
+
+    bSizer134->Add( m_bpButtonRemovePair, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_directoryLeft = new FolderHistoryBox( m_panelLeft, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+    bSizer134->Add( m_directoryLeft, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_buttonSelectDirLeft = new wxButton( m_panelLeft, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonSelectDirLeft->SetToolTip( _("Select a folder") );
+
+    bSizer134->Add( m_buttonSelectDirLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    m_panelLeft->SetSizer( bSizer134 );
+    m_panelLeft->Layout();
+    bSizer134->Fit( m_panelLeft );
+    bSizer74->Add( m_panelLeft, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxEXPAND, 5 );
+
+    m_panel20 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer95;
+    bSizer95 = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizer95->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_bpButtonAltCompCfg = new wxBitmapButton( m_panel20, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 25,25 ), wxBU_AUTODRAW );
+    bSizer95->Add( m_bpButtonAltCompCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonLocalFilter = new wxBitmapButton( m_panel20, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 25,25 ), wxBU_AUTODRAW );
+    bSizer95->Add( m_bpButtonLocalFilter, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 2 );
+
+    m_bpButtonAltSyncCfg = new wxBitmapButton( m_panel20, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 25,25 ), wxBU_AUTODRAW );
+    bSizer95->Add( m_bpButtonAltSyncCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer95->Add( 0, 0, 1, wxEXPAND, 5 );
+
+
+    m_panel20->SetSizer( bSizer95 );
+    m_panel20->Layout();
+    bSizer95->Fit( m_panel20 );
+    bSizer74->Add( m_panel20, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+
+    m_panelRight = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panelRight->SetMinSize( wxSize( 1,-1 ) );
+
+    wxBoxSizer* bSizer135;
+    bSizer135 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_directoryRight = new FolderHistoryBox( m_panelRight, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+    bSizer135->Add( m_directoryRight, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_buttonSelectDirRight = new wxButton( m_panelRight, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonSelectDirRight->SetToolTip( _("Select a folder") );
+
+    bSizer135->Add( m_buttonSelectDirRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    m_panelRight->SetSizer( bSizer135 );
+    m_panelRight->Layout();
+    bSizer135->Fit( m_panelRight );
+    bSizer74->Add( m_panelRight, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxEXPAND, 5 );
+
+
+    this->SetSizer( bSizer74 );
+    this->Layout();
+    bSizer74->Fit( this );
 }
 
 FolderPairGenerated::~FolderPairGenerated()
@@ -1058,154 +1059,142 @@ FolderPairGenerated::~FolderPairGenerated()
 
 CompareProgressDlgGenerated::CompareProgressDlgGenerated( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
 {
-	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-	
-	wxBoxSizer* bSizer40;
-	bSizer40 = new wxBoxSizer( wxVERTICAL );
-	
-	
-	bSizer40->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer182;
-	bSizer182 = new wxBoxSizer( wxVERTICAL );
-	
-	m_textCtrlStatus = new wxTextCtrl( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
-	m_textCtrlStatus->SetMaxLength( 0 ); 
-	m_textCtrlStatus->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	bSizer182->Add( m_textCtrlStatus, 0, wxEXPAND, 5 );
-	
-	
-	bSizer40->Add( bSizer182, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 );
-	
-	m_gauge2 = new wxGauge( this, wxID_ANY, 100, wxDefaultPosition, wxSize( -1,14 ), wxGA_HORIZONTAL|wxGA_SMOOTH );
-	bSizer40->Add( m_gauge2, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
-	
-	bSizer42 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer157;
-	bSizer157 = new wxBoxSizer( wxVERTICAL );
-	
-	bSizerFilesFound = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText321 = new wxStaticText( this, wxID_ANY, _("Items found:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText321->Wrap( -1 );
-	m_staticText321->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 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( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	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, _("Items remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText46->Wrap( -1 );
-	m_staticText46->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 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( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer154->Add( m_staticTextFilesRemaining, 0, wxALIGN_BOTTOM, 5 );
-	
-	m_staticTextDataRemaining = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextDataRemaining->Wrap( -1 );
-	m_staticTextDataRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer154->Add( m_staticTextDataRemaining, 0, wxALIGN_BOTTOM|wxLEFT, 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( wxNORMAL_FONT->GetPointSize(), 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( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	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( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
-	
-	sSizerTimeRemaining->Add( m_staticTextTimeRemFixed, 0, wxALIGN_BOTTOM, 5 );
-	
-	m_staticTextRemTime = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextRemTime->Wrap( -1 );
-	m_staticTextRemTime->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	sSizerTimeRemaining->Add( m_staticTextRemTime, 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( wxNORMAL_FONT->GetPointSize(), 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( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	sSizerTimeElapsed->Add( m_staticTextTimeElapsed, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
-	
-	
-	bSizer42->Add( sSizerTimeElapsed, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer40->Add( bSizer42, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
-	
-	
-	bSizer40->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	this->SetSizer( bSizer40 );
-	this->Layout();
-	bSizer40->Fit( this );
+    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+    wxBoxSizer* bSizer40;
+    bSizer40 = new wxBoxSizer( wxVERTICAL );
+
+
+    bSizer40->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer182;
+    bSizer182 = new wxBoxSizer( wxVERTICAL );
+
+    m_textCtrlStatus = new wxTextCtrl( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
+    m_textCtrlStatus->SetMaxLength( 0 );
+    m_textCtrlStatus->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    bSizer182->Add( m_textCtrlStatus, 0, wxEXPAND, 5 );
+
+
+    bSizer40->Add( bSizer182, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 );
+
+    m_gauge2 = new wxGauge( this, wxID_ANY, 100, wxDefaultPosition, wxSize( -1,14 ), wxGA_HORIZONTAL|wxGA_SMOOTH );
+    bSizer40->Add( m_gauge2, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
+
+    bSizer42 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer157;
+    bSizer157 = new wxBoxSizer( wxVERTICAL );
+
+    bSizerFilesFound = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText321 = new wxStaticText( this, wxID_ANY, _("Items found:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText321->Wrap( -1 );
+    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( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    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, _("Items remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText46->Wrap( -1 );
+    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( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer154->Add( m_staticTextFilesRemaining, 0, wxALIGN_BOTTOM, 5 );
+
+    m_staticTextDataRemaining = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextDataRemaining->Wrap( -1 );
+    bSizer154->Add( m_staticTextDataRemaining, 0, wxALIGN_BOTTOM|wxLEFT, 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 );
+    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( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    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 );
+    sSizerTimeRemaining->Add( m_staticTextTimeRemFixed, 0, wxALIGN_BOTTOM, 5 );
+
+    m_staticTextRemTime = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextRemTime->Wrap( -1 );
+    m_staticTextRemTime->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    sSizerTimeRemaining->Add( m_staticTextRemTime, 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 );
+    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( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    sSizerTimeElapsed->Add( m_staticTextTimeElapsed, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
+
+
+    bSizer42->Add( sSizerTimeElapsed, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer40->Add( bSizer42, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
+
+
+    bSizer40->Add( 0, 0, 1, wxEXPAND, 5 );
+
+
+    this->SetSizer( bSizer40 );
+    this->Layout();
+    bSizer40->Fit( this );
 }
 
 CompareProgressDlgGenerated::~CompareProgressDlgGenerated()
@@ -1214,2445 +1203,2299 @@ CompareProgressDlgGenerated::~CompareProgressDlgGenerated()
 
 SyncProgressDlgGenerated::SyncProgressDlgGenerated( 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,260 ), wxDefaultSize );
-	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	bSizerTop = new wxBoxSizer( wxVERTICAL );
-	
-	m_panelHeader = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panelHeader->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-	
-	wxBoxSizer* bSizer181;
-	bSizer181 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer42;
-	bSizer42 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapStatus = new wxStaticBitmap( m_panelHeader, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 32,32 ), 0 );
-	bSizer42->Add( m_bitmapStatus, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	m_staticTextPhase = new wxStaticText( m_panelHeader, wxID_ANY, _("Synchronizing..."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextPhase->Wrap( -1 );
-	m_staticTextPhase->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer42->Add( m_staticTextPhase, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
-	
-	m_animationControl1 = new wxAnimationCtrl( m_panelHeader, wxID_ANY, wxNullAnimation, wxDefaultPosition, wxDefaultSize, wxAC_DEFAULT_STYLE ); 
-	m_animationControl1->SetMinSize( wxSize( 45,45 ) );
-	
-	bSizer42->Add( m_animationControl1, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
-	
-	bSizer181->Add( bSizer42, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 5 );
-	
-	
-	m_panelHeader->SetSizer( bSizer181 );
-	m_panelHeader->Layout();
-	bSizer181->Fit( m_panelHeader );
-	bSizerTop->Add( m_panelHeader, 0, wxEXPAND, 5 );
-	
-	m_staticlineHeader = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizerTop->Add( m_staticlineHeader, 0, wxEXPAND, 5 );
-	
-	m_panelProgress = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer173;
-	bSizer173 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticTextStatus = new wxStaticText( m_panelProgress, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextStatus->Wrap( -1 );
-	bSizer173->Add( m_staticTextStatus, 0, wxALL|wxEXPAND, 5 );
-	
-	m_gauge1 = new wxGauge( m_panelProgress, wxID_ANY, 100, wxDefaultPosition, wxSize( -1,14 ), wxGA_HORIZONTAL );
-	bSizer173->Add( m_gauge1, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
-	
-	
-	bSizer173->Add( 0, 10, 0, 0, 5 );
-	
-	bSizer171 = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizer171->Add( 10, 0, 0, 0, 5 );
-	
-	wxFlexGridSizer* fgSizer10;
-	fgSizer10 = new wxFlexGridSizer( 0, 2, 2, 5 );
-	fgSizer10->SetFlexibleDirection( wxBOTH );
-	fgSizer10->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	m_staticTextLabelItemsProc = new wxStaticText( m_panelProgress, wxID_ANY, _("Items processed:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextLabelItemsProc->Wrap( -1 );
-	m_staticTextLabelItemsProc->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
-	
-	fgSizer10->Add( m_staticTextLabelItemsProc, 0, wxALIGN_BOTTOM, 5 );
-	
-	bSizerItemsProc = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticTextProcessedObj = new wxStaticText( m_panelProgress, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_staticTextProcessedObj->Wrap( -1 );
-	m_staticTextProcessedObj->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizerItemsProc->Add( m_staticTextProcessedObj, 0, wxALIGN_BOTTOM, 5 );
-	
-	m_staticTextDataProcessed = new wxStaticText( m_panelProgress, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextDataProcessed->Wrap( -1 );
-	m_staticTextDataProcessed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizerItemsProc->Add( m_staticTextDataProcessed, 0, wxALIGN_BOTTOM|wxLEFT, 5 );
-	
-	
-	fgSizer10->Add( bSizerItemsProc, 0, wxALIGN_BOTTOM, 5 );
-	
-	m_staticTextLabelItemsRem = new wxStaticText( m_panelProgress, wxID_ANY, _("Items remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextLabelItemsRem->Wrap( -1 );
-	m_staticTextLabelItemsRem->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
-	
-	fgSizer10->Add( m_staticTextLabelItemsRem, 0, wxALIGN_BOTTOM, 5 );
-	
-	bSizerItemsRem = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticTextRemainingObj = new wxStaticText( m_panelProgress, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_staticTextRemainingObj->Wrap( -1 );
-	m_staticTextRemainingObj->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizerItemsRem->Add( m_staticTextRemainingObj, 0, wxALIGN_BOTTOM, 5 );
-	
-	m_staticTextDataRemaining = new wxStaticText( m_panelProgress, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextDataRemaining->Wrap( -1 );
-	m_staticTextDataRemaining->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizerItemsRem->Add( m_staticTextDataRemaining, 0, wxALIGN_BOTTOM|wxLEFT, 5 );
-	
-	
-	fgSizer10->Add( bSizerItemsRem, 0, wxALIGN_BOTTOM, 5 );
-	
-	m_staticText84 = new wxStaticText( m_panelProgress, wxID_ANY, _("Speed:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText84->Wrap( -1 );
-	m_staticText84->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
-	
-	fgSizer10->Add( m_staticText84, 0, wxALIGN_BOTTOM, 5 );
-	
-	m_staticTextSpeed = new wxStaticText( m_panelProgress, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextSpeed->Wrap( -1 );
-	m_staticTextSpeed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	fgSizer10->Add( m_staticTextSpeed, 0, wxALIGN_BOTTOM, 5 );
-	
-	m_staticTextLabelRemTime = new wxStaticText( m_panelProgress, wxID_ANY, _("Time remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextLabelRemTime->Wrap( -1 );
-	m_staticTextLabelRemTime->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
-	
-	fgSizer10->Add( m_staticTextLabelRemTime, 0, wxALIGN_BOTTOM, 5 );
-	
-	m_staticTextRemTime = new wxStaticText( m_panelProgress, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextRemTime->Wrap( -1 );
-	m_staticTextRemTime->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	fgSizer10->Add( m_staticTextRemTime, 0, wxALIGN_BOTTOM, 5 );
-	
-	m_staticTextLabelElapsedTime = new wxStaticText( m_panelProgress, wxID_ANY, _("Time elapsed:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextLabelElapsedTime->Wrap( -1 );
-	m_staticTextLabelElapsedTime->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
-	
-	fgSizer10->Add( m_staticTextLabelElapsedTime, 0, wxALIGN_BOTTOM, 5 );
-	
-	m_staticTextTimeElapsed = new wxStaticText( m_panelProgress, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextTimeElapsed->Wrap( -1 );
-	m_staticTextTimeElapsed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	fgSizer10->Add( m_staticTextTimeElapsed, 0, wxALIGN_BOTTOM, 5 );
-	
-	
-	bSizer171->Add( fgSizer10, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer171->Add( 10, 0, 0, 0, 5 );
-	
-	m_panelGraph = new zen::Graph2D( m_panelProgress, wxID_ANY, wxDefaultPosition, wxSize( 340,150 ), wxTAB_TRAVERSAL );
-	m_panelGraph->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	bSizer171->Add( m_panelGraph, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	
-	bSizer173->Add( bSizer171, 1, wxEXPAND, 5 );
-	
-	
-	m_panelProgress->SetSizer( bSizer173 );
-	m_panelProgress->Layout();
-	bSizer173->Fit( m_panelProgress );
-	bSizerTop->Add( m_panelProgress, 1, wxEXPAND, 5 );
-	
-	bSizerFinalStat = new wxBoxSizer( wxVERTICAL );
-	
-	m_listbookResult = new wxListbook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLB_TOP );
-	wxSize m_listbookResultImageSize = wxSize( 180,1 );
-	int m_listbookResultIndex = 0;
-	wxImageList* m_listbookResultImages = new wxImageList( m_listbookResultImageSize.GetWidth(), m_listbookResultImageSize.GetHeight() );
-	m_listbookResult->AssignImageList( m_listbookResultImages );
-	wxBitmap m_listbookResultBitmap;
-	wxImage m_listbookResultImage;
-	
-	bSizerFinalStat->Add( m_listbookResult, 1, wxEXPAND, 5 );
-	
-	
-	bSizerTop->Add( bSizerFinalStat, 1, wxEXPAND, 5 );
-	
-	m_staticline12 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizerTop->Add( m_staticline12, 0, wxEXPAND, 5 );
-	
-	m_panelFooter = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panelFooter->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-	
-	wxBoxSizer* bSizer182;
-	bSizer182 = new wxBoxSizer( wxVERTICAL );
-	
-	bSizerExecFinished = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText87 = new wxStaticText( m_panelFooter, wxID_ANY, _("On completion"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText87->Wrap( -1 );
-	m_staticText87->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizerExecFinished->Add( m_staticText87, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_comboBoxExecFinished = new ExecFinishedBox( m_panelFooter, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
-	bSizerExecFinished->Add( m_comboBoxExecFinished, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer182->Add( bSizerExecFinished, 0, wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	bSizer28 = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizer28->Add( 0, 0, 1, 0, 5 );
-	
-	m_buttonOK = new wxButton( m_panelFooter, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_buttonOK->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
-	m_buttonOK->Enable( false );
-	
-	bSizer28->Add( m_buttonOK, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
-	
-	m_buttonPause = new wxButton( m_panelFooter, wxID_ANY, _("&Pause"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_buttonPause->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer28->Add( m_buttonPause, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
-	
-	m_buttonAbort = new wxButton( m_panelFooter, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_buttonAbort->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer28->Add( m_buttonAbort, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	
-	bSizer28->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	bSizer182->Add( bSizer28, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	m_panelFooter->SetSizer( bSizer182 );
-	m_panelFooter->Layout();
-	bSizer182->Fit( m_panelFooter );
-	bSizerTop->Add( m_panelFooter, 0, wxEXPAND, 5 );
-	
-	
-	this->SetSizer( bSizerTop );
-	this->Layout();
-	bSizerTop->Fit( this );
-	
-	this->Centre( wxBOTH );
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SyncProgressDlgGenerated::OnClose ) );
-	this->Connect( wxEVT_ICONIZE, wxIconizeEventHandler( SyncProgressDlgGenerated::OnIconize ) );
-	m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncProgressDlgGenerated::OnOkay ), NULL, this );
-	m_buttonPause->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncProgressDlgGenerated::OnPause ), NULL, this );
-	m_buttonAbort->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncProgressDlgGenerated::OnAbort ), NULL, this );
+    this->SetSizeHints( wxSize( 470,260 ), wxDefaultSize );
+    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+    bSizerRoot = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer42;
+    bSizer42 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapStatus = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 32,32 ), 0 );
+    bSizer42->Add( m_bitmapStatus, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    m_staticTextPhase = new wxStaticText( this, wxID_ANY, _("Synchronizing..."), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextPhase->Wrap( -1 );
+    m_staticTextPhase->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer42->Add( m_staticTextPhase, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
+
+    m_animationControl1 = new wxAnimationCtrl( this, wxID_ANY, wxNullAnimation, wxDefaultPosition, wxDefaultSize, wxAC_DEFAULT_STYLE );
+    m_animationControl1->SetMinSize( wxSize( 45,45 ) );
+
+    bSizer42->Add( m_animationControl1, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+
+
+    bSizerRoot->Add( bSizer42, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 5 );
+
+    m_staticlineHeader = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizerRoot->Add( m_staticlineHeader, 0, wxEXPAND, 5 );
+
+    m_panelProgress = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panelProgress->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    wxBoxSizer* bSizer173;
+    bSizer173 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticTextStatus = new wxStaticText( m_panelProgress, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextStatus->Wrap( -1 );
+    bSizer173->Add( m_staticTextStatus, 0, wxALL|wxEXPAND, 5 );
+
+    m_gauge1 = new wxGauge( m_panelProgress, wxID_ANY, 100, wxDefaultPosition, wxSize( -1,14 ), wxGA_HORIZONTAL );
+    bSizer173->Add( m_gauge1, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
+
+
+    bSizer173->Add( 0, 10, 0, 0, 5 );
+
+    bSizer171 = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizer171->Add( 10, 0, 0, 0, 5 );
+
+    wxFlexGridSizer* fgSizer10;
+    fgSizer10 = new wxFlexGridSizer( 0, 2, 2, 5 );
+    fgSizer10->SetFlexibleDirection( wxBOTH );
+    fgSizer10->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    m_staticTextLabelItemsProc = new wxStaticText( m_panelProgress, wxID_ANY, _("Items processed:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextLabelItemsProc->Wrap( -1 );
+    fgSizer10->Add( m_staticTextLabelItemsProc, 0, wxALIGN_BOTTOM, 5 );
+
+    bSizerItemsProc = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticTextProcessedObj = new wxStaticText( m_panelProgress, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+    m_staticTextProcessedObj->Wrap( -1 );
+    m_staticTextProcessedObj->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizerItemsProc->Add( m_staticTextProcessedObj, 0, wxALIGN_BOTTOM, 5 );
+
+    m_staticTextDataProcessed = new wxStaticText( m_panelProgress, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextDataProcessed->Wrap( -1 );
+    bSizerItemsProc->Add( m_staticTextDataProcessed, 0, wxALIGN_BOTTOM|wxLEFT, 5 );
+
+
+    fgSizer10->Add( bSizerItemsProc, 0, wxALIGN_BOTTOM, 5 );
+
+    m_staticTextLabelItemsRem = new wxStaticText( m_panelProgress, wxID_ANY, _("Items remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextLabelItemsRem->Wrap( -1 );
+    fgSizer10->Add( m_staticTextLabelItemsRem, 0, wxALIGN_BOTTOM, 5 );
+
+    bSizerItemsRem = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticTextRemainingObj = new wxStaticText( m_panelProgress, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+    m_staticTextRemainingObj->Wrap( -1 );
+    m_staticTextRemainingObj->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizerItemsRem->Add( m_staticTextRemainingObj, 0, wxALIGN_BOTTOM, 5 );
+
+    m_staticTextDataRemaining = new wxStaticText( m_panelProgress, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextDataRemaining->Wrap( -1 );
+    bSizerItemsRem->Add( m_staticTextDataRemaining, 0, wxALIGN_BOTTOM|wxLEFT, 5 );
+
+
+    fgSizer10->Add( bSizerItemsRem, 0, wxALIGN_BOTTOM, 5 );
+
+    m_staticText84 = new wxStaticText( m_panelProgress, wxID_ANY, _("Speed:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText84->Wrap( -1 );
+    fgSizer10->Add( m_staticText84, 0, wxALIGN_BOTTOM, 5 );
+
+    m_staticTextSpeed = new wxStaticText( m_panelProgress, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextSpeed->Wrap( -1 );
+    m_staticTextSpeed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    fgSizer10->Add( m_staticTextSpeed, 0, wxALIGN_BOTTOM, 5 );
+
+    m_staticTextLabelRemTime = new wxStaticText( m_panelProgress, wxID_ANY, _("Time remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextLabelRemTime->Wrap( -1 );
+    fgSizer10->Add( m_staticTextLabelRemTime, 0, wxALIGN_BOTTOM, 5 );
+
+    m_staticTextRemTime = new wxStaticText( m_panelProgress, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextRemTime->Wrap( -1 );
+    m_staticTextRemTime->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    fgSizer10->Add( m_staticTextRemTime, 0, wxALIGN_BOTTOM, 5 );
+
+    m_staticTextLabelElapsedTime = new wxStaticText( m_panelProgress, wxID_ANY, _("Time elapsed:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextLabelElapsedTime->Wrap( -1 );
+    fgSizer10->Add( m_staticTextLabelElapsedTime, 0, wxALIGN_BOTTOM, 5 );
+
+    m_staticTextTimeElapsed = new wxStaticText( m_panelProgress, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextTimeElapsed->Wrap( -1 );
+    m_staticTextTimeElapsed->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    fgSizer10->Add( m_staticTextTimeElapsed, 0, wxALIGN_BOTTOM, 5 );
+
+
+    bSizer171->Add( fgSizer10, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer171->Add( 10, 0, 0, 0, 5 );
+
+    m_panelGraph = new zen::Graph2D( m_panelProgress, wxID_ANY, wxDefaultPosition, wxSize( 340,150 ), wxTAB_TRAVERSAL );
+    m_panelGraph->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    bSizer171->Add( m_panelGraph, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+
+    bSizer173->Add( bSizer171, 1, wxEXPAND, 5 );
+
+
+    m_panelProgress->SetSizer( bSizer173 );
+    m_panelProgress->Layout();
+    bSizer173->Fit( m_panelProgress );
+    bSizerRoot->Add( m_panelProgress, 1, wxEXPAND, 5 );
+
+    m_listbookResult = new wxListbook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLB_TOP );
+    wxSize m_listbookResultImageSize = wxSize( 180,1 );
+    int m_listbookResultIndex = 0;
+    wxImageList* m_listbookResultImages = new wxImageList( m_listbookResultImageSize.GetWidth(), m_listbookResultImageSize.GetHeight() );
+    m_listbookResult->AssignImageList( m_listbookResultImages );
+    wxBitmap m_listbookResultBitmap;
+    wxImage m_listbookResultImage;
+    m_listbookResult->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+
+    bSizerRoot->Add( m_listbookResult, 1, wxEXPAND, 5 );
+
+    m_staticline12 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizerRoot->Add( m_staticline12, 0, wxEXPAND, 5 );
+
+    bSizerExecFinished = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText87 = new wxStaticText( this, wxID_ANY, _("On completion"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText87->Wrap( -1 );
+    bSizerExecFinished->Add( m_staticText87, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    m_comboBoxExecFinished = new ExecFinishedBox( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+    bSizerExecFinished->Add( m_comboBoxExecFinished, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerRoot->Add( bSizerExecFinished, 0, wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+    bSizer28 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_buttonClose = new wxButton( this, wxID_OK, _("Close"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_buttonClose->SetDefault();
+    m_buttonClose->Enable( false );
+
+    bSizer28->Add( m_buttonClose, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+    m_buttonPause = new wxButton( this, wxID_ANY, _("&Pause"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    bSizer28->Add( m_buttonPause, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+    m_buttonAbort = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    bSizer28->Add( m_buttonAbort, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+
+    bSizerRoot->Add( bSizer28, 0, wxALIGN_RIGHT, 5 );
+
+
+    this->SetSizer( bSizerRoot );
+    this->Layout();
+    bSizerRoot->Fit( this );
+
+    this->Centre( wxBOTH );
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SyncProgressDlgGenerated::OnCloseBtn ) );
+    this->Connect( wxEVT_ICONIZE, wxIconizeEventHandler( SyncProgressDlgGenerated::OnIconize ) );
+    m_buttonClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncProgressDlgGenerated::OnOkay ), NULL, this );
+    m_buttonPause->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncProgressDlgGenerated::OnPause ), NULL, this );
+    m_buttonAbort->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncProgressDlgGenerated::OnAbort ), NULL, this );
 }
 
 SyncProgressDlgGenerated::~SyncProgressDlgGenerated()
 {
-	// Disconnect Events
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SyncProgressDlgGenerated::OnClose ) );
-	this->Disconnect( wxEVT_ICONIZE, wxIconizeEventHandler( SyncProgressDlgGenerated::OnIconize ) );
-	m_buttonOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncProgressDlgGenerated::OnOkay ), NULL, this );
-	m_buttonPause->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncProgressDlgGenerated::OnPause ), NULL, this );
-	m_buttonAbort->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncProgressDlgGenerated::OnAbort ), NULL, this );
-	
+    // Disconnect Events
+    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SyncProgressDlgGenerated::OnCloseBtn ) );
+    this->Disconnect( wxEVT_ICONIZE, wxIconizeEventHandler( SyncProgressDlgGenerated::OnIconize ) );
+    m_buttonClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncProgressDlgGenerated::OnOkay ), NULL, this );
+    m_buttonPause->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncProgressDlgGenerated::OnPause ), NULL, this );
+    m_buttonAbort->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncProgressDlgGenerated::OnAbort ), NULL, this );
+
 }
 
 BatchDlgGenerated::BatchDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-	this->SetSizeHints( wxSize( 400,260 ), wxDefaultSize );
-	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	wxBoxSizer* bSizer54;
-	bSizer54 = new wxBoxSizer( wxVERTICAL );
-	
-	m_panelHeader = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panelHeader->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-	
-	wxBoxSizer* bSizer72;
-	bSizer72 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapBatchJob = new wxStaticBitmap( m_panelHeader, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	bSizer72->Add( m_bitmapBatchJob, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	m_staticTextHeader = new wxStaticText( m_panelHeader, wxID_ANY, _("Batch job"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextHeader->Wrap( -1 );
-	m_staticTextHeader->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer72->Add( m_staticTextHeader, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_staticText44 = new wxStaticText( m_panelHeader, wxID_ANY, _("Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText44->Wrap( 480 );
-	bSizer72->Add( m_staticText44, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-	
-	
-	bSizer72->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_bpButtonHelp = new wxBitmapButton( m_panelHeader, wxID_HELP, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	m_bpButtonHelp->SetToolTip( _("Help") );
-	
-	bSizer72->Add( m_bpButtonHelp, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	m_panelHeader->SetSizer( bSizer72 );
-	m_panelHeader->Layout();
-	bSizer72->Fit( m_panelHeader );
-	bSizer54->Add( m_panelHeader, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	m_staticline18 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer54->Add( m_staticline18, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer172;
-	bSizer172 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer180;
-	bSizer180 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer171;
-	bSizer171 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText82 = new wxStaticText( this, wxID_ANY, _("Error handling"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText82->Wrap( -1 );
-	bSizer171->Add( m_staticText82, 0, wxBOTTOM, 5 );
-	
-	wxBoxSizer* bSizer169;
-	bSizer169 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_toggleBtnErrorIgnore = new wxToggleButton( this, wxID_ANY, _("Ignore"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_toggleBtnErrorIgnore->SetToolTip( _("Hide all error and warning messages") );
-	
-	bSizer169->Add( m_toggleBtnErrorIgnore, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_toggleBtnErrorPopup = new wxToggleButton( this, wxID_ANY, _("Pop-up"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_toggleBtnErrorPopup->SetToolTip( _("Show pop-up on errors or warnings") );
-	
-	bSizer169->Add( m_toggleBtnErrorPopup, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_toggleBtnErrorExit = new wxToggleButton( this, wxID_ANY, _("Exit"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_toggleBtnErrorExit->SetToolTip( _("Abort synchronization on first error") );
-	
-	bSizer169->Add( m_toggleBtnErrorExit, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer171->Add( bSizer169, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer180->Add( bSizer171, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	m_staticline26 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-	bSizer180->Add( m_staticline26, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer170;
-	bSizer170 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText81 = new wxStaticText( this, wxID_ANY, _("On completion"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText81->Wrap( -1 );
-	bSizer170->Add( m_staticText81, 0, wxBOTTOM, 5 );
-	
-	m_comboBoxExecFinished = new ExecFinishedBox( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
-	bSizer170->Add( m_comboBoxExecFinished, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	
-	bSizer180->Add( bSizer170, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	
-	bSizer172->Add( bSizer180, 0, wxEXPAND, 5 );
-	
-	m_staticline25 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer172->Add( m_staticline25, 0, wxEXPAND, 5 );
-	
-	m_checkBoxShowProgress = new wxCheckBox( this, wxID_ANY, _("Show progress dialog"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer172->Add( m_checkBoxShowProgress, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 );
-	
-	m_checkBoxGenerateLogfile = new wxCheckBox( this, wxID_ANY, _("Save log"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer172->Add( m_checkBoxGenerateLogfile, 0, wxEXPAND|wxALL, 5 );
-	
-	m_panelLogfile = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer1721;
-	bSizer1721 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_comboBoxLogfileDir = new FolderHistoryBox( m_panelLogfile, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
-	bSizer1721->Add( m_comboBoxLogfileDir, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_buttonSelectLogfileDir = new wxButton( m_panelLogfile, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_buttonSelectLogfileDir->SetToolTip( _("Select folder to save log files") );
-	
-	bSizer1721->Add( m_buttonSelectLogfileDir, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_checkBoxLogfilesLimit = new wxCheckBox( m_panelLogfile, wxID_ANY, _("Limit"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_checkBoxLogfilesLimit->SetToolTip( _("Limit maximum number of log files") );
-	
-	bSizer1721->Add( m_checkBoxLogfilesLimit, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_spinCtrlLogfileLimit = new wxSpinCtrl( m_panelLogfile, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 60,-1 ), wxSP_ARROW_KEYS, 1, 2000000000, 1 );
-	m_spinCtrlLogfileLimit->SetToolTip( _("Limit maximum number of log files") );
-	
-	bSizer1721->Add( m_spinCtrlLogfileLimit, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	m_panelLogfile->SetSizer( bSizer1721 );
-	m_panelLogfile->Layout();
-	bSizer1721->Fit( m_panelLogfile );
-	bSizer172->Add( m_panelLogfile, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	
-	bSizer54->Add( bSizer172, 1, wxEXPAND, 10 );
-	
-	m_staticline13 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer54->Add( m_staticline13, 0, wxEXPAND, 5 );
-	
-	m_panel35 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panel35->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-	
-	wxBoxSizer* bSizer68;
-	bSizer68 = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizer68->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_buttonSave = new wxButton( m_panel35, wxID_SAVE, _("Save &as..."), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_buttonSave->SetDefault(); 
-	m_buttonSave->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer68->Add( m_buttonSave, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
-	
-	m_button6 = new wxButton( m_panel35, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_button6->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer68->Add( m_button6, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	
-	bSizer68->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	m_panel35->SetSizer( bSizer68 );
-	m_panel35->Layout();
-	bSizer68->Fit( m_panel35 );
-	bSizer54->Add( m_panel35, 0, wxALIGN_CENTER_HORIZONTAL|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_toggleBtnErrorIgnore->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnErrorIgnore ), NULL, this );
-	m_toggleBtnErrorPopup->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnErrorPopup ), NULL, this );
-	m_toggleBtnErrorExit->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnErrorExit ), NULL, this );
-	m_checkBoxGenerateLogfile->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnToggleGenerateLogfile ), NULL, this );
-	m_checkBoxLogfilesLimit->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnToggleLogfilesLimit ), NULL, this );
-	m_buttonSave->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnSaveBatchJob ), NULL, this );
-	m_button6->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnCancel ), NULL, this );
+    this->SetSizeHints( wxSize( 400,260 ), wxDefaultSize );
+    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+    wxBoxSizer* bSizer54;
+    bSizer54 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer72;
+    bSizer72 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapBatchJob = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+    bSizer72->Add( m_bitmapBatchJob, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    m_staticTextHeader = new wxStaticText( this, wxID_ANY, _("Batch job"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextHeader->Wrap( -1 );
+    m_staticTextHeader->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer72->Add( m_staticTextHeader, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    m_staticText44 = new wxStaticText( this, wxID_ANY, _("Create a batch file to automate synchronization. Double-click this file or schedule in your system's task planner: FreeFileSync.exe <job name>.ffs_batch"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText44->Wrap( 520 );
+    bSizer72->Add( m_staticText44, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+
+
+    bSizer72->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_bpButtonHelp = new wxBitmapButton( this, wxID_HELP, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
+    m_bpButtonHelp->SetToolTip( _("Help") );
+
+    bSizer72->Add( m_bpButtonHelp, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer54->Add( bSizer72, 0, wxEXPAND, 5 );
+
+    m_staticline18 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer54->Add( m_staticline18, 0, wxEXPAND, 5 );
+
+    m_panel35 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panel35->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    wxBoxSizer* bSizer172;
+    bSizer172 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer180;
+    bSizer180 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer171;
+    bSizer171 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText82 = new wxStaticText( m_panel35, wxID_ANY, _("Error handling"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText82->Wrap( -1 );
+    bSizer171->Add( m_staticText82, 0, wxBOTTOM, 5 );
+
+    wxBoxSizer* bSizer169;
+    bSizer169 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_toggleBtnErrorIgnore = new wxToggleButton( m_panel35, wxID_ANY, _("Ignore"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_toggleBtnErrorIgnore->SetToolTip( _("Hide all error and warning messages") );
+
+    bSizer169->Add( m_toggleBtnErrorIgnore, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_toggleBtnErrorPopup = new wxToggleButton( m_panel35, wxID_ANY, _("Pop-up"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_toggleBtnErrorPopup->SetToolTip( _("Show pop-up on errors or warnings") );
+
+    bSizer169->Add( m_toggleBtnErrorPopup, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    m_toggleBtnErrorExit = new wxToggleButton( m_panel35, wxID_ANY, _("Exit"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_toggleBtnErrorExit->SetToolTip( _("Abort synchronization on first error") );
+
+    bSizer169->Add( m_toggleBtnErrorExit, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer171->Add( bSizer169, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer180->Add( bSizer171, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    m_staticline26 = new wxStaticLine( m_panel35, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    bSizer180->Add( m_staticline26, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer170;
+    bSizer170 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText81 = new wxStaticText( m_panel35, wxID_ANY, _("On completion"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText81->Wrap( -1 );
+    bSizer170->Add( m_staticText81, 0, wxBOTTOM, 5 );
+
+    m_comboBoxExecFinished = new ExecFinishedBox( m_panel35, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+    bSizer170->Add( m_comboBoxExecFinished, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+
+    bSizer180->Add( bSizer170, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+
+    bSizer172->Add( bSizer180, 0, wxEXPAND, 5 );
+
+    m_staticline25 = new wxStaticLine( m_panel35, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer172->Add( m_staticline25, 0, wxEXPAND, 5 );
+
+    m_checkBoxShowProgress = new wxCheckBox( m_panel35, wxID_ANY, _("Show progress dialog"), wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer172->Add( m_checkBoxShowProgress, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 );
+
+    m_checkBoxGenerateLogfile = new wxCheckBox( m_panel35, wxID_ANY, _("Save log"), wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer172->Add( m_checkBoxGenerateLogfile, 0, wxEXPAND|wxALL, 5 );
+
+    m_panelLogfile = new wxPanel( m_panel35, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer1721;
+    bSizer1721 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_logfileDir = new FolderHistoryBox( m_panelLogfile, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+    bSizer1721->Add( m_logfileDir, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_buttonSelectLogfileDir = new wxButton( m_panelLogfile, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonSelectLogfileDir->SetToolTip( _("Select folder to save log files") );
+
+    bSizer1721->Add( m_buttonSelectLogfileDir, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_checkBoxLogfilesLimit = new wxCheckBox( m_panelLogfile, wxID_ANY, _("Limit"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_checkBoxLogfilesLimit->SetToolTip( _("Limit maximum number of log files") );
+
+    bSizer1721->Add( m_checkBoxLogfilesLimit, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_spinCtrlLogfileLimit = new wxSpinCtrl( m_panelLogfile, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 60,-1 ), wxSP_ARROW_KEYS, 1, 2000000000, 1 );
+    m_spinCtrlLogfileLimit->SetToolTip( _("Limit maximum number of log files") );
+
+    bSizer1721->Add( m_spinCtrlLogfileLimit, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    m_panelLogfile->SetSizer( bSizer1721 );
+    m_panelLogfile->Layout();
+    bSizer1721->Fit( m_panelLogfile );
+    bSizer172->Add( m_panelLogfile, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+
+    m_panel35->SetSizer( bSizer172 );
+    m_panel35->Layout();
+    bSizer172->Fit( m_panel35 );
+    bSizer54->Add( m_panel35, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+    m_staticline13 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer54->Add( m_staticline13, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer68;
+    bSizer68 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_buttonSave = new wxButton( this, wxID_SAVE, _("Save &as..."), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_buttonSave->SetDefault();
+    m_buttonSave->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer68->Add( m_buttonSave, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+    m_button6 = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    bSizer68->Add( m_button6, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+
+    bSizer54->Add( bSizer68, 0, wxALIGN_RIGHT, 5 );
+
+
+    this->SetSizer( bSizer54 );
+    this->Layout();
+    bSizer54->Fit( this );
+
+    this->Centre( wxBOTH );
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( BatchDlgGenerated::OnClose ) );
+    m_bpButtonHelp->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnHelp ), NULL, this );
+    m_toggleBtnErrorIgnore->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnErrorIgnore ), NULL, this );
+    m_toggleBtnErrorPopup->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnErrorPopup ), NULL, this );
+    m_toggleBtnErrorExit->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnErrorExit ), NULL, this );
+    m_checkBoxGenerateLogfile->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnToggleGenerateLogfile ), NULL, this );
+    m_checkBoxLogfilesLimit->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnToggleLogfilesLimit ), NULL, this );
+    m_buttonSave->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnSaveBatchJob ), 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_toggleBtnErrorIgnore->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnErrorIgnore ), NULL, this );
-	m_toggleBtnErrorPopup->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnErrorPopup ), NULL, this );
-	m_toggleBtnErrorExit->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnErrorExit ), NULL, this );
-	m_checkBoxGenerateLogfile->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnToggleGenerateLogfile ), NULL, this );
-	m_checkBoxLogfilesLimit->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnToggleLogfilesLimit ), NULL, this );
-	m_buttonSave->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnSaveBatchJob ), 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_toggleBtnErrorIgnore->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnErrorIgnore ), NULL, this );
+    m_toggleBtnErrorPopup->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnErrorPopup ), NULL, this );
+    m_toggleBtnErrorExit->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnErrorExit ), NULL, this );
+    m_checkBoxGenerateLogfile->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnToggleGenerateLogfile ), NULL, this );
+    m_checkBoxLogfilesLimit->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnToggleLogfilesLimit ), NULL, this );
+    m_buttonSave->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnSaveBatchJob ), NULL, this );
+    m_button6->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnCancel ), 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 );
-	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	wxBoxSizer* bSizer136;
-	bSizer136 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText91 = new wxStaticText( this, wxID_ANY, _("Select variant"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText91->Wrap( -1 );
-	bSizer136->Add( m_staticText91, 0, wxALL, 5 );
-	
-	wxFlexGridSizer* fgSizer16;
-	fgSizer16 = new wxFlexGridSizer( 2, 2, 8, 5 );
-	fgSizer16->SetFlexibleDirection( wxBOTH );
-	fgSizer16->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	m_bitmapByTime = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_bitmapByTime->SetToolTip( _("Files are found equal if\n     - last write time and date\n     - file size\nare the same") );
-	
-	fgSizer16->Add( m_bitmapByTime, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_toggleBtnTimeSize = new wxToggleButton( this, wxID_ANY, _("File time and size"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_toggleBtnTimeSize->SetValue( true ); 
-	m_toggleBtnTimeSize->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	m_toggleBtnTimeSize->SetToolTip( _("Files are found equal if\n     - last write time and date\n     - file size\nare the same") );
-	
-	fgSizer16->Add( m_toggleBtnTimeSize, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 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_toggleBtnContent = new wxToggleButton( this, wxID_ANY, _("File content"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_toggleBtnContent->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	m_toggleBtnContent->SetToolTip( _("Files are found equal if\n     - file content\nis the same") );
-	
-	fgSizer16->Add( m_toggleBtnContent, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	
-	bSizer136->Add( fgSizer16, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	m_staticline33 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer136->Add( m_staticline33, 0, wxEXPAND, 5 );
-	
-	m_staticText92 = new wxStaticText( this, wxID_ANY, _("Symbolic Link handling"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText92->Wrap( -1 );
-	bSizer136->Add( m_staticText92, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-	
-	wxBoxSizer* bSizer177;
-	bSizer177 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxArrayString m_choiceHandleSymlinksChoices;
-	m_choiceHandleSymlinks = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceHandleSymlinksChoices, 0 );
-	m_choiceHandleSymlinks->SetSelection( -1 );
-	bSizer177->Add( m_choiceHandleSymlinks, 1, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonHelp = new wxBitmapButton( this, wxID_HELP, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	m_bpButtonHelp->SetToolTip( _("Help") );
-	
-	bSizer177->Add( m_bpButtonHelp, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer136->Add( bSizer177, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	m_staticline14 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer136->Add( m_staticline14, 0, wxEXPAND, 5 );
-	
-	m_panel36 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panel36->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-	
-	wxBoxSizer* bSizer22;
-	bSizer22 = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizer22->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_button10 = new wxButton( m_panel36, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_button10->SetDefault(); 
-	m_button10->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer22->Add( m_button10, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
-	
-	m_button6 = new wxButton( m_panel36, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_button6->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer22->Add( m_button6, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer22->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	m_panel36->SetSizer( bSizer22 );
-	m_panel36->Layout();
-	bSizer22->Fit( m_panel36 );
-	bSizer136->Add( m_panel36, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	this->SetSizer( bSizer136 );
-	this->Layout();
-	bSizer136->Fit( this );
-	
-	this->Centre( wxBOTH );
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CmpCfgDlgGenerated::OnClose ) );
-	m_toggleBtnTimeSize->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( CmpCfgDlgGenerated::OnTimeSizeDouble ), NULL, this );
-	m_toggleBtnTimeSize->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnTimeSize ), NULL, this );
-	m_toggleBtnContent->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( CmpCfgDlgGenerated::OnContentDouble ), NULL, this );
-	m_toggleBtnContent->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnContent ), NULL, this );
-	m_choiceHandleSymlinks->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( CmpCfgDlgGenerated::OnChangeErrorHandling ), NULL, this );
-	m_bpButtonHelp->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnShowHelp ), NULL, this );
-	m_button10->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnOkay ), NULL, this );
-	m_button6->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnCancel ), NULL, this );
+    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+    wxBoxSizer* bSizer136;
+    bSizer136 = new wxBoxSizer( wxVERTICAL );
+
+    m_panel36 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panel36->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    wxBoxSizer* bSizer159;
+    bSizer159 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText91 = new wxStaticText( m_panel36, wxID_ANY, _("Select variant"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText91->Wrap( -1 );
+    bSizer159->Add( m_staticText91, 0, wxALL, 5 );
+
+    wxFlexGridSizer* fgSizer16;
+    fgSizer16 = new wxFlexGridSizer( 2, 2, 8, 5 );
+    fgSizer16->SetFlexibleDirection( wxBOTH );
+    fgSizer16->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    m_bitmapByTime = new wxStaticBitmap( m_panel36, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    m_bitmapByTime->SetToolTip( _("Files are found equal if\n     - last write time and date\n     - file size\nare the same") );
+
+    fgSizer16->Add( m_bitmapByTime, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_toggleBtnTimeSize = new wxToggleButton( m_panel36, wxID_ANY, _("File time and size"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+    m_toggleBtnTimeSize->SetValue( true );
+    m_toggleBtnTimeSize->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+    m_toggleBtnTimeSize->SetToolTip( _("Files are found equal if\n     - last write time and date\n     - file size\nare the same") );
+
+    fgSizer16->Add( m_toggleBtnTimeSize, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    m_bitmapByContent = new wxStaticBitmap( m_panel36, 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_toggleBtnContent = new wxToggleButton( m_panel36, wxID_ANY, _("File content"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+    m_toggleBtnContent->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+    m_toggleBtnContent->SetToolTip( _("Files are found equal if\n     - file content\nis the same") );
+
+    fgSizer16->Add( m_toggleBtnContent, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+
+    bSizer159->Add( fgSizer16, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_staticline33 = new wxStaticLine( m_panel36, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer159->Add( m_staticline33, 0, wxEXPAND, 5 );
+
+    m_staticText92 = new wxStaticText( m_panel36, wxID_ANY, _("Symbolic Link handling"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText92->Wrap( -1 );
+    bSizer159->Add( m_staticText92, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+
+    wxBoxSizer* bSizer177;
+    bSizer177 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxArrayString m_choiceHandleSymlinksChoices;
+    m_choiceHandleSymlinks = new wxChoice( m_panel36, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceHandleSymlinksChoices, 0 );
+    m_choiceHandleSymlinks->SetSelection( -1 );
+    bSizer177->Add( m_choiceHandleSymlinks, 1, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonHelp = new wxBitmapButton( m_panel36, wxID_HELP, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
+    m_bpButtonHelp->SetToolTip( _("Help") );
+
+    bSizer177->Add( m_bpButtonHelp, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer159->Add( bSizer177, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+
+
+    m_panel36->SetSizer( bSizer159 );
+    m_panel36->Layout();
+    bSizer159->Fit( m_panel36 );
+    bSizer136->Add( m_panel36, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+    m_staticline14 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer136->Add( m_staticline14, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer22;
+    bSizer22 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_buttonOkay->SetDefault();
+    m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer22->Add( m_buttonOkay, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+    m_button6 = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    bSizer22->Add( m_button6, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer136->Add( bSizer22, 0, wxALIGN_RIGHT, 5 );
+
+
+    this->SetSizer( bSizer136 );
+    this->Layout();
+    bSizer136->Fit( this );
+
+    this->Centre( wxBOTH );
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CmpCfgDlgGenerated::OnClose ) );
+    m_toggleBtnTimeSize->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( CmpCfgDlgGenerated::OnTimeSizeDouble ), NULL, this );
+    m_toggleBtnTimeSize->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnTimeSize ), NULL, this );
+    m_toggleBtnContent->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( CmpCfgDlgGenerated::OnContentDouble ), NULL, this );
+    m_toggleBtnContent->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnContent ), NULL, this );
+    m_choiceHandleSymlinks->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( CmpCfgDlgGenerated::OnChangeErrorHandling ), NULL, this );
+    m_bpButtonHelp->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnShowHelp ), NULL, this );
+    m_buttonOkay->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_toggleBtnTimeSize->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( CmpCfgDlgGenerated::OnTimeSizeDouble ), NULL, this );
-	m_toggleBtnTimeSize->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnTimeSize ), NULL, this );
-	m_toggleBtnContent->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( CmpCfgDlgGenerated::OnContentDouble ), NULL, this );
-	m_toggleBtnContent->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnContent ), NULL, this );
-	m_choiceHandleSymlinks->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( CmpCfgDlgGenerated::OnChangeErrorHandling ), NULL, this );
-	m_bpButtonHelp->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnShowHelp ), NULL, this );
-	m_button10->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnOkay ), NULL, this );
-	m_button6->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnCancel ), NULL, this );
-	
+    // Disconnect Events
+    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CmpCfgDlgGenerated::OnClose ) );
+    m_toggleBtnTimeSize->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( CmpCfgDlgGenerated::OnTimeSizeDouble ), NULL, this );
+    m_toggleBtnTimeSize->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnTimeSize ), NULL, this );
+    m_toggleBtnContent->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( CmpCfgDlgGenerated::OnContentDouble ), NULL, this );
+    m_toggleBtnContent->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnContent ), NULL, this );
+    m_choiceHandleSymlinks->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( CmpCfgDlgGenerated::OnChangeErrorHandling ), NULL, this );
+    m_bpButtonHelp->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnShowHelp ), NULL, this );
+    m_buttonOkay->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnOkay ), NULL, this );
+    m_button6->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnCancel ), NULL, this );
+
 }
 
 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 );
-	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	wxBoxSizer* bSizer7;
-	bSizer7 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer181;
-	bSizer181 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer29;
-	bSizer29 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText86 = new wxStaticText( this, wxID_ANY, _("Select variant"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText86->Wrap( -1 );
-	bSizer29->Add( m_staticText86, 0, wxALL, 5 );
-	
-	wxFlexGridSizer* fgSizer1;
-	fgSizer1 = new wxFlexGridSizer( 4, 2, 6, 8 );
-	fgSizer1->SetFlexibleDirection( wxHORIZONTAL );
-	fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	m_toggleBtnAutomatic = new wxToggleButton( this, wxID_ANY, _("<- Two way ->"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_toggleBtnAutomatic->SetValue( true ); 
-	m_toggleBtnAutomatic->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	fgSizer1->Add( m_toggleBtnAutomatic, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	m_staticTextAutomatic = new wxStaticText( this, wxID_ANY, _("Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextAutomatic->Wrap( 450 );
-	fgSizer1->Add( m_staticTextAutomatic, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_toggleBtnMirror = new wxToggleButton( this, wxID_ANY, _("Mirror ->>"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_toggleBtnMirror->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	fgSizer1->Add( m_toggleBtnMirror, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	m_staticTextMirror = new wxStaticText( this, wxID_ANY, _("Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextMirror->Wrap( 450 );
-	fgSizer1->Add( m_staticTextMirror, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_toggleBtnUpdate = new wxToggleButton( this, wxID_ANY, _("Update ->"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_toggleBtnUpdate->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	fgSizer1->Add( m_toggleBtnUpdate, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	m_staticTextUpdate = new wxStaticText( this, wxID_ANY, _("Copy new or updated files to right folder."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextUpdate->Wrap( 450 );
-	fgSizer1->Add( m_staticTextUpdate, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_toggleBtnCustom = new wxToggleButton( this, wxID_ANY, _("Custom"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_toggleBtnCustom->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	fgSizer1->Add( m_toggleBtnCustom, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	m_staticTextCustom = new wxStaticText( this, wxID_ANY, _("Configure your own synchronization rules."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextCustom->Wrap( 450 );
-	fgSizer1->Add( m_staticTextCustom, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer29->Add( fgSizer1, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	bSizerExtraConfig = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticline321 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizerExtraConfig->Add( m_staticline321, 0, wxEXPAND, 5 );
-	
-	bSizer179 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer174;
-	bSizer174 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText88 = new wxStaticText( this, wxID_ANY, _("Error handling"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText88->Wrap( -1 );
-	bSizer174->Add( m_staticText88, 0, wxBOTTOM, 5 );
-	
-	wxBoxSizer* bSizer175;
-	bSizer175 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_toggleBtnErrorIgnore = new wxToggleButton( this, wxID_ANY, _("Ignore"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_toggleBtnErrorIgnore->SetToolTip( _("Hide all error and warning messages") );
-	
-	bSizer175->Add( m_toggleBtnErrorIgnore, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_toggleBtnErrorPopup = new wxToggleButton( this, wxID_ANY, _("Pop-up"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_toggleBtnErrorPopup->SetToolTip( _("Show pop-up on errors or warnings") );
-	
-	bSizer175->Add( m_toggleBtnErrorPopup, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer174->Add( bSizer175, 0, 0, 5 );
-	
-	
-	bSizer179->Add( bSizer174, 0, wxALL, 5 );
-	
-	m_staticline36 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-	bSizer179->Add( m_staticline36, 0, wxEXPAND, 5 );
-	
-	bSizerOnCompletion = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText89 = new wxStaticText( this, wxID_ANY, _("On completion"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText89->Wrap( -1 );
-	bSizerOnCompletion->Add( m_staticText89, 0, wxBOTTOM, 5 );
-	
-	m_comboBoxExecFinished = new ExecFinishedBox( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
-	bSizerOnCompletion->Add( m_comboBoxExecFinished, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	
-	bSizer179->Add( bSizerOnCompletion, 1, wxALL, 5 );
-	
-	
-	bSizerExtraConfig->Add( bSizer179, 0, wxEXPAND, 5 );
-	
-	
-	bSizer29->Add( bSizerExtraConfig, 0, wxEXPAND, 5 );
-	
-	m_staticline32 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer29->Add( m_staticline32, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer158;
-	bSizer158 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText87 = new wxStaticText( this, wxID_ANY, _("Deletion handling"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText87->Wrap( -1 );
-	bSizer158->Add( m_staticText87, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
-	
-	bSizer158->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	bSizerVersioningNamingConvention = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticTextNamingCvtPart1 = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextNamingCvtPart1->Wrap( -1 );
-	m_staticTextNamingCvtPart1->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
-	
-	bSizerVersioningNamingConvention->Add( m_staticTextNamingCvtPart1, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticTextNamingCvtPart2Bold = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextNamingCvtPart2Bold->Wrap( -1 );
-	m_staticTextNamingCvtPart2Bold->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	m_staticTextNamingCvtPart2Bold->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
-	
-	bSizerVersioningNamingConvention->Add( m_staticTextNamingCvtPart2Bold, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticTextNamingCvtPart3 = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextNamingCvtPart3->Wrap( -1 );
-	m_staticTextNamingCvtPart3->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
-	
-	bSizerVersioningNamingConvention->Add( m_staticTextNamingCvtPart3, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer158->Add( bSizerVersioningNamingConvention, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-	
-	
-	bSizer29->Add( bSizer158, 0, wxEXPAND|wxTOP, 5 );
-	
-	wxBoxSizer* bSizer180;
-	bSizer180 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_toggleBtnPermanent = new wxToggleButton( this, wxID_ANY, _("Permanent"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_toggleBtnPermanent->SetToolTip( _("Delete or overwrite files permanently") );
-	
-	bSizer180->Add( m_toggleBtnPermanent, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_toggleBtnRecycler = new wxToggleButton( this, wxID_ANY, _("Recycle Bin"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_toggleBtnRecycler->SetToolTip( _("Use Recycle Bin for deleted and overwritten files") );
-	
-	bSizer180->Add( m_toggleBtnRecycler, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_toggleBtnVersioning = new wxToggleButton( this, wxID_ANY, _("Versioning"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_toggleBtnVersioning->SetToolTip( _("Move time-stamped files into specified folder") );
-	
-	bSizer180->Add( m_toggleBtnVersioning, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer180->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	bSizerVersioningStyle = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText93 = new wxStaticText( this, wxID_ANY, _("Naming convention:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText93->Wrap( -1 );
-	bSizerVersioningStyle->Add( m_staticText93, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	wxArrayString m_choiceVersioningStyleChoices;
-	m_choiceVersioningStyle = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceVersioningStyleChoices, 0 );
-	m_choiceVersioningStyle->SetSelection( 0 );
-	bSizerVersioningStyle->Add( m_choiceVersioningStyle, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer180->Add( bSizerVersioningStyle, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer29->Add( bSizer180, 0, wxEXPAND|wxALL, 5 );
-	
-	m_panelVersioning = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer156;
-	bSizer156 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer1151;
-	bSizer1151 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_versioningFolder = new FolderHistoryBox( m_panelVersioning, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
-	bSizer1151->Add( m_versioningFolder, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_buttonSelectDirVersioning = new wxButton( m_panelVersioning, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_buttonSelectDirVersioning->SetToolTip( _("Select a folder") );
-	
-	bSizer1151->Add( m_buttonSelectDirVersioning, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer156->Add( bSizer1151, 0, wxEXPAND, 5 );
-	
-	
-	m_panelVersioning->SetSizer( bSizer156 );
-	m_panelVersioning->Layout();
-	bSizer156->Fit( m_panelVersioning );
-	bSizer29->Add( m_panelVersioning, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	
-	bSizer181->Add( bSizer29, 0, wxEXPAND, 5 );
-	
-	m_staticline31 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-	bSizer181->Add( m_staticline31, 0, wxEXPAND, 5 );
-	
-	bSizerConfig = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText90 = new wxStaticText( this, wxID_ANY, _("Configuration"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText90->Wrap( -1 );
-	bSizerConfig->Add( m_staticText90, 0, wxBOTTOM, 5 );
-	
-	
-	bSizerConfig->Add( 0, 5, 0, 0, 5 );
-	
-	m_bitmapDatabase = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	bSizerConfig->Add( m_bitmapDatabase, 0, wxALIGN_CENTER_HORIZONTAL, 10 );
-	
-	sbSizerSyncDirections = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer1801;
-	bSizer1801 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticTextHeaderCategory = new wxStaticText( this, wxID_ANY, _("Category"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
-	m_staticTextHeaderCategory->Wrap( -1 );
-	m_staticTextHeaderCategory->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer1801->Add( m_staticTextHeaderCategory, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer1801->Add( 5, 0, 0, 0, 5 );
-	
-	m_staticTextHeaderAction = new wxStaticText( this, wxID_ANY, _("Action"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT );
-	m_staticTextHeaderAction->Wrap( -1 );
-	m_staticTextHeaderAction->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer1801->Add( m_staticTextHeaderAction, 1, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	sbSizerSyncDirections->Add( bSizer1801, 0, wxEXPAND, 5 );
-	
-	bSizerLeftOnly = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapLeftOnly = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
-	m_bitmapLeftOnly->SetToolTip( _("Item exists on left side only") );
-	
-	bSizerLeftOnly->Add( m_bitmapLeftOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerLeftOnly->Add( 5, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonLeftOnly = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 46,46 ), wxBU_AUTODRAW );
-	bSizerLeftOnly->Add( m_bpButtonLeftOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	sbSizerSyncDirections->Add( bSizerLeftOnly, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	bSizerRightOnly = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapRightOnly = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
-	m_bitmapRightOnly->SetToolTip( _("Item exists on right side only") );
-	
-	bSizerRightOnly->Add( m_bitmapRightOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerRightOnly->Add( 5, 0, 0, 0, 5 );
-	
-	m_bpButtonRightOnly = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 46,46 ), wxBU_AUTODRAW );
-	bSizerRightOnly->Add( m_bpButtonRightOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	sbSizerSyncDirections->Add( bSizerRightOnly, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	bSizerLeftNewer = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapLeftNewer = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
-	m_bitmapLeftNewer->SetToolTip( _("Left side is newer") );
-	
-	bSizerLeftNewer->Add( m_bitmapLeftNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerLeftNewer->Add( 5, 0, 0, 0, 5 );
-	
-	m_bpButtonLeftNewer = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 46,46 ), wxBU_AUTODRAW );
-	bSizerLeftNewer->Add( m_bpButtonLeftNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	sbSizerSyncDirections->Add( bSizerLeftNewer, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	bSizerRightNewer = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapRightNewer = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
-	m_bitmapRightNewer->SetToolTip( _("Right side is newer") );
-	
-	bSizerRightNewer->Add( m_bitmapRightNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerRightNewer->Add( 5, 0, 0, 0, 5 );
-	
-	m_bpButtonRightNewer = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 46,46 ), wxBU_AUTODRAW );
-	bSizerRightNewer->Add( m_bpButtonRightNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	sbSizerSyncDirections->Add( bSizerRightNewer, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	bSizerDifferent = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapDifferent = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
-	m_bitmapDifferent->SetToolTip( _("Items have different content") );
-	
-	bSizerDifferent->Add( m_bitmapDifferent, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerDifferent->Add( 5, 0, 0, 0, 5 );
-	
-	m_bpButtonDifferent = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 46,46 ), wxBU_AUTODRAW );
-	bSizerDifferent->Add( m_bpButtonDifferent, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	sbSizerSyncDirections->Add( bSizerDifferent, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	bSizerConflict = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapConflict = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
-	m_bitmapConflict->SetToolTip( _("Conflict/item cannot be categorized") );
-	
-	bSizerConflict->Add( m_bitmapConflict, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizerConflict->Add( 5, 0, 0, 0, 5 );
-	
-	m_bpButtonConflict = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 46,46 ), wxBU_AUTODRAW );
-	bSizerConflict->Add( m_bpButtonConflict, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	sbSizerSyncDirections->Add( bSizerConflict, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	bSizerConfig->Add( sbSizerSyncDirections, 0, wxEXPAND, 5 );
-	
-	
-	bSizerConfig->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	bSizer181->Add( bSizerConfig, 0, wxALL|wxEXPAND, 5 );
-	
-	
-	bSizer7->Add( bSizer181, 1, 0, 5 );
-	
-	m_staticline15 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer7->Add( m_staticline15, 0, wxEXPAND, 5 );
-	
-	m_panel37 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panel37->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-	
-	wxBoxSizer* bSizer291;
-	bSizer291 = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizer291->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_buttonOK = new wxButton( m_panel37, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_buttonOK->SetDefault(); 
-	m_buttonOK->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer291->Add( m_buttonOK, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
-	
-	m_button16 = new wxButton( m_panel37, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_button16->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer291->Add( m_button16, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer291->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	m_panel37->SetSizer( bSizer291 );
-	m_panel37->Layout();
-	bSizer291->Fit( m_panel37 );
-	bSizer7->Add( m_panel37, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	
-	this->SetSizer( bSizer7 );
-	this->Layout();
-	bSizer7->Fit( this );
-	
-	this->Centre( wxBOTH );
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SyncCfgDlgGenerated::OnClose ) );
-	m_toggleBtnAutomatic->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncAutomaticDouble ), NULL, this );
-	m_toggleBtnAutomatic->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncAutomatic ), NULL, this );
-	m_toggleBtnMirror->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncMirrorDouble ), NULL, this );
-	m_toggleBtnMirror->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncMirror ), NULL, this );
-	m_toggleBtnUpdate->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncUpdateDouble ), NULL, this );
-	m_toggleBtnUpdate->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncUpdate ), NULL, this );
-	m_toggleBtnCustom->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncCustomDouble ), NULL, this );
-	m_toggleBtnCustom->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncCustom ), NULL, this );
-	m_toggleBtnErrorIgnore->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnErrorIgnore ), NULL, this );
-	m_toggleBtnErrorPopup->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnErrorPopup ), NULL, this );
-	m_toggleBtnPermanent->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnDeletionPermanent ), NULL, this );
-	m_toggleBtnRecycler->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnDeletionRecycler ), NULL, this );
-	m_toggleBtnVersioning->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnDeletionVersioning ), NULL, this );
-	m_choiceVersioningStyle->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnParameterChange ), 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 );
-	m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnApply ), NULL, this );
-	m_button16->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnCancel ), NULL, this );
+    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+    wxBoxSizer* bSizer7;
+    bSizer7 = new wxBoxSizer( wxVERTICAL );
+
+    m_panel37 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panel37->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    wxBoxSizer* bSizer181;
+    bSizer181 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer29;
+    bSizer29 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText86 = new wxStaticText( m_panel37, wxID_ANY, _("Select variant"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText86->Wrap( -1 );
+    bSizer29->Add( m_staticText86, 0, wxALL, 5 );
+
+    wxFlexGridSizer* fgSizer1;
+    fgSizer1 = new wxFlexGridSizer( 4, 2, 6, 8 );
+    fgSizer1->SetFlexibleDirection( wxHORIZONTAL );
+    fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    m_toggleBtnAutomatic = new wxToggleButton( m_panel37, wxID_ANY, _("<- Two way ->"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_toggleBtnAutomatic->SetValue( true );
+    m_toggleBtnAutomatic->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    fgSizer1->Add( m_toggleBtnAutomatic, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    m_staticTextAutomatic = new wxStaticText( m_panel37, wxID_ANY, _("Identify and propagate changes on both sides using a database. Deletions, renaming and conflicts are detected automatically."), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextAutomatic->Wrap( 450 );
+    fgSizer1->Add( m_staticTextAutomatic, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_toggleBtnMirror = new wxToggleButton( m_panel37, wxID_ANY, _("Mirror ->>"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_toggleBtnMirror->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    fgSizer1->Add( m_toggleBtnMirror, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    m_staticTextMirror = new wxStaticText( m_panel37, wxID_ANY, _("Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization."), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextMirror->Wrap( 450 );
+    fgSizer1->Add( m_staticTextMirror, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_toggleBtnUpdate = new wxToggleButton( m_panel37, wxID_ANY, _("Update ->"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_toggleBtnUpdate->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    fgSizer1->Add( m_toggleBtnUpdate, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    m_staticTextUpdate = new wxStaticText( m_panel37, wxID_ANY, _("Copy new or updated files to right folder."), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextUpdate->Wrap( 450 );
+    fgSizer1->Add( m_staticTextUpdate, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_toggleBtnCustom = new wxToggleButton( m_panel37, wxID_ANY, _("Custom"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_toggleBtnCustom->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    fgSizer1->Add( m_toggleBtnCustom, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    m_staticTextCustom = new wxStaticText( m_panel37, wxID_ANY, _("Configure your own synchronization rules."), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextCustom->Wrap( 450 );
+    fgSizer1->Add( m_staticTextCustom, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer29->Add( fgSizer1, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+    bSizerExtraConfig = new wxBoxSizer( wxVERTICAL );
+
+    m_staticline321 = new wxStaticLine( m_panel37, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizerExtraConfig->Add( m_staticline321, 0, wxEXPAND, 5 );
+
+    bSizer179 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer174;
+    bSizer174 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText88 = new wxStaticText( m_panel37, wxID_ANY, _("Error handling"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText88->Wrap( -1 );
+    bSizer174->Add( m_staticText88, 0, wxBOTTOM, 5 );
+
+    wxBoxSizer* bSizer175;
+    bSizer175 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_toggleBtnErrorIgnore = new wxToggleButton( m_panel37, wxID_ANY, _("Ignore"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_toggleBtnErrorIgnore->SetToolTip( _("Hide all error and warning messages") );
+
+    bSizer175->Add( m_toggleBtnErrorIgnore, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_toggleBtnErrorPopup = new wxToggleButton( m_panel37, wxID_ANY, _("Pop-up"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_toggleBtnErrorPopup->SetToolTip( _("Show pop-up on errors or warnings") );
+
+    bSizer175->Add( m_toggleBtnErrorPopup, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer174->Add( bSizer175, 0, 0, 5 );
+
+
+    bSizer179->Add( bSizer174, 0, wxALL, 5 );
+
+    m_staticline36 = new wxStaticLine( m_panel37, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    bSizer179->Add( m_staticline36, 0, wxEXPAND, 5 );
+
+    bSizerOnCompletion = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText89 = new wxStaticText( m_panel37, wxID_ANY, _("On completion"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText89->Wrap( -1 );
+    bSizerOnCompletion->Add( m_staticText89, 0, wxBOTTOM, 5 );
+
+    m_comboBoxExecFinished = new ExecFinishedBox( m_panel37, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+    bSizerOnCompletion->Add( m_comboBoxExecFinished, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+
+    bSizer179->Add( bSizerOnCompletion, 1, wxALL, 5 );
+
+
+    bSizerExtraConfig->Add( bSizer179, 0, wxEXPAND, 5 );
+
+
+    bSizer29->Add( bSizerExtraConfig, 0, wxEXPAND, 5 );
+
+    m_staticline32 = new wxStaticLine( m_panel37, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer29->Add( m_staticline32, 0, wxEXPAND, 5 );
+
+    bSizerNamingConvention = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText87 = new wxStaticText( m_panel37, wxID_ANY, _("Deletion handling"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText87->Wrap( -1 );
+    bSizerNamingConvention->Add( m_staticText87, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+
+
+    bSizerNamingConvention->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    bSizerVersioningNamingConvention = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticTextNamingCvtPart1 = new wxStaticText( m_panel37, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextNamingCvtPart1->Wrap( -1 );
+    m_staticTextNamingCvtPart1->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+
+    bSizerVersioningNamingConvention->Add( m_staticTextNamingCvtPart1, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticTextNamingCvtPart2Bold = new wxStaticText( m_panel37, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextNamingCvtPart2Bold->Wrap( -1 );
+    m_staticTextNamingCvtPart2Bold->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+    m_staticTextNamingCvtPart2Bold->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+
+    bSizerVersioningNamingConvention->Add( m_staticTextNamingCvtPart2Bold, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticTextNamingCvtPart3 = new wxStaticText( m_panel37, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextNamingCvtPart3->Wrap( -1 );
+    m_staticTextNamingCvtPart3->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+
+    bSizerVersioningNamingConvention->Add( m_staticTextNamingCvtPart3, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerNamingConvention->Add( bSizerVersioningNamingConvention, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+
+
+    bSizer29->Add( bSizerNamingConvention, 0, wxTOP|wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer180;
+    bSizer180 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_toggleBtnPermanent = new wxToggleButton( m_panel37, wxID_ANY, _("Permanent"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_toggleBtnPermanent->SetToolTip( _("Delete or overwrite files permanently") );
+
+    bSizer180->Add( m_toggleBtnPermanent, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    m_toggleBtnRecycler = new wxToggleButton( m_panel37, wxID_ANY, _("Recycle Bin"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_toggleBtnRecycler->SetToolTip( _("Use Recycle Bin for deleted and overwritten files") );
+
+    bSizer180->Add( m_toggleBtnRecycler, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_toggleBtnVersioning = new wxToggleButton( m_panel37, wxID_ANY, _("Versioning"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_toggleBtnVersioning->SetToolTip( _("Move time-stamped files into specified folder") );
+
+    bSizer180->Add( m_toggleBtnVersioning, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer180->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    bSizerVersioningStyle = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText93 = new wxStaticText( m_panel37, wxID_ANY, _("Naming convention:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText93->Wrap( -1 );
+    bSizerVersioningStyle->Add( m_staticText93, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    wxArrayString m_choiceVersioningStyleChoices;
+    m_choiceVersioningStyle = new wxChoice( m_panel37, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceVersioningStyleChoices, 0 );
+    m_choiceVersioningStyle->SetSelection( 0 );
+    bSizerVersioningStyle->Add( m_choiceVersioningStyle, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer180->Add( bSizerVersioningStyle, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer29->Add( bSizer180, 0, wxEXPAND|wxALL, 5 );
+
+    m_panelVersioning = new wxPanel( m_panel37, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer156;
+    bSizer156 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer1151;
+    bSizer1151 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_versioningFolder = new FolderHistoryBox( m_panelVersioning, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+    bSizer1151->Add( m_versioningFolder, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_buttonSelectDirVersioning = new wxButton( m_panelVersioning, wxID_ANY, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonSelectDirVersioning->SetToolTip( _("Select a folder") );
+
+    bSizer1151->Add( m_buttonSelectDirVersioning, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer156->Add( bSizer1151, 0, wxEXPAND, 5 );
+
+
+    m_panelVersioning->SetSizer( bSizer156 );
+    m_panelVersioning->Layout();
+    bSizer156->Fit( m_panelVersioning );
+    bSizer29->Add( m_panelVersioning, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+
+    bSizer181->Add( bSizer29, 0, wxEXPAND, 5 );
+
+    m_staticline31 = new wxStaticLine( m_panel37, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    bSizer181->Add( m_staticline31, 0, wxEXPAND, 5 );
+
+    bSizerConfig = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText90 = new wxStaticText( m_panel37, wxID_ANY, _("Configuration"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText90->Wrap( -1 );
+    bSizerConfig->Add( m_staticText90, 0, wxBOTTOM, 5 );
+
+
+    bSizerConfig->Add( 0, 5, 0, 0, 5 );
+
+    m_bitmapDatabase = new wxStaticBitmap( m_panel37, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+    bSizerConfig->Add( m_bitmapDatabase, 0, wxALIGN_CENTER_HORIZONTAL, 10 );
+
+    sbSizerSyncDirections = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer1801;
+    bSizer1801 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticTextHeaderCategory = new wxStaticText( m_panel37, wxID_ANY, _("Category"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
+    m_staticTextHeaderCategory->Wrap( -1 );
+    m_staticTextHeaderCategory->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer1801->Add( m_staticTextHeaderCategory, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer1801->Add( 5, 0, 0, 0, 5 );
+
+    m_staticTextHeaderAction = new wxStaticText( m_panel37, wxID_ANY, _("Action"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT );
+    m_staticTextHeaderAction->Wrap( -1 );
+    m_staticTextHeaderAction->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer1801->Add( m_staticTextHeaderAction, 1, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    sbSizerSyncDirections->Add( bSizer1801, 0, wxEXPAND, 5 );
+
+    bSizerLeftOnly = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapLeftOnly = new wxStaticBitmap( m_panel37, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
+    m_bitmapLeftOnly->SetToolTip( _("Item exists on left side only") );
+
+    bSizerLeftOnly->Add( m_bitmapLeftOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerLeftOnly->Add( 5, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonLeftOnly = new wxBitmapButton( m_panel37, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 46,46 ), wxBU_AUTODRAW );
+    bSizerLeftOnly->Add( m_bpButtonLeftOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    sbSizerSyncDirections->Add( bSizerLeftOnly, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    bSizerRightOnly = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapRightOnly = new wxStaticBitmap( m_panel37, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
+    m_bitmapRightOnly->SetToolTip( _("Item exists on right side only") );
+
+    bSizerRightOnly->Add( m_bitmapRightOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerRightOnly->Add( 5, 0, 0, 0, 5 );
+
+    m_bpButtonRightOnly = new wxBitmapButton( m_panel37, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 46,46 ), wxBU_AUTODRAW );
+    bSizerRightOnly->Add( m_bpButtonRightOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    sbSizerSyncDirections->Add( bSizerRightOnly, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    bSizerLeftNewer = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapLeftNewer = new wxStaticBitmap( m_panel37, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
+    m_bitmapLeftNewer->SetToolTip( _("Left side is newer") );
+
+    bSizerLeftNewer->Add( m_bitmapLeftNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerLeftNewer->Add( 5, 0, 0, 0, 5 );
+
+    m_bpButtonLeftNewer = new wxBitmapButton( m_panel37, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 46,46 ), wxBU_AUTODRAW );
+    bSizerLeftNewer->Add( m_bpButtonLeftNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    sbSizerSyncDirections->Add( bSizerLeftNewer, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    bSizerRightNewer = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapRightNewer = new wxStaticBitmap( m_panel37, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
+    m_bitmapRightNewer->SetToolTip( _("Right side is newer") );
+
+    bSizerRightNewer->Add( m_bitmapRightNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerRightNewer->Add( 5, 0, 0, 0, 5 );
+
+    m_bpButtonRightNewer = new wxBitmapButton( m_panel37, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 46,46 ), wxBU_AUTODRAW );
+    bSizerRightNewer->Add( m_bpButtonRightNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    sbSizerSyncDirections->Add( bSizerRightNewer, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    bSizerDifferent = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapDifferent = new wxStaticBitmap( m_panel37, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
+    m_bitmapDifferent->SetToolTip( _("Items have different content") );
+
+    bSizerDifferent->Add( m_bitmapDifferent, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerDifferent->Add( 5, 0, 0, 0, 5 );
+
+    m_bpButtonDifferent = new wxBitmapButton( m_panel37, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 46,46 ), wxBU_AUTODRAW );
+    bSizerDifferent->Add( m_bpButtonDifferent, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    sbSizerSyncDirections->Add( bSizerDifferent, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    bSizerConflict = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapConflict = new wxStaticBitmap( m_panel37, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
+    m_bitmapConflict->SetToolTip( _("Conflict/item cannot be categorized") );
+
+    bSizerConflict->Add( m_bitmapConflict, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizerConflict->Add( 5, 0, 0, 0, 5 );
+
+    m_bpButtonConflict = new wxBitmapButton( m_panel37, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 46,46 ), wxBU_AUTODRAW );
+    bSizerConflict->Add( m_bpButtonConflict, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    sbSizerSyncDirections->Add( bSizerConflict, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    bSizerConfig->Add( sbSizerSyncDirections, 0, wxEXPAND, 5 );
+
+
+    bSizerConfig->Add( 0, 0, 1, wxEXPAND, 5 );
+
+
+    bSizer181->Add( bSizerConfig, 0, wxALL|wxEXPAND, 5 );
+
+
+    m_panel37->SetSizer( bSizer181 );
+    m_panel37->Layout();
+    bSizer181->Fit( m_panel37 );
+    bSizer7->Add( m_panel37, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+    m_staticline15 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer7->Add( m_staticline15, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer291;
+    bSizer291 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_buttonOK = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_buttonOK->SetDefault();
+    m_buttonOK->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer291->Add( m_buttonOK, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+    m_button16 = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    bSizer291->Add( m_button16, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer7->Add( bSizer291, 0, wxALIGN_RIGHT, 5 );
+
+
+    this->SetSizer( bSizer7 );
+    this->Layout();
+    bSizer7->Fit( this );
+
+    this->Centre( wxBOTH );
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SyncCfgDlgGenerated::OnClose ) );
+    m_toggleBtnAutomatic->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncAutomaticDouble ), NULL, this );
+    m_toggleBtnAutomatic->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncAutomatic ), NULL, this );
+    m_toggleBtnMirror->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncMirrorDouble ), NULL, this );
+    m_toggleBtnMirror->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncMirror ), NULL, this );
+    m_toggleBtnUpdate->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncUpdateDouble ), NULL, this );
+    m_toggleBtnUpdate->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncUpdate ), NULL, this );
+    m_toggleBtnCustom->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncCustomDouble ), NULL, this );
+    m_toggleBtnCustom->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncCustom ), NULL, this );
+    m_toggleBtnErrorIgnore->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnErrorIgnore ), NULL, this );
+    m_toggleBtnErrorPopup->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnErrorPopup ), NULL, this );
+    m_toggleBtnPermanent->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnDeletionPermanent ), NULL, this );
+    m_toggleBtnRecycler->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnDeletionRecycler ), NULL, this );
+    m_toggleBtnVersioning->Connect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnDeletionVersioning ), NULL, this );
+    m_choiceVersioningStyle->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnParameterChange ), 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 );
+    m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnApply ), NULL, this );
+    m_button16->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnCancel ), NULL, this );
 }
 
 SyncCfgDlgGenerated::~SyncCfgDlgGenerated()
 {
-	// Disconnect Events
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SyncCfgDlgGenerated::OnClose ) );
-	m_toggleBtnAutomatic->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncAutomaticDouble ), NULL, this );
-	m_toggleBtnAutomatic->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncAutomatic ), NULL, this );
-	m_toggleBtnMirror->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncMirrorDouble ), NULL, this );
-	m_toggleBtnMirror->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncMirror ), NULL, this );
-	m_toggleBtnUpdate->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncUpdateDouble ), NULL, this );
-	m_toggleBtnUpdate->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncUpdate ), NULL, this );
-	m_toggleBtnCustom->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncCustomDouble ), NULL, this );
-	m_toggleBtnCustom->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncCustom ), NULL, this );
-	m_toggleBtnErrorIgnore->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnErrorIgnore ), NULL, this );
-	m_toggleBtnErrorPopup->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnErrorPopup ), NULL, this );
-	m_toggleBtnPermanent->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnDeletionPermanent ), NULL, this );
-	m_toggleBtnRecycler->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnDeletionRecycler ), NULL, this );
-	m_toggleBtnVersioning->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnDeletionVersioning ), NULL, this );
-	m_choiceVersioningStyle->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnParameterChange ), 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 );
-	m_buttonOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnApply ), NULL, this );
-	m_button16->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnCancel ), NULL, this );
-	
+    // Disconnect Events
+    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SyncCfgDlgGenerated::OnClose ) );
+    m_toggleBtnAutomatic->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncAutomaticDouble ), NULL, this );
+    m_toggleBtnAutomatic->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncAutomatic ), NULL, this );
+    m_toggleBtnMirror->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncMirrorDouble ), NULL, this );
+    m_toggleBtnMirror->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncMirror ), NULL, this );
+    m_toggleBtnUpdate->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncUpdateDouble ), NULL, this );
+    m_toggleBtnUpdate->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncUpdate ), NULL, this );
+    m_toggleBtnCustom->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncCustomDouble ), NULL, this );
+    m_toggleBtnCustom->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncCustom ), NULL, this );
+    m_toggleBtnErrorIgnore->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnErrorIgnore ), NULL, this );
+    m_toggleBtnErrorPopup->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnErrorPopup ), NULL, this );
+    m_toggleBtnPermanent->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnDeletionPermanent ), NULL, this );
+    m_toggleBtnRecycler->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnDeletionRecycler ), NULL, this );
+    m_toggleBtnVersioning->Disconnect( wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnDeletionVersioning ), NULL, this );
+    m_choiceVersioningStyle->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnParameterChange ), 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 );
+    m_buttonOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnApply ), NULL, this );
+    m_button16->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnCancel ), NULL, this );
+
 }
 
 LogControlGenerated::LogControlGenerated( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
 {
-	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-	
-	wxBoxSizer* bSizer179;
-	bSizer179 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticline12 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer179->Add( m_staticline12, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer153;
-	bSizer153 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer154;
-	bSizer154 = new wxBoxSizer( wxVERTICAL );
-	
-	m_bpButtonErrors = new ToggleButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), wxBU_AUTODRAW );
-	bSizer154->Add( m_bpButtonErrors, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonWarnings = new ToggleButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), wxBU_AUTODRAW );
-	bSizer154->Add( m_bpButtonWarnings, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonInfo = new ToggleButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), wxBU_AUTODRAW );
-	bSizer154->Add( m_bpButtonInfo, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	bSizer153->Add( bSizer154, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-	
-	m_staticline13 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-	bSizer153->Add( m_staticline13, 0, wxEXPAND, 5 );
-	
-	m_gridMessages = new zen::Grid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
-	m_gridMessages->SetScrollRate( 5, 5 );
-	bSizer153->Add( m_gridMessages, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer179->Add( bSizer153, 1, wxEXPAND, 5 );
-	
-	
-	this->SetSizer( bSizer179 );
-	this->Layout();
-	bSizer179->Fit( this );
-	
-	// Connect Events
-	m_bpButtonErrors->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogControlGenerated::OnErrors ), NULL, this );
-	m_bpButtonWarnings->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogControlGenerated::OnWarnings ), NULL, this );
-	m_bpButtonInfo->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogControlGenerated::OnInfo ), NULL, this );
+    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+    wxBoxSizer* bSizer179;
+    bSizer179 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticline12 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer179->Add( m_staticline12, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer153;
+    bSizer153 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer154;
+    bSizer154 = new wxBoxSizer( wxVERTICAL );
+
+    m_bpButtonErrors = new ToggleButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), wxBU_AUTODRAW );
+    bSizer154->Add( m_bpButtonErrors, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonWarnings = new ToggleButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), wxBU_AUTODRAW );
+    bSizer154->Add( m_bpButtonWarnings, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonInfo = new ToggleButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), wxBU_AUTODRAW );
+    bSizer154->Add( m_bpButtonInfo, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    bSizer153->Add( bSizer154, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+
+    m_staticline13 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    bSizer153->Add( m_staticline13, 0, wxEXPAND, 5 );
+
+    m_gridMessages = new zen::Grid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
+    m_gridMessages->SetScrollRate( 5, 5 );
+    bSizer153->Add( m_gridMessages, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer179->Add( bSizer153, 1, wxEXPAND, 5 );
+
+
+    this->SetSizer( bSizer179 );
+    this->Layout();
+    bSizer179->Fit( this );
+
+    // Connect Events
+    m_bpButtonErrors->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogControlGenerated::OnErrors ), NULL, this );
+    m_bpButtonWarnings->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogControlGenerated::OnWarnings ), NULL, this );
+    m_bpButtonInfo->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogControlGenerated::OnInfo ), NULL, this );
 }
 
 LogControlGenerated::~LogControlGenerated()
 {
-	// Disconnect Events
-	m_bpButtonErrors->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogControlGenerated::OnErrors ), NULL, this );
-	m_bpButtonWarnings->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogControlGenerated::OnWarnings ), NULL, this );
-	m_bpButtonInfo->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogControlGenerated::OnInfo ), NULL, this );
-	
+    // Disconnect Events
+    m_bpButtonErrors->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogControlGenerated::OnErrors ), NULL, this );
+    m_bpButtonWarnings->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogControlGenerated::OnWarnings ), NULL, this );
+    m_bpButtonInfo->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogControlGenerated::OnInfo ), NULL, this );
+
 }
 
 AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	wxBoxSizer* bSizer31;
-	bSizer31 = new wxBoxSizer( wxVERTICAL );
-	
-	m_bitmapLogo = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	bSizer31->Add( m_bitmapLogo, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticline341 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer31->Add( m_staticline341, 0, wxEXPAND, 5 );
-	
-	m_build = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_build->Wrap( -1 );
-	bSizer31->Add( m_build, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	m_staticline3411 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer31->Add( m_staticline3411, 0, wxEXPAND, 5 );
-	
-	m_panel33 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panel33->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	bSizerCodeInfo = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText72 = new wxStaticText( m_panel33, wxID_ANY, _("Source code written in C++ using:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText72->Wrap( -1 );
-	m_staticText72->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizerCodeInfo->Add( m_staticText72, 0, wxALL, 5 );
-	
-	wxBoxSizer* bSizer167;
-	bSizer167 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer171;
-	bSizer171 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_hyperlink11 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("MS Visual C++"), wxT("http://msdn.microsoft.com/library/60k1461a.aspx"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink11->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	bSizer171->Add( m_hyperlink11, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_hyperlink9 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("MinGW"), wxT("http://www.mingw.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink9->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	bSizer171->Add( m_hyperlink9, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_hyperlink10 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("Code::Blocks"), wxT("http://www.codeblocks.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink10->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	bSizer171->Add( m_hyperlink10, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_hyperlink7 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("wxWidgets"), wxT("http://www.wxwidgets.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink7->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	bSizer171->Add( m_hyperlink7, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_hyperlink14 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("wxFormBuilder"), wxT("http://wxformbuilder.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink14->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	bSizer171->Add( m_hyperlink14, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer167->Add( bSizer171, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM, 5 );
-	
-	wxBoxSizer* bSizer172;
-	bSizer172 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_hyperlink15 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("zenXML"), wxT("http://zenxml.sourceforge.net/"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink15->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	bSizer172->Add( m_hyperlink15, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_hyperlink13 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("Boost"), wxT("http://www.boost.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink13->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	bSizer172->Add( m_hyperlink13, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_hyperlink16 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("Artistic Style"), wxT("http://astyle.sourceforge.net"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink16->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	bSizer172->Add( m_hyperlink16, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_hyperlink12 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("Google Test"), wxT("http://code.google.com/p/googletest"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink12->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	bSizer172->Add( m_hyperlink12, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_hyperlink18 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("Unicode NSIS"), wxT("http://www.scratchpaper.com"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink18->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	bSizer172->Add( m_hyperlink18, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer167->Add( bSizer172, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	bSizerCodeInfo->Add( bSizer167, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	
-	m_panel33->SetSizer( bSizerCodeInfo );
-	m_panel33->Layout();
-	bSizerCodeInfo->Fit( m_panel33 );
-	bSizer31->Add( m_panel33, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	m_panel40 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panel40->SetBackgroundColour( wxColour( 153, 170, 187 ) );
-	
-	wxBoxSizer* bSizer183;
-	bSizer183 = new wxBoxSizer( wxVERTICAL );
-	
-	m_panel39 = new wxPanel( m_panel40, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panel39->SetBackgroundColour( wxColour( 221, 221, 255 ) );
-	
-	wxBoxSizer* bSizer184;
-	bSizer184 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer178;
-	bSizer178 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText83 = new wxStaticText( m_panel39, wxID_ANY, _("If you like FreeFileSync"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText83->Wrap( -1 );
-	m_staticText83->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 93, 92, false, wxEmptyString ) );
-	m_staticText83->SetForegroundColour( wxColour( 0, 0, 0 ) );
-	
-	bSizer178->Add( m_staticText83, 0, wxALL, 5 );
-	
-	m_hyperlinkDonate = new wxHyperlinkCtrl( m_panel39, wxID_ANY, _("Donate with PayPal"), wxT("https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=zenju@gmx.de&no_shipping=1&lc=US&currency_code=EUR"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlinkDonate->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, true, wxEmptyString ) );
-	m_hyperlinkDonate->SetBackgroundColour( wxColour( 221, 221, 255 ) );
-	m_hyperlinkDonate->SetToolTip( _("https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=zenju@gmx.de&no_shipping=1&lc=US&currency_code=EUR") );
-	
-	bSizer178->Add( m_hyperlinkDonate, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	
-	bSizer184->Add( bSizer178, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_animCtrlWink = new wxAnimationCtrl( m_panel39, wxID_ANY, wxNullAnimation, wxDefaultPosition, wxSize( -1,-1 ), wxAC_DEFAULT_STYLE ); 
-	bSizer184->Add( m_animCtrlWink, 0, 0, 5 );
-	
-	
-	m_panel39->SetSizer( bSizer184 );
-	m_panel39->Layout();
-	bSizer184->Fit( m_panel39 );
-	bSizer183->Add( m_panel39, 0, wxEXPAND|wxALL, 5 );
-	
-	
-	m_panel40->SetSizer( bSizer183 );
-	m_panel40->Layout();
-	bSizer183->Fit( m_panel40 );
-	bSizer31->Add( m_panel40, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	m_scrolledWindowTranslators = new wxScrolledWindow( this, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxHSCROLL|wxVSCROLL );
-	m_scrolledWindowTranslators->SetScrollRate( 10, 10 );
-	m_scrolledWindowTranslators->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	m_scrolledWindowTranslators->SetMinSize( wxSize( -1,180 ) );
-	
-	bSizerTranslators = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText54 = new wxStaticText( m_scrolledWindowTranslators, wxID_ANY, _("Many thanks for localization:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText54->Wrap( -1 );
-	m_staticText54->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizerTranslators->Add( m_staticText54, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxBOTTOM, 5 );
-	
-	
-	bSizerTranslators->Add( 0, 5, 0, 0, 5 );
-	
-	fgSizerTranslators = new wxFlexGridSizer( 50, 3, 2, 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 );
-	bSizer31->Add( m_scrolledWindowTranslators, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	m_staticline43 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer31->Add( m_staticline43, 0, wxEXPAND, 5 );
-	
-	m_staticText94 = new wxStaticText( this, wxID_ANY, _("Feedback and suggestions are welcome"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText94->Wrap( -1 );
-	bSizer31->Add( m_staticText94, 0, wxALL, 5 );
-	
-	wxBoxSizer* bSizer166;
-	bSizer166 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer170;
-	bSizer170 = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizer170->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_hyperlink1 = new wxHyperlinkCtrl( this, wxID_ANY, _("Homepage"), wxT("http://freefilesync.sourceforge.net/"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink1->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, true, wxEmptyString ) );
-	m_hyperlink1->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	m_hyperlink1->SetToolTip( _("http://sourceforge.net/projects/freefilesync/") );
-	
-	bSizer170->Add( m_hyperlink1, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bitmap9 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_bitmap9->SetToolTip( _("FreeFileSync at Sourceforge") );
-	
-	bSizer170->Add( m_bitmap9, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-	
-	
-	bSizer170->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	bSizer166->Add( bSizer170, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	wxBoxSizer* bSizer1711;
-	bSizer1711 = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizer1711->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_hyperlink2 = new wxHyperlinkCtrl( this, wxID_ANY, _("Email"), wxT("mailto:zenju@gmx.de"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink2->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, true, wxEmptyString ) );
-	m_hyperlink2->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	m_hyperlink2->SetToolTip( _("zenju@gmx.de") );
-	
-	bSizer1711->Add( m_hyperlink2, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bitmap10 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_bitmap10->SetToolTip( _("Email") );
-	
-	bSizer1711->Add( m_bitmap10, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-	
-	
-	bSizer1711->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	bSizer166->Add( bSizer1711, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer31->Add( bSizer166, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	m_staticline34 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer31->Add( m_staticline34, 0, wxEXPAND, 5 );
-	
-	m_staticText93 = new wxStaticText( this, wxID_ANY, _("Published under the GNU General Public License"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText93->Wrap( -1 );
-	bSizer31->Add( m_staticText93, 0, wxALL, 5 );
-	
-	wxBoxSizer* bSizer1671;
-	bSizer1671 = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizer1671->Add( 0, 0, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bitmap13 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	bSizer1671->Add( m_bitmap13, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 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 );
-	m_hyperlink5->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	bSizer1671->Add( m_hyperlink5, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer1671->Add( 0, 0, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer31->Add( bSizer1671, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	m_staticline36 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer31->Add( m_staticline36, 0, wxEXPAND, 5 );
-	
-	m_panel41 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panel41->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-	
-	wxBoxSizer* bSizer168;
-	bSizer168 = new wxBoxSizer( wxVERTICAL );
-	
-	m_buttonOkay = new wxButton( m_panel41, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_buttonOkay->SetDefault(); 
-	m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer168->Add( m_buttonOkay, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
-	
-	
-	m_panel41->SetSizer( bSizer168 );
-	m_panel41->Layout();
-	bSizer168->Fit( m_panel41 );
-	bSizer31->Add( m_panel41, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 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 );
+    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+    wxBoxSizer* bSizer31;
+    bSizer31 = new wxBoxSizer( wxVERTICAL );
+
+    m_panel41 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panel41->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    wxBoxSizer* bSizer162;
+    bSizer162 = new wxBoxSizer( wxVERTICAL );
+
+    m_bitmapLogo = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+    bSizer162->Add( m_bitmapLogo, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticline341 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer162->Add( m_staticline341, 0, wxEXPAND, 5 );
+
+    m_build = new wxStaticText( m_panel41, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_build->Wrap( -1 );
+    bSizer162->Add( m_build, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    m_staticline3411 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer162->Add( m_staticline3411, 0, wxEXPAND, 5 );
+
+    m_staticText72 = new wxStaticText( m_panel41, wxID_ANY, _("Source code written in C++ using:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText72->Wrap( -1 );
+    m_staticText72->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer162->Add( m_staticText72, 0, wxALL, 5 );
+
+    wxBoxSizer* bSizer171;
+    bSizer171 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_hyperlink11 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("MS Visual C++"), wxT("http://msdn.microsoft.com/library/60k1461a.aspx"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink11->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    bSizer171->Add( m_hyperlink11, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    m_hyperlink9 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("MinGW"), wxT("http://www.mingw.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink9->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    bSizer171->Add( m_hyperlink9, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    m_hyperlink10 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("Code::Blocks"), wxT("http://www.codeblocks.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink10->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    bSizer171->Add( m_hyperlink10, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    m_hyperlink7 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("wxWidgets"), wxT("http://www.wxwidgets.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink7->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    bSizer171->Add( m_hyperlink7, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    m_hyperlink14 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("wxFormBuilder"), wxT("http://wxformbuilder.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink14->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    bSizer171->Add( m_hyperlink14, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer162->Add( bSizer171, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+    wxBoxSizer* bSizer172;
+    bSizer172 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_hyperlink15 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("zenXML"), wxT("http://zenxml.sourceforge.net/"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink15->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    bSizer172->Add( m_hyperlink15, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    m_hyperlink13 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("Boost"), wxT("http://www.boost.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink13->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    bSizer172->Add( m_hyperlink13, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    m_hyperlink16 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("Artistic Style"), wxT("http://astyle.sourceforge.net"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink16->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    bSizer172->Add( m_hyperlink16, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    m_hyperlink12 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("Google Test"), wxT("http://code.google.com/p/googletest"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink12->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    bSizer172->Add( m_hyperlink12, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    m_hyperlink18 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("Unicode NSIS"), wxT("http://www.scratchpaper.com"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink18->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    bSizer172->Add( m_hyperlink18, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer162->Add( bSizer172, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+    m_panel40 = new wxPanel( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panel40->SetBackgroundColour( wxColour( 153, 170, 187 ) );
+
+    wxBoxSizer* bSizer183;
+    bSizer183 = new wxBoxSizer( wxVERTICAL );
+
+    m_panel39 = new wxPanel( m_panel40, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panel39->SetBackgroundColour( wxColour( 221, 221, 255 ) );
+
+    wxBoxSizer* bSizer184;
+    bSizer184 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer178;
+    bSizer178 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText83 = new wxStaticText( m_panel39, wxID_ANY, _("If you like FreeFileSync"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText83->Wrap( -1 );
+    m_staticText83->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 93, 92, false, wxEmptyString ) );
+    m_staticText83->SetForegroundColour( wxColour( 0, 0, 0 ) );
+
+    bSizer178->Add( m_staticText83, 0, wxALL, 5 );
+
+    m_buttonDonate = new wxButton( m_panel39, wxID_ANY, _("Donate with PayPal"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_buttonDonate->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
+    m_buttonDonate->SetToolTip( _("https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=zenju@gmx.de&no_shipping=1&lc=US&currency_code=EUR") );
+
+    bSizer178->Add( m_buttonDonate, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_RIGHT, 5 );
+
+
+    bSizer184->Add( bSizer178, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_animCtrlWink = new wxAnimationCtrl( m_panel39, wxID_ANY, wxNullAnimation, wxDefaultPosition, wxSize( -1,-1 ), wxAC_DEFAULT_STYLE );
+    bSizer184->Add( m_animCtrlWink, 0, 0, 5 );
+
+
+    m_panel39->SetSizer( bSizer184 );
+    m_panel39->Layout();
+    bSizer184->Fit( m_panel39 );
+    bSizer183->Add( m_panel39, 0, wxEXPAND|wxALL, 5 );
+
+
+    m_panel40->SetSizer( bSizer183 );
+    m_panel40->Layout();
+    bSizer183->Fit( m_panel40 );
+    bSizer162->Add( m_panel40, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+    m_scrolledWindowTranslators = new wxScrolledWindow( m_panel41, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxHSCROLL|wxVSCROLL );
+    m_scrolledWindowTranslators->SetScrollRate( 10, 10 );
+    m_scrolledWindowTranslators->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+    m_scrolledWindowTranslators->SetMinSize( wxSize( -1,180 ) );
+
+    bSizerTranslators = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText54 = new wxStaticText( m_scrolledWindowTranslators, wxID_ANY, _("Many thanks for localization:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText54->Wrap( -1 );
+    m_staticText54->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizerTranslators->Add( m_staticText54, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxBOTTOM, 5 );
+
+
+    bSizerTranslators->Add( 0, 5, 0, 0, 5 );
+
+    fgSizerTranslators = new wxFlexGridSizer( 50, 3, 2, 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 );
+    bSizer162->Add( m_scrolledWindowTranslators, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+    m_staticline43 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer162->Add( m_staticline43, 0, wxEXPAND, 5 );
+
+    m_staticText94 = new wxStaticText( m_panel41, wxID_ANY, _("Feedback and suggestions are welcome"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText94->Wrap( -1 );
+    bSizer162->Add( m_staticText94, 0, wxALL, 5 );
+
+    wxBoxSizer* bSizer166;
+    bSizer166 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer170;
+    bSizer170 = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizer170->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_hyperlink1 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("Homepage"), wxT("http://freefilesync.sourceforge.net/"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink1->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, true, wxEmptyString ) );
+    m_hyperlink1->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+    m_hyperlink1->SetToolTip( _("http://sourceforge.net/projects/freefilesync/") );
+
+    bSizer170->Add( m_hyperlink1, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bitmap9 = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+    m_bitmap9->SetToolTip( _("FreeFileSync at Sourceforge") );
+
+    bSizer170->Add( m_bitmap9, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+
+
+    bSizer170->Add( 0, 0, 1, wxEXPAND, 5 );
+
+
+    bSizer166->Add( bSizer170, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    wxBoxSizer* bSizer1711;
+    bSizer1711 = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizer1711->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_hyperlink2 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("Email"), wxT("mailto:zenju@gmx.de"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink2->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, true, wxEmptyString ) );
+    m_hyperlink2->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+    m_hyperlink2->SetToolTip( _("zenju@gmx.de") );
+
+    bSizer1711->Add( m_hyperlink2, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bitmap10 = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+    m_bitmap10->SetToolTip( _("Email") );
+
+    bSizer1711->Add( m_bitmap10, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+
+
+    bSizer1711->Add( 0, 0, 1, wxEXPAND, 5 );
+
+
+    bSizer166->Add( bSizer1711, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer162->Add( bSizer166, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+    m_staticline34 = new wxStaticLine( m_panel41, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer162->Add( m_staticline34, 0, wxEXPAND, 5 );
+
+    m_staticText93 = new wxStaticText( m_panel41, wxID_ANY, _("Published under the GNU General Public License"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText93->Wrap( -1 );
+    bSizer162->Add( m_staticText93, 0, wxALL, 5 );
+
+    wxBoxSizer* bSizer1671;
+    bSizer1671 = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizer1671->Add( 0, 0, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bitmap13 = new wxStaticBitmap( m_panel41, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+    bSizer1671->Add( m_bitmap13, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    m_hyperlink5 = new wxHyperlinkCtrl( m_panel41, wxID_ANY, _("http://www.gnu.org/licenses/gpl.html"), wxT("http://www.gnu.org/licenses/gpl.html"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink5->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    bSizer1671->Add( m_hyperlink5, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer1671->Add( 0, 0, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer162->Add( bSizer1671, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+
+    m_panel41->SetSizer( bSizer162 );
+    m_panel41->Layout();
+    bSizer162->Fit( m_panel41 );
+    bSizer31->Add( m_panel41, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+    m_staticline36 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer31->Add( m_staticline36, 0, wxEXPAND, 5 );
+
+    m_buttonClose = new wxButton( this, wxID_OK, _("Close"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_buttonClose->SetDefault();
+    bSizer31->Add( m_buttonClose, 0, wxALL|wxALIGN_RIGHT, 5 );
+
+
+    this->SetSizer( bSizer31 );
+    this->Layout();
+    bSizer31->Fit( this );
+
+    this->Centre( wxBOTH );
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( AboutDlgGenerated::OnClose ) );
+    m_buttonDonate->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::OnDonate ), NULL, this );
+    m_buttonClose->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_buttonDonate->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::OnDonate ), NULL, this );
+    m_buttonClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::OnOK ), NULL, this );
+
 }
 
 MessageDlgGenerated::MessageDlgGenerated( 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( 300,160 ), wxDefaultSize );
-	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	wxBoxSizer* bSizer24;
-	bSizer24 = new wxBoxSizer( wxVERTICAL );
-	
-	
-	bSizer24->Add( 0, 10, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer26;
-	bSizer26 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapMsgType = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	bSizer26->Add( m_bitmapMsgType, 0, wxRIGHT|wxLEFT, 5 );
-	
-	m_textCtrlMessage = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 420,150 ), wxTE_MULTILINE|wxTE_READONLY|wxNO_BORDER );
-	m_textCtrlMessage->SetMaxLength( 0 ); 
-	bSizer26->Add( m_textCtrlMessage, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	
-	bSizer24->Add( bSizer26, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	m_staticline6 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer24->Add( m_staticline6, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_panel33 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panel33->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-	
-	wxBoxSizer* bSizer177;
-	bSizer177 = new wxBoxSizer( wxVERTICAL );
-	
-	m_checkBoxCustom = new wxCheckBox( m_panel33, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer177->Add( m_checkBoxCustom, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxRIGHT|wxLEFT, 5 );
-	
-	wxBoxSizer* bSizer25;
-	bSizer25 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_buttonCustom1 = new wxButton( m_panel33, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_buttonCustom1->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer25->Add( m_buttonCustom1, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_buttonCustom2 = new wxButton( m_panel33, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_buttonCustom2->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer25->Add( m_buttonCustom2, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_buttonCancel = new wxButton( m_panel33, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_buttonCancel->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer25->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	
-	bSizer177->Add( bSizer25, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	m_panel33->SetSizer( bSizer177 );
-	m_panel33->Layout();
-	bSizer177->Fit( m_panel33 );
-	bSizer24->Add( m_panel33, 0, wxEXPAND, 5 );
-	
-	
-	this->SetSizer( bSizer24 );
-	this->Layout();
-	bSizer24->Fit( this );
-	
-	this->Centre( wxBOTH );
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MessageDlgGenerated::OnClose ) );
-	m_buttonCustom1->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MessageDlgGenerated::OnButton1 ), NULL, this );
-	m_buttonCustom2->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MessageDlgGenerated::OnButton2 ), NULL, this );
-	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MessageDlgGenerated::OnCancel ), NULL, this );
+    this->SetSizeHints( wxSize( 300,160 ), wxDefaultSize );
+    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+    wxBoxSizer* bSizer24;
+    bSizer24 = new wxBoxSizer( wxVERTICAL );
+
+    m_panel33 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panel33->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    wxBoxSizer* bSizer165;
+    bSizer165 = new wxBoxSizer( wxVERTICAL );
+
+
+    bSizer165->Add( 0, 10, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer26;
+    bSizer26 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapMsgType = new wxStaticBitmap( m_panel33, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+    bSizer26->Add( m_bitmapMsgType, 0, wxRIGHT|wxLEFT, 5 );
+
+    m_textCtrlMessage = new wxTextCtrl( m_panel33, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 420,150 ), wxTE_MULTILINE|wxTE_READONLY|wxNO_BORDER );
+    m_textCtrlMessage->SetMaxLength( 0 );
+    bSizer26->Add( m_textCtrlMessage, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+
+    bSizer165->Add( bSizer26, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+
+    m_panel33->SetSizer( bSizer165 );
+    m_panel33->Layout();
+    bSizer165->Fit( m_panel33 );
+    bSizer24->Add( m_panel33, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+    m_staticline6 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer24->Add( m_staticline6, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    wxBoxSizer* bSizer177;
+    bSizer177 = new wxBoxSizer( wxVERTICAL );
+
+    m_checkBoxCustom = new wxCheckBox( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer177->Add( m_checkBoxCustom, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxRIGHT|wxLEFT, 5 );
+
+    wxBoxSizer* bSizer25;
+    bSizer25 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_buttonCustom1 = new wxButton( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    bSizer25->Add( m_buttonCustom1, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_buttonCustom2 = new wxButton( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    bSizer25->Add( m_buttonCustom2, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    bSizer25->Add( m_buttonCancel, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+
+    bSizer177->Add( bSizer25, 0, wxALIGN_RIGHT, 5 );
+
+
+    bSizer24->Add( bSizer177, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+
+    this->SetSizer( bSizer24 );
+    this->Layout();
+    bSizer24->Fit( this );
+
+    this->Centre( wxBOTH );
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MessageDlgGenerated::OnClose ) );
+    m_buttonCustom1->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MessageDlgGenerated::OnButton1 ), NULL, this );
+    m_buttonCustom2->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MessageDlgGenerated::OnButton2 ), NULL, this );
+    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MessageDlgGenerated::OnCancel ), NULL, this );
 }
 
 MessageDlgGenerated::~MessageDlgGenerated()
 {
-	// Disconnect Events
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MessageDlgGenerated::OnClose ) );
-	m_buttonCustom1->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MessageDlgGenerated::OnButton1 ), NULL, this );
-	m_buttonCustom2->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MessageDlgGenerated::OnButton2 ), NULL, this );
-	m_buttonCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MessageDlgGenerated::OnCancel ), NULL, this );
-	
+    // Disconnect Events
+    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MessageDlgGenerated::OnClose ) );
+    m_buttonCustom1->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MessageDlgGenerated::OnButton1 ), NULL, this );
+    m_buttonCustom2->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MessageDlgGenerated::OnButton2 ), NULL, this );
+    m_buttonCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MessageDlgGenerated::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( wxSize( 300,180 ), wxDefaultSize );
-	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	wxBoxSizer* bSizer24;
-	bSizer24 = new wxBoxSizer( wxVERTICAL );
-	
-	m_panelHeader = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panelHeader->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-	
-	wxBoxSizer* bSizer181;
-	bSizer181 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer41;
-	bSizer41 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapDeleteType = new wxStaticBitmap( m_panelHeader, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	bSizer41->Add( m_bitmapDeleteType, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_staticTextHeader = new wxStaticText( m_panelHeader, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextHeader->Wrap( -1 );
-	m_staticTextHeader->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer41->Add( m_staticTextHeader, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer181->Add( bSizer41, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
-	
-	
-	m_panelHeader->SetSizer( bSizer181 );
-	m_panelHeader->Layout();
-	bSizer181->Fit( m_panelHeader );
-	bSizer24->Add( m_panelHeader, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	m_staticline91 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer24->Add( m_staticline91, 0, wxEXPAND, 5 );
-	
-	m_textCtrlFileList = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 550,200 ), wxTE_DONTWRAP|wxTE_MULTILINE|wxTE_READONLY|wxNO_BORDER );
-	m_textCtrlFileList->SetMaxLength( 0 ); 
-	bSizer24->Add( m_textCtrlFileList, 1, wxEXPAND, 5 );
-	
-	m_staticline9 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer24->Add( m_staticline9, 0, wxEXPAND, 5 );
-	
-	m_panel36 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panel36->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-	
-	wxBoxSizer* bSizer180;
-	bSizer180 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer99;
-	bSizer99 = new wxBoxSizer( wxVERTICAL );
-	
-	m_checkBoxUseRecycler = new wxCheckBox( m_panel36, wxID_ANY, _("Recycle Bin"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer99->Add( m_checkBoxUseRecycler, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALL, 5 );
-	
-	m_checkBoxDeleteBothSides = new wxCheckBox( m_panel36, 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, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	
-	bSizer180->Add( bSizer99, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	wxBoxSizer* bSizer25;
-	bSizer25 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_buttonOK = new wxButton( m_panel36, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_buttonOK->SetDefault(); 
-	m_buttonOK->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer25->Add( m_buttonOK, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
-	
-	m_buttonCancel = new wxButton( m_panel36, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_buttonCancel->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer25->Add( m_buttonCancel, 0, wxALL, 5 );
-	
-	
-	bSizer180->Add( bSizer25, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	m_panel36->SetSizer( bSizer180 );
-	m_panel36->Layout();
-	bSizer180->Fit( m_panel36 );
-	bSizer24->Add( m_panel36, 0, wxEXPAND, 5 );
-	
-	
-	this->SetSizer( bSizer24 );
-	this->Layout();
-	bSizer24->Fit( this );
-	
-	this->Centre( wxBOTH );
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DeleteDlgGenerated::OnClose ) );
-	m_checkBoxUseRecycler->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnUseRecycler ), NULL, this );
-	m_checkBoxDeleteBothSides->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnDelOnBothSides ), NULL, this );
-	m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnOK ), NULL, this );
-	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnCancel ), NULL, this );
+    this->SetSizeHints( wxSize( 300,180 ), wxDefaultSize );
+    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+    wxBoxSizer* bSizer24;
+    bSizer24 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer41;
+    bSizer41 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapDeleteType = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+    bSizer41->Add( m_bitmapDeleteType, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    m_staticTextHeader = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextHeader->Wrap( -1 );
+    bSizer41->Add( m_staticTextHeader, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer24->Add( bSizer41, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+
+    m_staticline91 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer24->Add( m_staticline91, 0, wxEXPAND, 5 );
+
+    m_textCtrlFileList = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 550,200 ), wxTE_DONTWRAP|wxTE_MULTILINE|wxTE_READONLY|wxNO_BORDER );
+    m_textCtrlFileList->SetMaxLength( 0 );
+    bSizer24->Add( m_textCtrlFileList, 1, wxEXPAND, 5 );
+
+    m_staticline9 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer24->Add( m_staticline9, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer180;
+    bSizer180 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer99;
+    bSizer99 = new wxBoxSizer( wxVERTICAL );
+
+    m_checkBoxUseRecycler = new wxCheckBox( this, wxID_ANY, _("Recycle Bin"), wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer99->Add( m_checkBoxUseRecycler, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALL, 5 );
+
+    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, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+
+    bSizer180->Add( bSizer99, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 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( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer25->Add( m_buttonOK, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    bSizer25->Add( m_buttonCancel, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer180->Add( bSizer25, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer24->Add( bSizer180, 0, wxEXPAND, 5 );
+
+
+    this->SetSizer( bSizer24 );
+    this->Layout();
+    bSizer24->Fit( this );
+
+    this->Centre( wxBOTH );
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DeleteDlgGenerated::OnClose ) );
+    m_checkBoxUseRecycler->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnUseRecycler ), NULL, this );
+    m_checkBoxDeleteBothSides->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnDelOnBothSides ), 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_checkBoxUseRecycler->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnUseRecycler ), NULL, this );
-	m_checkBoxDeleteBothSides->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnDelOnBothSides ), 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_checkBoxUseRecycler->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnUseRecycler ), NULL, this );
+    m_checkBoxDeleteBothSides->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnDelOnBothSides ), NULL, this );
+    m_buttonOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnOK ), NULL, this );
+    m_buttonCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnCancel ), NULL, this );
+
 }
 
 FilterDlgGenerated::FilterDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-	this->SetSizeHints( wxSize( 500,300 ), wxDefaultSize );
-	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	wxBoxSizer* bSizer21;
-	bSizer21 = new wxBoxSizer( wxVERTICAL );
-	
-	m_panelHeader = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panelHeader->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-	
-	wxBoxSizer* bSizer72;
-	bSizer72 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmap26 = new wxStaticBitmap( m_panelHeader, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	bSizer72->Add( m_bitmap26, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	m_staticTextHeader = new wxStaticText( m_panelHeader, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextHeader->Wrap( -1 );
-	m_staticTextHeader->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer72->Add( m_staticTextHeader, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_staticText44 = new wxStaticText( m_panelHeader, wxID_ANY, _("Only files that match all filter settings will be synchronized.\nNote: File names must be relative to base directories!"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_staticText44->Wrap( 480 );
-	bSizer72->Add( m_staticText44, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-	
-	
-	bSizer72->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_bpButtonHelp = new wxBitmapButton( m_panelHeader, wxID_HELP, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	m_bpButtonHelp->SetToolTip( _("Help") );
-	
-	bSizer72->Add( m_bpButtonHelp, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	m_panelHeader->SetSizer( bSizer72 );
-	m_panelHeader->Layout();
-	bSizer72->Fit( m_panelHeader );
-	bSizer21->Add( m_panelHeader, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	m_staticline17 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer21->Add( m_staticline17, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer159;
-	bSizer159 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer166;
-	bSizer166 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText78 = new wxStaticText( this, wxID_ANY, _("Include"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText78->Wrap( -1 );
-	bSizer166->Add( m_staticText78, 0, wxALL, 5 );
-	
-	wxBoxSizer* bSizer1661;
-	bSizer1661 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapInclude = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), 0 );
-	bSizer1661->Add( m_bitmapInclude, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-	
-	m_textCtrlInclude = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE );
-	m_textCtrlInclude->SetMaxLength( 0 ); 
-	bSizer1661->Add( m_textCtrlInclude, 1, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	
-	bSizer166->Add( bSizer1661, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxLEFT, 5 );
-	
-	m_staticline22 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer166->Add( m_staticline22, 0, wxEXPAND, 5 );
-	
-	m_staticText77 = new wxStaticText( this, wxID_ANY, _("Exclude"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText77->Wrap( -1 );
-	bSizer166->Add( m_staticText77, 0, wxALL, 5 );
-	
-	wxBoxSizer* bSizer1651;
-	bSizer1651 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapExclude = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), 0 );
-	bSizer1651->Add( m_bitmapExclude, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_textCtrlExclude = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE );
-	m_textCtrlExclude->SetMaxLength( 0 ); 
-	bSizer1651->Add( m_textCtrlExclude, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	bSizer166->Add( bSizer1651, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxLEFT, 5 );
-	
-	
-	bSizer159->Add( bSizer166, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	m_staticline24 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-	bSizer159->Add( m_staticline24, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer160;
-	bSizer160 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText79 = new wxStaticText( this, wxID_ANY, _("Time span"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText79->Wrap( -1 );
-	bSizer160->Add( m_staticText79, 0, wxALL, 5 );
-	
-	wxBoxSizer* bSizer167;
-	bSizer167 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapFilterDate = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 34,34 ), 0 );
-	bSizer167->Add( m_bitmapFilterDate, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 );
-	
-	wxBoxSizer* bSizer165;
-	bSizer165 = new wxBoxSizer( wxVERTICAL );
-	
-	m_spinCtrlTimespan = new wxSpinCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
-	bSizer165->Add( m_spinCtrlTimespan, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	wxArrayString m_choiceUnitTimespanChoices;
-	m_choiceUnitTimespan = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitTimespanChoices, 0 );
-	m_choiceUnitTimespan->SetSelection( 0 );
-	bSizer165->Add( m_choiceUnitTimespan, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	
-	bSizer167->Add( bSizer165, 1, wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 );
-	
-	
-	bSizer160->Add( bSizer167, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-	
-	m_staticline23 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer160->Add( m_staticline23, 0, wxEXPAND, 5 );
-	
-	m_staticText80 = new wxStaticText( this, wxID_ANY, _("File size"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText80->Wrap( -1 );
-	bSizer160->Add( m_staticText80, 0, wxALL, 5 );
-	
-	wxBoxSizer* bSizer168;
-	bSizer168 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapFilterSize = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 32,32 ), 0 );
-	bSizer168->Add( m_bitmapFilterSize, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-	
-	wxBoxSizer* bSizer158;
-	bSizer158 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer162;
-	bSizer162 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText101 = new wxStaticText( this, wxID_ANY, _("Minimum"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText101->Wrap( -1 );
-	bSizer162->Add( m_staticText101, 0, wxBOTTOM, 2 );
-	
-	m_spinCtrlMinSize = new wxSpinCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
-	bSizer162->Add( m_spinCtrlMinSize, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	wxArrayString m_choiceUnitMinSizeChoices;
-	m_choiceUnitMinSize = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitMinSizeChoices, 0 );
-	m_choiceUnitMinSize->SetSelection( 0 );
-	bSizer162->Add( m_choiceUnitMinSize, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	
-	bSizer158->Add( bSizer162, 0, wxBOTTOM|wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer163;
-	bSizer163 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText102 = new wxStaticText( this, wxID_ANY, _("Maximum"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText102->Wrap( -1 );
-	bSizer163->Add( m_staticText102, 0, wxBOTTOM, 2 );
-	
-	m_spinCtrlMaxSize = new wxSpinCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
-	bSizer163->Add( m_spinCtrlMaxSize, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	wxArrayString m_choiceUnitMaxSizeChoices;
-	m_choiceUnitMaxSize = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitMaxSizeChoices, 0 );
-	m_choiceUnitMaxSize->SetSelection( 0 );
-	bSizer163->Add( m_choiceUnitMaxSize, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	
-	bSizer158->Add( bSizer163, 0, wxEXPAND, 5 );
-	
-	
-	bSizer168->Add( bSizer158, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer160->Add( bSizer168, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	
-	bSizer159->Add( bSizer160, 0, wxEXPAND, 5 );
-	
-	
-	bSizer21->Add( bSizer159, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	m_staticline16 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer21->Add( m_staticline16, 0, wxEXPAND, 5 );
-	
-	m_panel38 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panel38->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	m_panel38->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-	
-	wxBoxSizer* bSizer22;
-	bSizer22 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_button9 = new wxButton( m_panel38, wxID_DEFAULT, _("&Default"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_button9->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 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_buttonOk = new wxButton( m_panel38, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_buttonOk->SetDefault(); 
-	m_buttonOk->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer22->Add( m_buttonOk, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
-	
-	m_button17 = new wxButton( m_panel38, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_button17->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer22->Add( m_button17, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	
-	m_panel38->SetSizer( bSizer22 );
-	m_panel38->Layout();
-	bSizer22->Fit( m_panel38 );
-	bSizer21->Add( m_panel38, 0, wxEXPAND, 5 );
-	
-	
-	this->SetSizer( bSizer21 );
-	this->Layout();
-	bSizer21->Fit( this );
-	
-	this->Centre( wxBOTH );
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( FilterDlgGenerated::OnClose ) );
-	m_bpButtonHelp->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnHelp ), NULL, this );
-	m_textCtrlInclude->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateNameFilter ), NULL, this );
-	m_textCtrlExclude->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateNameFilter ), NULL, this );
-	m_choiceUnitTimespan->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateChoice ), NULL, this );
-	m_choiceUnitMinSize->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateChoice ), NULL, this );
-	m_choiceUnitMaxSize->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateChoice ), NULL, this );
-	m_button9->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnDefault ), NULL, this );
-	m_buttonOk->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnApply ), NULL, this );
-	m_button17->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnCancel ), NULL, this );
+    this->SetSizeHints( wxSize( 500,300 ), wxDefaultSize );
+    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+    wxBoxSizer* bSizer21;
+    bSizer21 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer72;
+    bSizer72 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmap26 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+    bSizer72->Add( m_bitmap26, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    m_staticTextHeader = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextHeader->Wrap( -1 );
+    m_staticTextHeader->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer72->Add( m_staticTextHeader, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    m_staticText44 = new wxStaticText( this, wxID_ANY, _("Only files that match all filter settings will be synchronized.\nNote: File names must be relative to base directories!"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+    m_staticText44->Wrap( 480 );
+    bSizer72->Add( m_staticText44, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+
+
+    bSizer72->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_bpButtonHelp = new wxBitmapButton( this, wxID_HELP, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
+    m_bpButtonHelp->SetToolTip( _("Help") );
+
+    bSizer72->Add( m_bpButtonHelp, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer21->Add( bSizer72, 0, wxEXPAND, 5 );
+
+    m_staticline17 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer21->Add( m_staticline17, 0, wxEXPAND, 5 );
+
+    m_panel38 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panel38->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    wxBoxSizer* bSizer159;
+    bSizer159 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer166;
+    bSizer166 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText78 = new wxStaticText( m_panel38, wxID_ANY, _("Include"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText78->Wrap( -1 );
+    bSizer166->Add( m_staticText78, 0, wxALL, 5 );
+
+    wxBoxSizer* bSizer1661;
+    bSizer1661 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapInclude = new wxStaticBitmap( m_panel38, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), 0 );
+    bSizer1661->Add( m_bitmapInclude, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+
+    m_textCtrlInclude = new wxTextCtrl( m_panel38, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE );
+    m_textCtrlInclude->SetMaxLength( 0 );
+    bSizer1661->Add( m_textCtrlInclude, 1, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+
+    bSizer166->Add( bSizer1661, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxLEFT, 5 );
+
+    m_staticline22 = new wxStaticLine( m_panel38, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer166->Add( m_staticline22, 0, wxEXPAND, 5 );
+
+    m_staticText77 = new wxStaticText( m_panel38, wxID_ANY, _("Exclude"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText77->Wrap( -1 );
+    bSizer166->Add( m_staticText77, 0, wxALL, 5 );
+
+    wxBoxSizer* bSizer1651;
+    bSizer1651 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapExclude = new wxStaticBitmap( m_panel38, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), 0 );
+    bSizer1651->Add( m_bitmapExclude, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_textCtrlExclude = new wxTextCtrl( m_panel38, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE );
+    m_textCtrlExclude->SetMaxLength( 0 );
+    bSizer1651->Add( m_textCtrlExclude, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    bSizer166->Add( bSizer1651, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxLEFT, 5 );
+
+
+    bSizer159->Add( bSizer166, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    m_staticline24 = new wxStaticLine( m_panel38, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    bSizer159->Add( m_staticline24, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer160;
+    bSizer160 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText79 = new wxStaticText( m_panel38, wxID_ANY, _("Time span"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText79->Wrap( -1 );
+    bSizer160->Add( m_staticText79, 0, wxALL, 5 );
+
+    wxBoxSizer* bSizer167;
+    bSizer167 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapFilterDate = new wxStaticBitmap( m_panel38, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 34,34 ), 0 );
+    bSizer167->Add( m_bitmapFilterDate, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 );
+
+    wxBoxSizer* bSizer165;
+    bSizer165 = new wxBoxSizer( wxVERTICAL );
+
+    m_spinCtrlTimespan = new wxSpinCtrl( m_panel38, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
+    bSizer165->Add( m_spinCtrlTimespan, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    wxArrayString m_choiceUnitTimespanChoices;
+    m_choiceUnitTimespan = new wxChoice( m_panel38, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitTimespanChoices, 0 );
+    m_choiceUnitTimespan->SetSelection( 0 );
+    bSizer165->Add( m_choiceUnitTimespan, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+
+    bSizer167->Add( bSizer165, 1, wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 );
+
+
+    bSizer160->Add( bSizer167, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+
+    m_staticline23 = new wxStaticLine( m_panel38, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer160->Add( m_staticline23, 0, wxEXPAND, 5 );
+
+    m_staticText80 = new wxStaticText( m_panel38, wxID_ANY, _("File size"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText80->Wrap( -1 );
+    bSizer160->Add( m_staticText80, 0, wxALL, 5 );
+
+    wxBoxSizer* bSizer168;
+    bSizer168 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapFilterSize = new wxStaticBitmap( m_panel38, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 32,32 ), 0 );
+    bSizer168->Add( m_bitmapFilterSize, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+
+    wxBoxSizer* bSizer158;
+    bSizer158 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer162;
+    bSizer162 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText101 = new wxStaticText( m_panel38, wxID_ANY, _("Minimum"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText101->Wrap( -1 );
+    bSizer162->Add( m_staticText101, 0, wxBOTTOM, 2 );
+
+    m_spinCtrlMinSize = new wxSpinCtrl( m_panel38, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
+    bSizer162->Add( m_spinCtrlMinSize, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    wxArrayString m_choiceUnitMinSizeChoices;
+    m_choiceUnitMinSize = new wxChoice( m_panel38, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitMinSizeChoices, 0 );
+    m_choiceUnitMinSize->SetSelection( 0 );
+    bSizer162->Add( m_choiceUnitMinSize, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+
+    bSizer158->Add( bSizer162, 0, wxBOTTOM|wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer163;
+    bSizer163 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText102 = new wxStaticText( m_panel38, wxID_ANY, _("Maximum"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText102->Wrap( -1 );
+    bSizer163->Add( m_staticText102, 0, wxBOTTOM, 2 );
+
+    m_spinCtrlMaxSize = new wxSpinCtrl( m_panel38, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
+    bSizer163->Add( m_spinCtrlMaxSize, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    wxArrayString m_choiceUnitMaxSizeChoices;
+    m_choiceUnitMaxSize = new wxChoice( m_panel38, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitMaxSizeChoices, 0 );
+    m_choiceUnitMaxSize->SetSelection( 0 );
+    bSizer163->Add( m_choiceUnitMaxSize, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+
+    bSizer158->Add( bSizer163, 0, wxEXPAND, 5 );
+
+
+    bSizer168->Add( bSizer158, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer160->Add( bSizer168, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+
+    bSizer159->Add( bSizer160, 0, wxEXPAND, 5 );
+
+
+    m_panel38->SetSizer( bSizer159 );
+    m_panel38->Layout();
+    bSizer159->Fit( m_panel38 );
+    bSizer21->Add( m_panel38, 1, wxEXPAND, 5 );
+
+    m_staticline16 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer21->Add( m_staticline16, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer22;
+    bSizer22 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_button9 = new wxButton( this, wxID_DEFAULT, _("&Default"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    bSizer22->Add( m_button9, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer22->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_buttonOk = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_buttonOk->SetDefault();
+    m_buttonOk->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer22->Add( m_buttonOk, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+    m_button17 = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    bSizer22->Add( m_button17, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+
+    bSizer21->Add( bSizer22, 0, wxEXPAND, 5 );
+
+
+    this->SetSizer( bSizer21 );
+    this->Layout();
+    bSizer21->Fit( this );
+
+    this->Centre( wxBOTH );
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( FilterDlgGenerated::OnClose ) );
+    m_bpButtonHelp->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnHelp ), NULL, this );
+    m_textCtrlInclude->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateNameFilter ), NULL, this );
+    m_textCtrlExclude->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateNameFilter ), NULL, this );
+    m_choiceUnitTimespan->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateChoice ), NULL, this );
+    m_choiceUnitMinSize->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateChoice ), NULL, this );
+    m_choiceUnitMaxSize->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateChoice ), NULL, this );
+    m_button9->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnDefault ), NULL, this );
+    m_buttonOk->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnApply ), NULL, this );
+    m_button17->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnCancel ), NULL, this );
 }
 
 FilterDlgGenerated::~FilterDlgGenerated()
 {
-	// Disconnect Events
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( FilterDlgGenerated::OnClose ) );
-	m_bpButtonHelp->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnHelp ), NULL, this );
-	m_textCtrlInclude->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateNameFilter ), NULL, this );
-	m_textCtrlExclude->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateNameFilter ), NULL, this );
-	m_choiceUnitTimespan->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateChoice ), NULL, this );
-	m_choiceUnitMinSize->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateChoice ), NULL, this );
-	m_choiceUnitMaxSize->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateChoice ), NULL, this );
-	m_button9->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnDefault ), NULL, this );
-	m_buttonOk->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnApply ), NULL, this );
-	m_button17->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnCancel ), NULL, this );
-	
+    // Disconnect Events
+    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( FilterDlgGenerated::OnClose ) );
+    m_bpButtonHelp->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnHelp ), NULL, this );
+    m_textCtrlInclude->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateNameFilter ), NULL, this );
+    m_textCtrlExclude->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateNameFilter ), NULL, this );
+    m_choiceUnitTimespan->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateChoice ), NULL, this );
+    m_choiceUnitMinSize->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateChoice ), NULL, this );
+    m_choiceUnitMaxSize->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateChoice ), NULL, this );
+    m_button9->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnDefault ), NULL, this );
+    m_buttonOk->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnApply ), NULL, this );
+    m_button17->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::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( 320,360 ), wxDefaultSize );
-	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	wxBoxSizer* bSizer95;
-	bSizer95 = new wxBoxSizer( wxVERTICAL );
-	
-	m_panelHeader = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panelHeader->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-	
-	wxBoxSizer* bSizer72;
-	bSizer72 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapSettings = new wxStaticBitmap( m_panelHeader, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	bSizer72->Add( m_bitmapSettings, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	m_staticTextHeader = new wxStaticText( m_panelHeader, wxID_ANY, _("Global settings"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextHeader->Wrap( -1 );
-	m_staticTextHeader->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer72->Add( m_staticTextHeader, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	m_panelHeader->SetSizer( bSizer72 );
-	m_panelHeader->Layout();
-	bSizer72->Fit( m_panelHeader );
-	bSizer95->Add( m_panelHeader, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	m_staticline19 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer95->Add( m_staticline19, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer160;
-	bSizer160 = new wxBoxSizer( wxVERTICAL );
-	
-	m_checkBoxTransCopy = new wxCheckBox( this, wxID_ANY, _("Fail-safe file copy"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer160->Add( m_checkBoxTransCopy, 0, wxALL|wxEXPAND, 5 );
-	
-	m_staticText82 = new wxStaticText( this, wxID_ANY, _("Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText82->Wrap( 420 );
-	m_staticText82->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
-	
-	bSizer160->Add( m_staticText82, 0, wxRIGHT|wxLEFT|wxEXPAND, 20 );
-	
-	m_checkBoxCopyLocked = new wxCheckBox( this, wxID_ANY, _("Copy locked files"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer160->Add( m_checkBoxCopyLocked, 0, wxALL|wxEXPAND, 5 );
-	
-	m_staticTextCopyLocked = new wxStaticText( this, wxID_ANY, _("Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextCopyLocked->Wrap( 420 );
-	m_staticTextCopyLocked->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
-	
-	bSizer160->Add( m_staticTextCopyLocked, 0, wxEXPAND|wxRIGHT|wxLEFT, 20 );
-	
-	m_checkBoxCopyPermissions = new wxCheckBox( this, wxID_ANY, _("Copy file access permissions"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer160->Add( m_checkBoxCopyPermissions, 0, wxALL|wxEXPAND, 5 );
-	
-	m_staticText8211 = new wxStaticText( this, wxID_ANY, _("Transfer file and folder permissions (Requires Administrator rights)"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText8211->Wrap( 420 );
-	m_staticText8211->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
-	
-	bSizer160->Add( m_staticText8211, 0, wxEXPAND|wxRIGHT|wxLEFT, 20 );
-	
-	
-	bSizer95->Add( bSizer160, 0, wxEXPAND|wxALL, 5 );
-	
-	m_staticline191 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer95->Add( m_staticline191, 0, wxEXPAND|wxTOP, 5 );
-	
-	m_buttonResetDialogs = new zen::BitmapButton( this, wxID_ANY, _("Restore hidden dialogs"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_buttonResetDialogs->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer95->Add( m_buttonResetDialogs, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
-	
-	m_staticline192 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer95->Add( m_staticline192, 0, wxEXPAND, 5 );
-	
-	m_staticText85 = new wxStaticText( this, wxID_ANY, _("External applications"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText85->Wrap( -1 );
-	bSizer95->Add( m_staticText85, 0, wxALL, 5 );
-	
-	wxBoxSizer* bSizer173;
-	bSizer173 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer157;
-	bSizer157 = new wxBoxSizer( wxVERTICAL );
-	
-	m_bpButtonAddRow = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 25,25 ), wxBU_AUTODRAW );
-	bSizer157->Add( m_bpButtonAddRow, 0, 0, 5 );
-	
-	m_bpButtonRemoveRow = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 25,25 ), wxBU_AUTODRAW );
-	bSizer157->Add( m_bpButtonRemoveRow, 0, 0, 5 );
-	
-	
-	bSizer173->Add( bSizer157, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 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, 165 );
-	m_gridCustomCommand->SetColSize( 1, 196 );
-	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( 1 );
-	m_gridCustomCommand->SetRowLabelAlignment( wxALIGN_LEFT, wxALIGN_CENTRE );
-	
-	// Label Appearance
-	
-	// Cell Defaults
-	m_gridCustomCommand->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
-	bSizer173->Add( m_gridCustomCommand, 1, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	
-	bSizer95->Add( bSizer173, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_staticline20 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer95->Add( m_staticline20, 0, wxEXPAND, 5 );
-	
-	m_panel39 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panel39->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-	
-	wxBoxSizer* bSizer97;
-	bSizer97 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_button9 = new wxButton( m_panel39, wxID_DEFAULT, _("&Default"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_button9->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer97->Add( m_button9, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer97->Add( 0, 0, 1, 0, 5 );
-	
-	m_buttonOkay = new wxButton( m_panel39, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_buttonOkay->SetDefault(); 
-	m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer97->Add( m_buttonOkay, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_button29 = new wxButton( m_panel39, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_button29->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer97->Add( m_button29, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	m_panel39->SetSizer( bSizer97 );
-	m_panel39->Layout();
-	bSizer97->Fit( m_panel39 );
-	bSizer95->Add( m_panel39, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	this->SetSizer( bSizer95 );
-	this->Layout();
-	bSizer95->Fit( this );
-	
-	this->Centre( wxBOTH );
-	
-	// 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( 320,360 ), wxDefaultSize );
+    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+    wxBoxSizer* bSizer95;
+    bSizer95 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer72;
+    bSizer72 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapSettings = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), 0 );
+    bSizer72->Add( m_bitmapSettings, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    m_staticTextHeader = new wxStaticText( this, wxID_ANY, _("Global settings"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextHeader->Wrap( -1 );
+    m_staticTextHeader->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer72->Add( m_staticTextHeader, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer95->Add( bSizer72, 0, 0, 5 );
+
+    m_staticline19 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer95->Add( m_staticline19, 0, wxEXPAND, 5 );
+
+    m_panel39 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panel39->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    wxBoxSizer* bSizer166;
+    bSizer166 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer160;
+    bSizer160 = new wxBoxSizer( wxVERTICAL );
+
+    m_checkBoxTransCopy = new wxCheckBox( m_panel39, wxID_ANY, _("Fail-safe file copy"), wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer160->Add( m_checkBoxTransCopy, 0, wxALL|wxEXPAND, 5 );
+
+    m_staticText82 = new wxStaticText( m_panel39, wxID_ANY, _("Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error."), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText82->Wrap( 460 );
+    m_staticText82->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+
+    bSizer160->Add( m_staticText82, 0, wxRIGHT|wxLEFT|wxEXPAND, 20 );
+
+    m_checkBoxCopyLocked = new wxCheckBox( m_panel39, wxID_ANY, _("Copy locked files"), wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer160->Add( m_checkBoxCopyLocked, 0, wxALL|wxEXPAND, 5 );
+
+    m_staticTextCopyLocked = new wxStaticText( m_panel39, wxID_ANY, _("Copy shared or locked files using Volume Shadow Copy Service (Requires Administrator rights)"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextCopyLocked->Wrap( 460 );
+    m_staticTextCopyLocked->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+
+    bSizer160->Add( m_staticTextCopyLocked, 0, wxEXPAND|wxRIGHT|wxLEFT, 20 );
+
+    m_checkBoxCopyPermissions = new wxCheckBox( m_panel39, wxID_ANY, _("Copy file access permissions"), wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer160->Add( m_checkBoxCopyPermissions, 0, wxALL|wxEXPAND, 5 );
+
+    m_staticText8211 = new wxStaticText( m_panel39, wxID_ANY, _("Transfer file and folder permissions (Requires Administrator rights)"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText8211->Wrap( 460 );
+    m_staticText8211->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+
+    bSizer160->Add( m_staticText8211, 0, wxEXPAND|wxRIGHT|wxLEFT, 20 );
+
+
+    bSizer166->Add( bSizer160, 0, wxALL|wxEXPAND, 5 );
+
+    m_staticline191 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer166->Add( m_staticline191, 0, wxEXPAND|wxTOP, 5 );
+
+    m_buttonResetDialogs = new zen::BitmapButton( m_panel39, wxID_ANY, _("Restore hidden dialogs"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+    bSizer166->Add( m_buttonResetDialogs, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+
+    m_staticline192 = new wxStaticLine( m_panel39, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer166->Add( m_staticline192, 0, wxEXPAND, 5 );
+
+    m_staticText85 = new wxStaticText( m_panel39, wxID_ANY, _("External applications"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText85->Wrap( -1 );
+    bSizer166->Add( m_staticText85, 0, wxALL, 5 );
+
+    wxBoxSizer* bSizer173;
+    bSizer173 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer157;
+    bSizer157 = new wxBoxSizer( wxVERTICAL );
+
+    m_bpButtonAddRow = new wxBitmapButton( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 25,25 ), wxBU_AUTODRAW );
+    bSizer157->Add( m_bpButtonAddRow, 0, 0, 5 );
+
+    m_bpButtonRemoveRow = new wxBitmapButton( m_panel39, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 25,25 ), wxBU_AUTODRAW );
+    bSizer157->Add( m_bpButtonRemoveRow, 0, 0, 5 );
+
+
+    bSizer173->Add( bSizer157, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 5 );
+
+    m_gridCustomCommand = new wxGrid( m_panel39, 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, 165 );
+    m_gridCustomCommand->SetColSize( 1, 196 );
+    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( 1 );
+    m_gridCustomCommand->SetRowLabelAlignment( wxALIGN_LEFT, wxALIGN_CENTRE );
+
+    // Label Appearance
+
+    // Cell Defaults
+    m_gridCustomCommand->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+    bSizer173->Add( m_gridCustomCommand, 1, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+
+    bSizer166->Add( bSizer173, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    m_panel39->SetSizer( bSizer166 );
+    m_panel39->Layout();
+    bSizer166->Fit( m_panel39 );
+    bSizer95->Add( m_panel39, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+    m_staticline20 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer95->Add( m_staticline20, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer97;
+    bSizer97 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_button9 = new wxButton( this, wxID_DEFAULT, _("&Default"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    bSizer97->Add( m_button9, 0, wxALL|wxALIGN_CENTER_VERTICAL, 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( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer97->Add( m_buttonOkay, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_button29 = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    bSizer97->Add( m_button29, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer95->Add( bSizer97, 0, wxEXPAND, 5 );
+
+
+    this->SetSizer( bSizer95 );
+    this->Layout();
+    bSizer95->Fit( this );
+
+    this->Centre( wxBOTH );
+
+    // 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 );
-	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	wxBoxSizer* bSizer134;
-	bSizer134 = new wxBoxSizer( wxVERTICAL );
-	
-	m_panelHeader = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panelHeader->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-	
-	wxBoxSizer* bSizer158;
-	bSizer158 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_buttonStartSync = new zen::BitmapButton( m_panelHeader, wxID_OK, _("Start"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_buttonStartSync->SetDefault(); 
-	m_buttonStartSync->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	m_buttonStartSync->SetToolTip( _("Start synchronization") );
-	
-	bSizer158->Add( m_buttonStartSync, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	m_staticline16 = new wxStaticLine( m_panelHeader, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-	bSizer158->Add( m_staticline16, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer172;
-	bSizer172 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText84 = new wxStaticText( m_panelHeader, wxID_ANY, _("Variant"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText84->Wrap( -1 );
-	bSizer172->Add( m_staticText84, 0, wxALL, 5 );
-	
-	m_staticTextVariant = new wxStaticText( m_panelHeader, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextVariant->Wrap( -1 );
-	m_staticTextVariant->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer172->Add( m_staticTextVariant, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	
-	bSizer158->Add( bSizer172, 1, 0, 5 );
-	
-	
-	m_panelHeader->SetSizer( bSizer158 );
-	m_panelHeader->Layout();
-	bSizer158->Fit( m_panelHeader );
-	bSizer134->Add( m_panelHeader, 0, wxEXPAND, 5 );
-	
-	m_staticline14 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer134->Add( m_staticline14, 0, wxEXPAND, 5 );
-	
-	m_staticText83 = new wxStaticText( this, wxID_ANY, _("Statistics"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText83->Wrap( -1 );
-	bSizer134->Add( m_staticText83, 0, wxALL, 5 );
-	
-	wxFlexGridSizer* fgSizer11;
-	fgSizer11 = new wxFlexGridSizer( 2, 7, 2, 5 );
-	fgSizer11->SetFlexibleDirection( wxBOTH );
-	fgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	m_bitmapCreateLeft = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_bitmapCreateLeft->SetToolTip( _("Number of files and folders that will be created") );
-	
-	fgSizer11->Add( m_bitmapCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bitmapUpdateLeft = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_bitmapUpdateLeft->SetToolTip( _("Number of files that will be overwritten") );
-	
-	fgSizer11->Add( m_bitmapUpdateLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bitmapDeleteLeft = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_bitmapDeleteLeft->SetToolTip( _("Number of files and folders that will be deleted") );
-	
-	fgSizer11->Add( m_bitmapDeleteLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bitmapData = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_bitmapData->SetToolTip( _("Total bytes to copy") );
-	
-	fgSizer11->Add( m_bitmapData, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bitmapDeleteRight = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_bitmapDeleteRight->SetToolTip( _("Number of files and folders that will be deleted") );
-	
-	fgSizer11->Add( m_bitmapDeleteRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bitmapUpdateRight = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_bitmapUpdateRight->SetToolTip( _("Number of files that will be overwritten") );
-	
-	fgSizer11->Add( m_bitmapUpdateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bitmapCreateRight = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_bitmapCreateRight->SetToolTip( _("Number of files and folders that will be created") );
-	
-	fgSizer11->Add( m_bitmapCreateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_staticTextCreateLeft = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextCreateLeft->Wrap( -1 );
-	m_staticTextCreateLeft->SetToolTip( _("Number of files and folders that will be created") );
-	
-	fgSizer11->Add( m_staticTextCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_staticTextUpdateLeft = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextUpdateLeft->Wrap( -1 );
-	m_staticTextUpdateLeft->SetToolTip( _("Number of files that will be overwritten") );
-	
-	fgSizer11->Add( m_staticTextUpdateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_staticTextDeleteLeft = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextDeleteLeft->Wrap( -1 );
-	m_staticTextDeleteLeft->SetToolTip( _("Number of files and folders that will be deleted") );
-	
-	fgSizer11->Add( m_staticTextDeleteLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticTextData = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextData->Wrap( -1 );
-	m_staticTextData->SetToolTip( _("Total bytes to copy") );
-	
-	fgSizer11->Add( m_staticTextData, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticTextDeleteRight = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextDeleteRight->Wrap( -1 );
-	m_staticTextDeleteRight->SetToolTip( _("Number of files and folders that will be deleted") );
-	
-	fgSizer11->Add( m_staticTextDeleteRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticTextUpdateRight = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextUpdateRight->Wrap( -1 );
-	m_staticTextUpdateRight->SetToolTip( _("Number of files that will be overwritten") );
-	
-	fgSizer11->Add( m_staticTextUpdateRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticTextCreateRight = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextCreateRight->Wrap( -1 );
-	m_staticTextCreateRight->SetToolTip( _("Number of files and folders that will be created") );
-	
-	fgSizer11->Add( m_staticTextCreateRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer134->Add( fgSizer11, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_staticline12 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer134->Add( m_staticline12, 0, wxEXPAND, 5 );
-	
-	m_panel42 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panel42->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-	
-	wxBoxSizer* bSizer142;
-	bSizer142 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_checkBoxDontShowAgain = new wxCheckBox( m_panel42, wxID_ANY, _("Don't show this dialog again"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer142->Add( m_checkBoxDontShowAgain, 1, wxALIGN_CENTER_HORIZONTAL|wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_button16 = new wxButton( m_panel42, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_button16->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer142->Add( m_button16, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
-	
-	
-	m_panel42->SetSizer( bSizer142 );
-	m_panel42->Layout();
-	bSizer142->Fit( m_panel42 );
-	bSizer134->Add( m_panel42, 0, wxEXPAND, 5 );
-	
-	
-	this->SetSizer( bSizer134 );
-	this->Layout();
-	bSizer134->Fit( this );
-	
-	this->Centre( wxBOTH );
-	
-	// 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 );
+    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+    wxBoxSizer* bSizer134;
+    bSizer134 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer158;
+    bSizer158 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_buttonStartSync = new zen::BitmapButton( this, wxID_OK, _("Start"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+    m_buttonStartSync->SetDefault();
+    m_buttonStartSync->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+    m_buttonStartSync->SetToolTip( _("Start synchronization") );
+
+    bSizer158->Add( m_buttonStartSync, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    m_staticline16 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    bSizer158->Add( m_staticline16, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer172;
+    bSizer172 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText84 = new wxStaticText( this, wxID_ANY, _("Variant"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText84->Wrap( -1 );
+    bSizer172->Add( m_staticText84, 0, wxALL, 5 );
+
+    m_staticTextVariant = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextVariant->Wrap( -1 );
+    m_staticTextVariant->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer172->Add( m_staticTextVariant, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+
+    bSizer158->Add( bSizer172, 1, 0, 5 );
+
+
+    bSizer134->Add( bSizer158, 0, wxEXPAND, 5 );
+
+    m_staticline14 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer134->Add( m_staticline14, 0, wxEXPAND, 5 );
+
+    m_panelStatistics = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panelStatistics->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    wxBoxSizer* bSizer169;
+    bSizer169 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText83 = new wxStaticText( m_panelStatistics, wxID_ANY, _("Statistics"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText83->Wrap( -1 );
+    bSizer169->Add( m_staticText83, 0, wxALL, 5 );
+
+    wxFlexGridSizer* fgSizer11;
+    fgSizer11 = new wxFlexGridSizer( 2, 7, 2, 5 );
+    fgSizer11->SetFlexibleDirection( wxBOTH );
+    fgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    m_bitmapCreateLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    m_bitmapCreateLeft->SetToolTip( _("Number of files and folders that will be created") );
+
+    fgSizer11->Add( m_bitmapCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bitmapUpdateLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    m_bitmapUpdateLeft->SetToolTip( _("Number of files that will be overwritten") );
+
+    fgSizer11->Add( m_bitmapUpdateLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bitmapDeleteLeft = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    m_bitmapDeleteLeft->SetToolTip( _("Number of files and folders that will be deleted") );
+
+    fgSizer11->Add( m_bitmapDeleteLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bitmapData = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    m_bitmapData->SetToolTip( _("Total bytes to copy") );
+
+    fgSizer11->Add( m_bitmapData, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bitmapDeleteRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    m_bitmapDeleteRight->SetToolTip( _("Number of files and folders that will be deleted") );
+
+    fgSizer11->Add( m_bitmapDeleteRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bitmapUpdateRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    m_bitmapUpdateRight->SetToolTip( _("Number of files that will be overwritten") );
+
+    fgSizer11->Add( m_bitmapUpdateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bitmapCreateRight = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    m_bitmapCreateRight->SetToolTip( _("Number of files and folders that will be created") );
+
+    fgSizer11->Add( m_bitmapCreateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_staticTextCreateLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextCreateLeft->Wrap( -1 );
+    m_staticTextCreateLeft->SetToolTip( _("Number of files and folders that will be created") );
+
+    fgSizer11->Add( m_staticTextCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_staticTextUpdateLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextUpdateLeft->Wrap( -1 );
+    m_staticTextUpdateLeft->SetToolTip( _("Number of files that will be overwritten") );
+
+    fgSizer11->Add( m_staticTextUpdateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_staticTextDeleteLeft = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextDeleteLeft->Wrap( -1 );
+    m_staticTextDeleteLeft->SetToolTip( _("Number of files and folders that will be deleted") );
+
+    fgSizer11->Add( m_staticTextDeleteLeft, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticTextData = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextData->Wrap( -1 );
+    m_staticTextData->SetToolTip( _("Total bytes to copy") );
+
+    fgSizer11->Add( m_staticTextData, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticTextDeleteRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextDeleteRight->Wrap( -1 );
+    m_staticTextDeleteRight->SetToolTip( _("Number of files and folders that will be deleted") );
+
+    fgSizer11->Add( m_staticTextDeleteRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticTextUpdateRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextUpdateRight->Wrap( -1 );
+    m_staticTextUpdateRight->SetToolTip( _("Number of files that will be overwritten") );
+
+    fgSizer11->Add( m_staticTextUpdateRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticTextCreateRight = new wxStaticText( m_panelStatistics, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextCreateRight->Wrap( -1 );
+    m_staticTextCreateRight->SetToolTip( _("Number of files and folders that will be created") );
+
+    fgSizer11->Add( m_staticTextCreateRight, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer169->Add( fgSizer11, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    m_panelStatistics->SetSizer( bSizer169 );
+    m_panelStatistics->Layout();
+    bSizer169->Fit( m_panelStatistics );
+    bSizer134->Add( m_panelStatistics, 0, wxEXPAND, 5 );
+
+    m_staticline12 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer134->Add( m_staticline12, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer142;
+    bSizer142 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_checkBoxDontShowAgain = new wxCheckBox( this, wxID_ANY, _("Don't show this dialog again"), wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer142->Add( m_checkBoxDontShowAgain, 1, wxALIGN_CENTER_HORIZONTAL|wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_button16 = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    bSizer142->Add( m_button16, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+
+
+    bSizer134->Add( bSizer142, 0, wxEXPAND, 5 );
+
+
+    this->SetSizer( bSizer134 );
+    this->Layout();
+    bSizer134->Fit( this );
+
+    this->Centre( wxBOTH );
+
+    // 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 )
+PopupDialogGenerated::PopupDialogGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-	
-	wxBoxSizer* bSizer158;
-	bSizer158 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapLeft = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer158->Add( m_bitmapLeft, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticTextMain = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextMain->Wrap( 600 );
-	bSizer158->Add( m_staticTextMain, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	this->SetSizer( bSizer158 );
-	this->Layout();
-	bSizer158->Fit( this );
+    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+
+    wxBoxSizer* bSizer158;
+    bSizer158 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapLeft = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer158->Add( m_bitmapLeft, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticTextMain = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextMain->Wrap( 600 );
+    bSizer158->Add( m_staticTextMain, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    this->SetSizer( bSizer158 );
+    this->Layout();
+    bSizer158->Fit( this );
 }
 
-PopupFrameGenerated1::~PopupFrameGenerated1()
+PopupDialogGenerated::~PopupDialogGenerated()
 {
 }
 
 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 );
-	m_textCtrlSearchTxt->SetMaxLength( 0 ); 
-	bSizer162->Add( m_textCtrlSearchTxt, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer166->Add( bSizer162, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	
-	bSizer166->Add( 0, 5, 0, 0, 5 );
-	
-	m_checkBoxMatchCase = new wxCheckBox( this, wxID_ANY, _("Match case"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer166->Add( m_checkBoxMatchCase, 0, wxALL|wxEXPAND, 5 );
-	
-	
-	bSizer161->Add( bSizer166, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer97;
-	bSizer97 = new wxBoxSizer( wxVERTICAL );
-	
-	m_buttonFindNext = new wxButton( this, wxID_OK, _("&Find next"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_buttonFindNext->SetDefault(); 
-	m_buttonFindNext->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer97->Add( m_buttonFindNext, 0, wxEXPAND|wxTOP|wxRIGHT, 5 );
-	
-	m_button29 = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_button29->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer97->Add( m_button29, 0, wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-	
-	
-	bSizer161->Add( bSizer97, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	this->SetSizer( bSizer161 );
-	this->Layout();
-	bSizer161->Fit( this );
-	
-	this->Centre( wxBOTH );
-	
-	// 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 );
+    m_textCtrlSearchTxt->SetMaxLength( 0 );
+    bSizer162->Add( m_textCtrlSearchTxt, 1, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+
+    bSizer166->Add( bSizer162, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+
+    bSizer166->Add( 0, 5, 0, 0, 5 );
+
+    m_checkBoxMatchCase = new wxCheckBox( this, wxID_ANY, _("Match case"), wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer166->Add( m_checkBoxMatchCase, 0, wxEXPAND|wxALL, 5 );
+
+
+    bSizer161->Add( bSizer166, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer97;
+    bSizer97 = new wxBoxSizer( wxVERTICAL );
+
+    m_buttonFindNext = new wxButton( this, wxID_OK, _("&Find next"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_buttonFindNext->SetDefault();
+    m_buttonFindNext->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer97->Add( m_buttonFindNext, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
+
+    m_button29 = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    bSizer97->Add( m_button29, 0, wxEXPAND|wxALL, 5 );
+
+
+    bSizer161->Add( bSizer97, 0, 0, 5 );
+
+
+    this->SetSizer( bSizer161 );
+    this->Layout();
+    bSizer161->Fit( this );
+
+    this->Centre( wxBOTH );
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SearchDialogGenerated::OnClose ) );
+    m_textCtrlSearchTxt->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( SearchDialogGenerated::OnText ), NULL, this );
+    m_buttonFindNext->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SearchDialogGenerated::OnFindNext ), NULL, this );
+    m_button29->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SearchDialogGenerated::OnCancel ), NULL, this );
 }
 
 SearchDialogGenerated::~SearchDialogGenerated()
 {
-	// Disconnect Events
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SearchDialogGenerated::OnClose ) );
-	m_textCtrlSearchTxt->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( SearchDialogGenerated::OnText ), NULL, this );
-	m_buttonFindNext->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SearchDialogGenerated::OnFindNext ), NULL, this );
-	m_button29->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SearchDialogGenerated::OnCancel ), NULL, this );
-	
+    // Disconnect Events
+    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SearchDialogGenerated::OnClose ) );
+    m_textCtrlSearchTxt->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( SearchDialogGenerated::OnText ), NULL, this );
+    m_buttonFindNext->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SearchDialogGenerated::OnFindNext ), NULL, this );
+    m_button29->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SearchDialogGenerated::OnCancel ), NULL, this );
+
 }
 
 SelectTimespanDlgGenerated::SelectTimespanDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	
-	wxBoxSizer* bSizer96;
-	bSizer96 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer98;
-	bSizer98 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_calendarFrom = new wxCalendarCtrl( this, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxCAL_SHOW_HOLIDAYS );
-	bSizer98->Add( m_calendarFrom, 0, wxALL, 5 );
-	
-	m_calendarTo = new wxCalendarCtrl( this, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxCAL_SHOW_HOLIDAYS );
-	bSizer98->Add( m_calendarTo, 0, wxALL, 5 );
-	
-	
-	bSizer96->Add( bSizer98, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticline21 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer96->Add( m_staticline21, 0, wxEXPAND, 5 );
-	
-	m_panel40 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panel40->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
-	m_panel40->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-	
-	wxBoxSizer* bSizer97;
-	bSizer97 = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizer97->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_buttonOkay = new wxButton( m_panel40, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_buttonOkay->SetDefault(); 
-	m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer97->Add( m_buttonOkay, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_button29 = new wxButton( m_panel40, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_button29->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer97->Add( m_button29, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	
-	bSizer97->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	
-	m_panel40->SetSizer( bSizer97 );
-	m_panel40->Layout();
-	bSizer97->Fit( m_panel40 );
-	bSizer96->Add( m_panel40, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	this->SetSizer( bSizer96 );
-	this->Layout();
-	bSizer96->Fit( this );
-	
-	this->Centre( wxBOTH );
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SelectTimespanDlgGenerated::OnClose ) );
-	m_calendarFrom->Connect( wxEVT_CALENDAR_SEL_CHANGED, wxCalendarEventHandler( SelectTimespanDlgGenerated::OnChangeSelectionFrom ), NULL, this );
-	m_calendarTo->Connect( wxEVT_CALENDAR_SEL_CHANGED, wxCalendarEventHandler( SelectTimespanDlgGenerated::OnChangeSelectionTo ), NULL, this );
-	m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SelectTimespanDlgGenerated::OnOkay ), NULL, this );
-	m_button29->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SelectTimespanDlgGenerated::OnCancel ), NULL, this );
+    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+    wxBoxSizer* bSizer96;
+    bSizer96 = new wxBoxSizer( wxVERTICAL );
+
+    m_panel35 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panel35->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
+
+    wxBoxSizer* bSizer98;
+    bSizer98 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_calendarFrom = new wxCalendarCtrl( m_panel35, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxCAL_SHOW_HOLIDAYS );
+    bSizer98->Add( m_calendarFrom, 0, wxALL, 5 );
+
+    m_calendarTo = new wxCalendarCtrl( m_panel35, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxCAL_SHOW_HOLIDAYS );
+    bSizer98->Add( m_calendarTo, 0, wxALL, 5 );
+
+
+    m_panel35->SetSizer( bSizer98 );
+    m_panel35->Layout();
+    bSizer98->Fit( m_panel35 );
+    bSizer96->Add( m_panel35, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_staticline21 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer96->Add( m_staticline21, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer97;
+    bSizer97 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_buttonOkay = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_buttonOkay->SetDefault();
+    m_buttonOkay->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer97->Add( m_buttonOkay, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_button29 = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    bSizer97->Add( m_button29, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+
+    bSizer96->Add( bSizer97, 0, wxALIGN_RIGHT, 5 );
+
+
+    this->SetSizer( bSizer96 );
+    this->Layout();
+    bSizer96->Fit( this );
+
+    this->Centre( wxBOTH );
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SelectTimespanDlgGenerated::OnClose ) );
+    m_calendarFrom->Connect( wxEVT_CALENDAR_SEL_CHANGED, wxCalendarEventHandler( SelectTimespanDlgGenerated::OnChangeSelectionFrom ), NULL, this );
+    m_calendarTo->Connect( wxEVT_CALENDAR_SEL_CHANGED, wxCalendarEventHandler( SelectTimespanDlgGenerated::OnChangeSelectionTo ), NULL, this );
+    m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SelectTimespanDlgGenerated::OnOkay ), NULL, this );
+    m_button29->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SelectTimespanDlgGenerated::OnCancel ), NULL, this );
 }
 
 SelectTimespanDlgGenerated::~SelectTimespanDlgGenerated()
 {
-	// Disconnect Events
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SelectTimespanDlgGenerated::OnClose ) );
-	m_calendarFrom->Disconnect( wxEVT_CALENDAR_SEL_CHANGED, wxCalendarEventHandler( SelectTimespanDlgGenerated::OnChangeSelectionFrom ), NULL, this );
-	m_calendarTo->Disconnect( wxEVT_CALENDAR_SEL_CHANGED, wxCalendarEventHandler( SelectTimespanDlgGenerated::OnChangeSelectionTo ), NULL, this );
-	m_buttonOkay->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SelectTimespanDlgGenerated::OnOkay ), NULL, this );
-	m_button29->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SelectTimespanDlgGenerated::OnCancel ), NULL, this );
-	
+    // Disconnect Events
+    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SelectTimespanDlgGenerated::OnClose ) );
+    m_calendarFrom->Disconnect( wxEVT_CALENDAR_SEL_CHANGED, wxCalendarEventHandler( SelectTimespanDlgGenerated::OnChangeSelectionFrom ), NULL, this );
+    m_calendarTo->Disconnect( wxEVT_CALENDAR_SEL_CHANGED, wxCalendarEventHandler( SelectTimespanDlgGenerated::OnChangeSelectionTo ), NULL, this );
+    m_buttonOkay->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SelectTimespanDlgGenerated::OnOkay ), NULL, this );
+    m_button29->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SelectTimespanDlgGenerated::OnCancel ), NULL, this );
+
 }
diff --git a/ui/gui_generated.h b/ui/gui_generated.h
index 92262efc..0972f194 100644
--- a/ui/gui_generated.h
+++ b/ui/gui_generated.h
@@ -15,10 +15,10 @@ class ExecFinishedBox;
 class FolderHistoryBox;
 class ToggleButton;
 class wxStaticText;
-namespace zen{ class BitmapButton; }
-namespace zen{ class Graph2D; }
-namespace zen{ class Grid; }
-namespace zen{ class TripleSplitter; }
+namespace zen { class BitmapButton; }
+namespace zen { class Graph2D; }
+namespace zen { class Grid; }
+namespace zen { class TripleSplitter; }
 
 #include <wx/string.h>
 #include <wx/bitmap.h>
@@ -63,871 +63,861 @@ namespace zen{ class TripleSplitter; }
 ///////////////////////////////////////////////////////////////////////////////
 /// Class MainDialogGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class MainDialogGenerated : public wxFrame 
+class MainDialogGenerated : public wxFrame
 {
-	private:
-	
-	protected:
-		wxMenuBar* m_menubar1;
-		wxMenu* m_menuFile;
-		wxMenuItem* m_menuItemNew;
-		wxMenuItem* m_menuItemLoad;
-		wxMenuItem* m_menuItemSave;
-		wxMenuItem* m_menuItemSaveAs;
-		wxMenuItem* m_menuItem7;
-		wxMenuItem* m_menuItem10;
-		wxMenuItem* m_menuItem11;
-		wxMenu* m_menuAdvanced;
-		wxMenu* m_menuLanguages;
-		wxMenuItem* m_menuItemGlobSett;
-		wxMenu* m_menuHelp;
-		wxMenuItem* m_menuItemManual;
-		wxMenuItem* m_menuItemCheckVer;
-		wxMenuItem* m_menuItemAbout;
-		wxBoxSizer* bSizerPanelHolder;
-		wxPanel* m_panelTopButtons;
-		wxBoxSizer* bSizerTopButtons;
-		wxStaticText* m_staticTextCmpVariant;
-		zen::BitmapButton* m_buttonCompare;
-		zen::BitmapButton* m_buttonAbort;
-		wxBitmapButton* m_bpButtonCmpConfig;
-		wxStaticText* m_staticTextSyncVariant;
-		wxBitmapButton* m_bpButtonSyncConfig;
-		zen::BitmapButton* m_buttonSync;
-		wxPanel* m_panelDirectoryPairs;
-		wxStaticText* m_staticTextResolvedPathL;
-		wxBitmapButton* m_bpButtonAddPair;
-		wxButton* m_buttonSelectDirLeft;
-		wxPanel* m_panelTopMiddle;
-		wxBitmapButton* m_bpButtonSwapSides;
-		wxStaticText* m_staticTextResolvedPathR;
-		wxButton* m_buttonSelectDirRight;
-		wxScrolledWindow* m_scrolledWindowFolderPairs;
-		wxBoxSizer* bSizerAddFolderPairs;
-		zen::Grid* m_gridNavi;
-		wxPanel* m_panelCenter;
-		zen::TripleSplitter* m_splitterMain;
-		zen::Grid* m_gridMainL;
-		zen::Grid* m_gridMainC;
-		zen::Grid* m_gridMainR;
-		wxPanel* m_panelStatusBar;
-		wxBoxSizer* bSizerFileStatus;
-		wxBoxSizer* bSizerStatusLeft;
-		wxBoxSizer* bSizerStatusLeftDirectories;
-		wxStaticBitmap* m_bitmapSmallDirectoryLeft;
-		wxStaticText* m_staticTextStatusLeftDirs;
-		wxBoxSizer* bSizerStatusLeftFiles;
-		wxStaticBitmap* m_bitmapSmallFileLeft;
-		wxStaticText* m_staticTextStatusLeftFiles;
-		wxStaticText* m_staticTextStatusLeftBytes;
-		wxStaticLine* m_staticline9;
-		wxStaticText* m_staticTextStatusMiddle;
-		wxBoxSizer* bSizerStatusRight;
-		wxStaticLine* m_staticline10;
-		wxBoxSizer* bSizerStatusRightDirectories;
-		wxStaticBitmap* m_bitmapSmallDirectoryRight;
-		wxStaticText* m_staticTextStatusRightDirs;
-		wxBoxSizer* bSizerStatusRightFiles;
-		wxStaticBitmap* m_bitmapSmallFileRight;
-		wxStaticText* m_staticTextStatusRightFiles;
-		wxStaticText* m_staticTextStatusRightBytes;
-		wxStaticText* m_staticTextFullStatus;
-		wxPanel* m_panelConfig;
-		wxBoxSizer* bSizerConfig;
-		wxBitmapButton* m_bpButtonOpen;
-		wxBitmapButton* m_bpButtonSave;
-		wxBitmapButton* m_bpButtonBatchJob;
-		wxListBox* m_listBoxHistory;
-		wxPanel* m_panelFilter;
-		wxBitmapButton* m_bpButtonFilter;
-		wxCheckBox* m_checkBoxHideExcluded;
-		wxPanel* m_panelStatistics;
-		wxBoxSizer* bSizer1801;
-		wxStaticBitmap* m_bitmapCreateLeft;
-		wxStaticText* m_staticTextCreateLeft;
-		wxStaticBitmap* m_bitmapUpdateLeft;
-		wxStaticText* m_staticTextUpdateLeft;
-		wxStaticBitmap* m_bitmapDeleteLeft;
-		wxStaticText* m_staticTextDeleteLeft;
-		wxStaticBitmap* m_bitmapData;
-		wxStaticText* m_staticTextData;
-		wxStaticBitmap* m_bitmapDeleteRight;
-		wxStaticText* m_staticTextDeleteRight;
-		wxStaticBitmap* m_bitmapUpdateRight;
-		wxStaticText* m_staticTextUpdateRight;
-		wxStaticBitmap* m_bitmapCreateRight;
-		wxStaticText* m_staticTextCreateRight;
-		wxPanel* m_panelViewFilter;
-		wxBoxSizer* bSizerViewFilter;
-		ToggleButton* m_bpButtonShowCreateLeft;
-		ToggleButton* m_bpButtonShowUpdateLeft;
-		ToggleButton* m_bpButtonShowDeleteLeft;
-		ToggleButton* m_bpButtonShowLeftOnly;
-		ToggleButton* m_bpButtonShowLeftNewer;
-		ToggleButton* m_bpButtonShowEqual;
-		ToggleButton* m_bpButtonShowDifferent;
-		ToggleButton* m_bpButtonShowDoNothing;
-		ToggleButton* m_bpButtonShowRightNewer;
-		ToggleButton* m_bpButtonShowRightOnly;
-		ToggleButton* m_bpButtonShowDeleteRight;
-		ToggleButton* m_bpButtonShowUpdateRight;
-		ToggleButton* m_bpButtonShowCreateRight;
-		ToggleButton* m_bpButtonShowConflict;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnConfigNew( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnConfigLoad( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnConfigSave( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnConfigSaveAs( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSaveAsBatchJob( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCompare( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnStartSync( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnMenuQuit( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnMenuGlobalSettings( 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 OnCompSettingsContext( wxMouseEvent& event ) { event.Skip(); }
-		virtual void OnSyncSettings( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSyncSettingsContext( wxMouseEvent& event ) { event.Skip(); }
-		virtual void OnAddFolderPair( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnRemoveTopFolderPair( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSwapSides( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCfgHistoryKeyEvent( wxKeyEvent& event ) { event.Skip(); }
-		virtual void OnLoadFromHistory( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnLoadFromHistoryDoubleClick( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCfgHistoryRightClick( wxMouseEvent& event ) { event.Skip(); }
-		virtual void OnConfigureFilter( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnGlobalFilterContext( wxMouseEvent& event ) { event.Skip(); }
-		virtual void OnShowExcluded( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnToggleViewButton( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnViewButtonRightClick( wxMouseEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		wxPanel* m_panelTopLeft;
-		wxBitmapButton* m_bpButtonRemovePair;
-		FolderHistoryBox* m_directoryLeft;
-		wxBitmapButton* m_bpButtonAltCompCfg;
-		wxBitmapButton* m_bpButtonLocalFilter;
-		wxBitmapButton* m_bpButtonAltSyncCfg;
-		wxPanel* m_panelTopRight;
-		FolderHistoryBox* m_directoryRight;
-		wxBoxSizer* bSizerStatistics;
-		wxBoxSizer* bSizerData;
-		
-		MainDialogGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 702,522 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
-		
-		~MainDialogGenerated();
-	
+private:
+
+protected:
+    wxMenuBar* m_menubar1;
+    wxMenu* m_menuFile;
+    wxMenuItem* m_menuItemNew;
+    wxMenuItem* m_menuItemLoad;
+    wxMenuItem* m_menuItemSave;
+    wxMenuItem* m_menuItemSaveAs;
+    wxMenuItem* m_menuItem7;
+    wxMenuItem* m_menuItem10;
+    wxMenuItem* m_menuItem11;
+    wxMenu* m_menuAdvanced;
+    wxMenu* m_menuLanguages;
+    wxMenuItem* m_menuItemGlobSett;
+    wxMenu* m_menuHelp;
+    wxMenuItem* m_menuItemManual;
+    wxMenuItem* m_menuItemCheckVer;
+    wxMenuItem* m_menuItemAbout;
+    wxBoxSizer* bSizerPanelHolder;
+    wxPanel* m_panelTopButtons;
+    wxBoxSizer* bSizerTopButtons;
+    wxStaticText* m_staticTextCmpVariant;
+    zen::BitmapButton* m_buttonCompare;
+    zen::BitmapButton* m_buttonCancel;
+    wxBitmapButton* m_bpButtonCmpConfig;
+    wxStaticText* m_staticTextSyncVariant;
+    wxBitmapButton* m_bpButtonSyncConfig;
+    zen::BitmapButton* m_buttonSync;
+    wxPanel* m_panelDirectoryPairs;
+    wxStaticText* m_staticTextResolvedPathL;
+    wxBitmapButton* m_bpButtonAddPair;
+    wxButton* m_buttonSelectDirLeft;
+    wxPanel* m_panelTopMiddle;
+    wxBitmapButton* m_bpButtonSwapSides;
+    wxStaticText* m_staticTextResolvedPathR;
+    wxButton* m_buttonSelectDirRight;
+    wxScrolledWindow* m_scrolledWindowFolderPairs;
+    wxBoxSizer* bSizerAddFolderPairs;
+    zen::Grid* m_gridNavi;
+    wxPanel* m_panelCenter;
+    zen::TripleSplitter* m_splitterMain;
+    zen::Grid* m_gridMainL;
+    zen::Grid* m_gridMainC;
+    zen::Grid* m_gridMainR;
+    wxPanel* m_panelStatusBar;
+    wxBoxSizer* bSizerFileStatus;
+    wxBoxSizer* bSizerStatusLeft;
+    wxBoxSizer* bSizerStatusLeftDirectories;
+    wxStaticBitmap* m_bitmapSmallDirectoryLeft;
+    wxStaticText* m_staticTextStatusLeftDirs;
+    wxBoxSizer* bSizerStatusLeftFiles;
+    wxStaticBitmap* m_bitmapSmallFileLeft;
+    wxStaticText* m_staticTextStatusLeftFiles;
+    wxStaticText* m_staticTextStatusLeftBytes;
+    wxStaticLine* m_staticline9;
+    wxStaticText* m_staticTextStatusMiddle;
+    wxBoxSizer* bSizerStatusRight;
+    wxStaticLine* m_staticline10;
+    wxBoxSizer* bSizerStatusRightDirectories;
+    wxStaticBitmap* m_bitmapSmallDirectoryRight;
+    wxStaticText* m_staticTextStatusRightDirs;
+    wxBoxSizer* bSizerStatusRightFiles;
+    wxStaticBitmap* m_bitmapSmallFileRight;
+    wxStaticText* m_staticTextStatusRightFiles;
+    wxStaticText* m_staticTextStatusRightBytes;
+    wxStaticText* m_staticTextFullStatus;
+    wxPanel* m_panelConfig;
+    wxBoxSizer* bSizerConfig;
+    wxBitmapButton* m_bpButtonOpen;
+    wxBitmapButton* m_bpButtonSave;
+    wxBitmapButton* m_bpButtonBatchJob;
+    wxListBox* m_listBoxHistory;
+    wxPanel* m_panelFilter;
+    wxBitmapButton* m_bpButtonFilter;
+    wxCheckBox* m_checkBoxHideExcluded;
+    wxPanel* m_panelStatistics;
+    wxBoxSizer* bSizer1801;
+    wxStaticBitmap* m_bitmapCreateLeft;
+    wxStaticText* m_staticTextCreateLeft;
+    wxStaticBitmap* m_bitmapUpdateLeft;
+    wxStaticText* m_staticTextUpdateLeft;
+    wxStaticBitmap* m_bitmapDeleteLeft;
+    wxStaticText* m_staticTextDeleteLeft;
+    wxStaticBitmap* m_bitmapData;
+    wxStaticText* m_staticTextData;
+    wxStaticBitmap* m_bitmapDeleteRight;
+    wxStaticText* m_staticTextDeleteRight;
+    wxStaticBitmap* m_bitmapUpdateRight;
+    wxStaticText* m_staticTextUpdateRight;
+    wxStaticBitmap* m_bitmapCreateRight;
+    wxStaticText* m_staticTextCreateRight;
+    wxPanel* m_panelViewFilter;
+    wxBoxSizer* bSizerViewFilter;
+    ToggleButton* m_bpButtonShowCreateLeft;
+    ToggleButton* m_bpButtonShowUpdateLeft;
+    ToggleButton* m_bpButtonShowDeleteLeft;
+    ToggleButton* m_bpButtonShowLeftOnly;
+    ToggleButton* m_bpButtonShowLeftNewer;
+    ToggleButton* m_bpButtonShowEqual;
+    ToggleButton* m_bpButtonShowDifferent;
+    ToggleButton* m_bpButtonShowDoNothing;
+    ToggleButton* m_bpButtonShowRightNewer;
+    ToggleButton* m_bpButtonShowRightOnly;
+    ToggleButton* m_bpButtonShowDeleteRight;
+    ToggleButton* m_bpButtonShowUpdateRight;
+    ToggleButton* m_bpButtonShowCreateRight;
+    ToggleButton* m_bpButtonShowConflict;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void OnConfigNew( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnConfigLoad( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnConfigSave( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnConfigSaveAs( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSaveAsBatchJob( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCompare( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnStartSync( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnMenuQuit( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnMenuGlobalSettings( 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 OnCompSettingsContext( wxMouseEvent& event ) { event.Skip(); }
+    virtual void OnSyncSettings( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSyncSettingsContext( wxMouseEvent& event ) { event.Skip(); }
+    virtual void OnAddFolderPair( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnRemoveTopFolderPair( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSwapSides( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCfgHistoryKeyEvent( wxKeyEvent& event ) { event.Skip(); }
+    virtual void OnLoadFromHistory( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnLoadFromHistoryDoubleClick( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCfgHistoryRightClick( wxMouseEvent& event ) { event.Skip(); }
+    virtual void OnConfigureFilter( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnGlobalFilterContext( wxMouseEvent& event ) { event.Skip(); }
+    virtual void OnShowExcluded( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnToggleViewButton( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnViewButtonRightClick( wxMouseEvent& event ) { event.Skip(); }
+
+
+public:
+    wxPanel* m_panelTopLeft;
+    wxBitmapButton* m_bpButtonRemovePair;
+    FolderHistoryBox* m_directoryLeft;
+    wxBitmapButton* m_bpButtonAltCompCfg;
+    wxBitmapButton* m_bpButtonLocalFilter;
+    wxBitmapButton* m_bpButtonAltSyncCfg;
+    wxPanel* m_panelTopRight;
+    FolderHistoryBox* m_directoryRight;
+    wxBoxSizer* bSizerStatistics;
+    wxBoxSizer* bSizerData;
+
+    MainDialogGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 702,522 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
+
+    ~MainDialogGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class FolderPairGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class FolderPairGenerated : public wxPanel 
+class FolderPairGenerated : public wxPanel
 {
-	private:
-	
-	protected:
-		wxButton* m_buttonSelectDirLeft;
-		wxButton* m_buttonSelectDirRight;
-	
-	public:
-		wxPanel* m_panelLeft;
-		wxBitmapButton* m_bpButtonRemovePair;
-		FolderHistoryBox* m_directoryLeft;
-		wxPanel* m_panel20;
-		wxBitmapButton* m_bpButtonAltCompCfg;
-		wxBitmapButton* m_bpButtonLocalFilter;
-		wxBitmapButton* m_bpButtonAltSyncCfg;
-		wxPanel* m_panelRight;
-		FolderHistoryBox* m_directoryRight;
-		
-		FolderPairGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL ); 
-		~FolderPairGenerated();
-	
+private:
+
+protected:
+    wxButton* m_buttonSelectDirLeft;
+    wxButton* m_buttonSelectDirRight;
+
+public:
+    wxPanel* m_panelLeft;
+    wxBitmapButton* m_bpButtonRemovePair;
+    FolderHistoryBox* m_directoryLeft;
+    wxPanel* m_panel20;
+    wxBitmapButton* m_bpButtonAltCompCfg;
+    wxBitmapButton* m_bpButtonLocalFilter;
+    wxBitmapButton* m_bpButtonAltSyncCfg;
+    wxPanel* m_panelRight;
+    FolderHistoryBox* m_directoryRight;
+
+    FolderPairGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0 );
+    ~FolderPairGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class CompareProgressDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class CompareProgressDlgGenerated : public wxPanel 
+class CompareProgressDlgGenerated : public wxPanel
 {
-	private:
-	
-	protected:
-		wxTextCtrl* m_textCtrlStatus;
-		wxGauge* m_gauge2;
-		wxBoxSizer* bSizer42;
-		wxBoxSizer* bSizerFilesFound;
-		wxStaticText* m_staticText321;
-		wxStaticText* m_staticTextScanned;
-		wxBoxSizer* bSizerFilesRemaining;
-		wxStaticText* m_staticText46;
-		wxStaticText* m_staticTextFilesRemaining;
-		wxStaticText* m_staticTextDataRemaining;
-		wxBoxSizer* sSizerSpeed;
-		wxStaticText* m_staticText104;
-		wxStaticText* m_staticTextSpeed;
-		wxBoxSizer* sSizerTimeRemaining;
-		wxStaticText* m_staticTextTimeRemFixed;
-		wxStaticText* m_staticTextRemTime;
-		wxBoxSizer* sSizerTimeElapsed;
-		wxStaticText* m_staticTextTimeElapsed;
-	
-	public:
-		
-		CompareProgressDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxRAISED_BORDER|wxTAB_TRAVERSAL ); 
-		~CompareProgressDlgGenerated();
-	
+private:
+
+protected:
+    wxTextCtrl* m_textCtrlStatus;
+    wxGauge* m_gauge2;
+    wxBoxSizer* bSizer42;
+    wxBoxSizer* bSizerFilesFound;
+    wxStaticText* m_staticText321;
+    wxStaticText* m_staticTextScanned;
+    wxBoxSizer* bSizerFilesRemaining;
+    wxStaticText* m_staticText46;
+    wxStaticText* m_staticTextFilesRemaining;
+    wxStaticText* m_staticTextDataRemaining;
+    wxBoxSizer* sSizerSpeed;
+    wxStaticText* m_staticText104;
+    wxStaticText* m_staticTextSpeed;
+    wxBoxSizer* sSizerTimeRemaining;
+    wxStaticText* m_staticTextTimeRemFixed;
+    wxStaticText* m_staticTextRemTime;
+    wxBoxSizer* sSizerTimeElapsed;
+    wxStaticText* m_staticTextTimeElapsed;
+
+public:
+
+    CompareProgressDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxRAISED_BORDER );
+    ~CompareProgressDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class SyncProgressDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class SyncProgressDlgGenerated : public wxFrame 
+class SyncProgressDlgGenerated : public wxFrame
 {
-	private:
-	
-	protected:
-		wxBoxSizer* bSizerTop;
-		wxPanel* m_panelHeader;
-		wxStaticBitmap* m_bitmapStatus;
-		wxStaticText* m_staticTextPhase;
-		wxAnimationCtrl* m_animationControl1;
-		wxStaticLine* m_staticlineHeader;
-		wxPanel* m_panelProgress;
-		wxStaticText* m_staticTextStatus;
-		wxBoxSizer* bSizer171;
-		wxStaticText* m_staticTextLabelItemsProc;
-		wxBoxSizer* bSizerItemsProc;
-		wxStaticText* m_staticTextProcessedObj;
-		wxStaticText* m_staticTextDataProcessed;
-		wxStaticText* m_staticTextLabelItemsRem;
-		wxBoxSizer* bSizerItemsRem;
-		wxStaticText* m_staticTextRemainingObj;
-		wxStaticText* m_staticTextDataRemaining;
-		wxStaticText* m_staticText84;
-		wxStaticText* m_staticTextSpeed;
-		wxStaticText* m_staticTextLabelRemTime;
-		wxStaticText* m_staticTextRemTime;
-		wxStaticText* m_staticTextLabelElapsedTime;
-		wxStaticText* m_staticTextTimeElapsed;
-		zen::Graph2D* m_panelGraph;
-		wxBoxSizer* bSizerFinalStat;
-		wxListbook* m_listbookResult;
-		wxStaticLine* m_staticline12;
-		wxPanel* m_panelFooter;
-		wxBoxSizer* bSizerExecFinished;
-		wxStaticText* m_staticText87;
-		ExecFinishedBox* m_comboBoxExecFinished;
-		wxBoxSizer* bSizer28;
-		wxButton* m_buttonOK;
-		wxButton* m_buttonPause;
-		wxButton* m_buttonAbort;
-		
-		// 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;
-		
-		SyncProgressDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
-		
-		~SyncProgressDlgGenerated();
-	
+private:
+
+protected:
+    wxBoxSizer* bSizerRoot;
+    wxStaticBitmap* m_bitmapStatus;
+    wxStaticText* m_staticTextPhase;
+    wxAnimationCtrl* m_animationControl1;
+    wxStaticLine* m_staticlineHeader;
+    wxPanel* m_panelProgress;
+    wxStaticText* m_staticTextStatus;
+    wxBoxSizer* bSizer171;
+    wxStaticText* m_staticTextLabelItemsProc;
+    wxBoxSizer* bSizerItemsProc;
+    wxStaticText* m_staticTextProcessedObj;
+    wxStaticText* m_staticTextDataProcessed;
+    wxStaticText* m_staticTextLabelItemsRem;
+    wxBoxSizer* bSizerItemsRem;
+    wxStaticText* m_staticTextRemainingObj;
+    wxStaticText* m_staticTextDataRemaining;
+    wxStaticText* m_staticText84;
+    wxStaticText* m_staticTextSpeed;
+    wxStaticText* m_staticTextLabelRemTime;
+    wxStaticText* m_staticTextRemTime;
+    wxStaticText* m_staticTextLabelElapsedTime;
+    wxStaticText* m_staticTextTimeElapsed;
+    zen::Graph2D* m_panelGraph;
+    wxListbook* m_listbookResult;
+    wxStaticLine* m_staticline12;
+    wxBoxSizer* bSizerExecFinished;
+    wxStaticText* m_staticText87;
+    ExecFinishedBox* m_comboBoxExecFinished;
+    wxBoxSizer* bSizer28;
+    wxButton* m_buttonClose;
+    wxButton* m_buttonPause;
+    wxButton* m_buttonAbort;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnCloseBtn( 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;
+
+    SyncProgressDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
+
+    ~SyncProgressDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class BatchDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class BatchDlgGenerated : public wxDialog 
+class BatchDlgGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		wxPanel* m_panelHeader;
-		wxStaticBitmap* m_bitmapBatchJob;
-		wxStaticText* m_staticTextHeader;
-		wxStaticText* m_staticText44;
-		wxBitmapButton* m_bpButtonHelp;
-		wxStaticLine* m_staticline18;
-		wxStaticText* m_staticText82;
-		wxToggleButton* m_toggleBtnErrorIgnore;
-		wxToggleButton* m_toggleBtnErrorPopup;
-		wxToggleButton* m_toggleBtnErrorExit;
-		wxStaticLine* m_staticline26;
-		wxStaticText* m_staticText81;
-		ExecFinishedBox* m_comboBoxExecFinished;
-		wxStaticLine* m_staticline25;
-		wxCheckBox* m_checkBoxShowProgress;
-		wxCheckBox* m_checkBoxGenerateLogfile;
-		wxPanel* m_panelLogfile;
-		wxButton* m_buttonSelectLogfileDir;
-		wxCheckBox* m_checkBoxLogfilesLimit;
-		wxSpinCtrl* m_spinCtrlLogfileLimit;
-		wxStaticLine* m_staticline13;
-		wxPanel* m_panel35;
-		wxButton* m_buttonSave;
-		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 OnErrorIgnore( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnErrorPopup( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnErrorExit( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnToggleGenerateLogfile( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnToggleLogfilesLimit( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSaveBatchJob( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		FolderHistoryBox* m_comboBoxLogfileDir;
-		
-		BatchDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Save as batch job"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER ); 
-		~BatchDlgGenerated();
-	
+private:
+
+protected:
+    wxStaticBitmap* m_bitmapBatchJob;
+    wxStaticText* m_staticTextHeader;
+    wxStaticText* m_staticText44;
+    wxBitmapButton* m_bpButtonHelp;
+    wxStaticLine* m_staticline18;
+    wxPanel* m_panel35;
+    wxStaticText* m_staticText82;
+    wxToggleButton* m_toggleBtnErrorIgnore;
+    wxToggleButton* m_toggleBtnErrorPopup;
+    wxToggleButton* m_toggleBtnErrorExit;
+    wxStaticLine* m_staticline26;
+    wxStaticText* m_staticText81;
+    ExecFinishedBox* m_comboBoxExecFinished;
+    wxStaticLine* m_staticline25;
+    wxCheckBox* m_checkBoxShowProgress;
+    wxCheckBox* m_checkBoxGenerateLogfile;
+    wxPanel* m_panelLogfile;
+    wxButton* m_buttonSelectLogfileDir;
+    wxCheckBox* m_checkBoxLogfilesLimit;
+    wxSpinCtrl* m_spinCtrlLogfileLimit;
+    wxStaticLine* m_staticline13;
+    wxButton* m_buttonSave;
+    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 OnErrorIgnore( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnErrorPopup( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnErrorExit( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnToggleGenerateLogfile( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnToggleLogfilesLimit( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSaveBatchJob( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+    FolderHistoryBox* m_logfileDir;
+
+    BatchDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Save as batch job"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER );
+    ~BatchDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class CmpCfgDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class CmpCfgDlgGenerated : public wxDialog 
+class CmpCfgDlgGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		wxStaticText* m_staticText91;
-		wxStaticBitmap* m_bitmapByTime;
-		wxToggleButton* m_toggleBtnTimeSize;
-		wxStaticBitmap* m_bitmapByContent;
-		wxToggleButton* m_toggleBtnContent;
-		wxStaticLine* m_staticline33;
-		wxStaticText* m_staticText92;
-		wxChoice* m_choiceHandleSymlinks;
-		wxBitmapButton* m_bpButtonHelp;
-		wxStaticLine* m_staticline14;
-		wxPanel* m_panel36;
-		wxButton* m_button10;
-		wxButton* m_button6;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnTimeSizeDouble( wxMouseEvent& event ) { event.Skip(); }
-		virtual void OnTimeSize( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnContentDouble( wxMouseEvent& event ) { event.Skip(); }
-		virtual void OnContent( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnChangeErrorHandling( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnShowHelp( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		CmpCfgDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Comparison settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); 
-		~CmpCfgDlgGenerated();
-	
+private:
+
+protected:
+    wxPanel* m_panel36;
+    wxStaticText* m_staticText91;
+    wxStaticBitmap* m_bitmapByTime;
+    wxToggleButton* m_toggleBtnTimeSize;
+    wxStaticBitmap* m_bitmapByContent;
+    wxToggleButton* m_toggleBtnContent;
+    wxStaticLine* m_staticline33;
+    wxStaticText* m_staticText92;
+    wxChoice* m_choiceHandleSymlinks;
+    wxBitmapButton* m_bpButtonHelp;
+    wxStaticLine* m_staticline14;
+    wxButton* m_buttonOkay;
+    wxButton* m_button6;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void OnTimeSizeDouble( wxMouseEvent& event ) { event.Skip(); }
+    virtual void OnTimeSize( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnContentDouble( wxMouseEvent& event ) { event.Skip(); }
+    virtual void OnContent( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnChangeErrorHandling( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnShowHelp( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+
+    CmpCfgDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Comparison settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+    ~CmpCfgDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class SyncCfgDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class SyncCfgDlgGenerated : public wxDialog 
+class SyncCfgDlgGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		wxStaticText* m_staticText86;
-		wxToggleButton* m_toggleBtnAutomatic;
-		wxStaticText* m_staticTextAutomatic;
-		wxToggleButton* m_toggleBtnMirror;
-		wxStaticText* m_staticTextMirror;
-		wxToggleButton* m_toggleBtnUpdate;
-		wxStaticText* m_staticTextUpdate;
-		wxToggleButton* m_toggleBtnCustom;
-		wxStaticText* m_staticTextCustom;
-		wxBoxSizer* bSizerExtraConfig;
-		wxStaticLine* m_staticline321;
-		wxBoxSizer* bSizer179;
-		wxStaticText* m_staticText88;
-		wxToggleButton* m_toggleBtnErrorIgnore;
-		wxToggleButton* m_toggleBtnErrorPopup;
-		wxStaticLine* m_staticline36;
-		wxBoxSizer* bSizerOnCompletion;
-		wxStaticText* m_staticText89;
-		ExecFinishedBox* m_comboBoxExecFinished;
-		wxStaticLine* m_staticline32;
-		wxStaticText* m_staticText87;
-		wxBoxSizer* bSizerVersioningNamingConvention;
-		wxStaticText* m_staticTextNamingCvtPart1;
-		wxStaticText* m_staticTextNamingCvtPart2Bold;
-		wxStaticText* m_staticTextNamingCvtPart3;
-		wxToggleButton* m_toggleBtnPermanent;
-		wxToggleButton* m_toggleBtnRecycler;
-		wxToggleButton* m_toggleBtnVersioning;
-		wxBoxSizer* bSizerVersioningStyle;
-		wxStaticText* m_staticText93;
-		wxChoice* m_choiceVersioningStyle;
-		wxPanel* m_panelVersioning;
-		FolderHistoryBox* m_versioningFolder;
-		wxButton* m_buttonSelectDirVersioning;
-		wxStaticLine* m_staticline31;
-		wxBoxSizer* bSizerConfig;
-		wxStaticText* m_staticText90;
-		wxStaticBitmap* m_bitmapDatabase;
-		wxBoxSizer* sbSizerSyncDirections;
-		wxStaticText* m_staticTextHeaderCategory;
-		wxStaticText* m_staticTextHeaderAction;
-		wxBoxSizer* bSizerLeftOnly;
-		wxStaticBitmap* m_bitmapLeftOnly;
-		wxBitmapButton* m_bpButtonLeftOnly;
-		wxBoxSizer* bSizerRightOnly;
-		wxStaticBitmap* m_bitmapRightOnly;
-		wxBitmapButton* m_bpButtonRightOnly;
-		wxBoxSizer* bSizerLeftNewer;
-		wxStaticBitmap* m_bitmapLeftNewer;
-		wxBitmapButton* m_bpButtonLeftNewer;
-		wxBoxSizer* bSizerRightNewer;
-		wxStaticBitmap* m_bitmapRightNewer;
-		wxBitmapButton* m_bpButtonRightNewer;
-		wxBoxSizer* bSizerDifferent;
-		wxStaticBitmap* m_bitmapDifferent;
-		wxBitmapButton* m_bpButtonDifferent;
-		wxBoxSizer* bSizerConflict;
-		wxStaticBitmap* m_bitmapConflict;
-		wxBitmapButton* m_bpButtonConflict;
-		wxStaticLine* m_staticline15;
-		wxPanel* m_panel37;
-		wxButton* m_buttonOK;
-		wxButton* m_button16;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnSyncAutomaticDouble( wxMouseEvent& event ) { event.Skip(); }
-		virtual void OnSyncAutomatic( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSyncMirrorDouble( wxMouseEvent& event ) { event.Skip(); }
-		virtual void OnSyncMirror( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSyncUpdateDouble( wxMouseEvent& event ) { event.Skip(); }
-		virtual void OnSyncUpdate( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSyncCustomDouble( wxMouseEvent& event ) { event.Skip(); }
-		virtual void OnSyncCustom( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnErrorIgnore( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnErrorPopup( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnDeletionPermanent( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnDeletionRecycler( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnDeletionVersioning( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnParameterChange( 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(); }
-		virtual void OnApply( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		SyncCfgDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Synchronization settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); 
-		~SyncCfgDlgGenerated();
-	
+private:
+
+protected:
+    wxPanel* m_panel37;
+    wxStaticText* m_staticText86;
+    wxToggleButton* m_toggleBtnAutomatic;
+    wxStaticText* m_staticTextAutomatic;
+    wxToggleButton* m_toggleBtnMirror;
+    wxStaticText* m_staticTextMirror;
+    wxToggleButton* m_toggleBtnUpdate;
+    wxStaticText* m_staticTextUpdate;
+    wxToggleButton* m_toggleBtnCustom;
+    wxStaticText* m_staticTextCustom;
+    wxBoxSizer* bSizerExtraConfig;
+    wxStaticLine* m_staticline321;
+    wxBoxSizer* bSizer179;
+    wxStaticText* m_staticText88;
+    wxToggleButton* m_toggleBtnErrorIgnore;
+    wxToggleButton* m_toggleBtnErrorPopup;
+    wxStaticLine* m_staticline36;
+    wxBoxSizer* bSizerOnCompletion;
+    wxStaticText* m_staticText89;
+    ExecFinishedBox* m_comboBoxExecFinished;
+    wxStaticLine* m_staticline32;
+    wxStaticText* m_staticText87;
+    wxBoxSizer* bSizerVersioningNamingConvention;
+    wxStaticText* m_staticTextNamingCvtPart1;
+    wxStaticText* m_staticTextNamingCvtPart2Bold;
+    wxStaticText* m_staticTextNamingCvtPart3;
+    wxToggleButton* m_toggleBtnPermanent;
+    wxToggleButton* m_toggleBtnRecycler;
+    wxToggleButton* m_toggleBtnVersioning;
+    wxBoxSizer* bSizerVersioningStyle;
+    wxStaticText* m_staticText93;
+    wxChoice* m_choiceVersioningStyle;
+    wxPanel* m_panelVersioning;
+    FolderHistoryBox* m_versioningFolder;
+    wxButton* m_buttonSelectDirVersioning;
+    wxStaticLine* m_staticline31;
+    wxBoxSizer* bSizerConfig;
+    wxStaticText* m_staticText90;
+    wxStaticBitmap* m_bitmapDatabase;
+    wxBoxSizer* sbSizerSyncDirections;
+    wxStaticText* m_staticTextHeaderCategory;
+    wxStaticText* m_staticTextHeaderAction;
+    wxBoxSizer* bSizerLeftOnly;
+    wxStaticBitmap* m_bitmapLeftOnly;
+    wxBitmapButton* m_bpButtonLeftOnly;
+    wxBoxSizer* bSizerRightOnly;
+    wxStaticBitmap* m_bitmapRightOnly;
+    wxBitmapButton* m_bpButtonRightOnly;
+    wxBoxSizer* bSizerLeftNewer;
+    wxStaticBitmap* m_bitmapLeftNewer;
+    wxBitmapButton* m_bpButtonLeftNewer;
+    wxBoxSizer* bSizerRightNewer;
+    wxStaticBitmap* m_bitmapRightNewer;
+    wxBitmapButton* m_bpButtonRightNewer;
+    wxBoxSizer* bSizerDifferent;
+    wxStaticBitmap* m_bitmapDifferent;
+    wxBitmapButton* m_bpButtonDifferent;
+    wxBoxSizer* bSizerConflict;
+    wxStaticBitmap* m_bitmapConflict;
+    wxBitmapButton* m_bpButtonConflict;
+    wxStaticLine* m_staticline15;
+    wxButton* m_buttonOK;
+    wxButton* m_button16;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void OnSyncAutomaticDouble( wxMouseEvent& event ) { event.Skip(); }
+    virtual void OnSyncAutomatic( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSyncMirrorDouble( wxMouseEvent& event ) { event.Skip(); }
+    virtual void OnSyncMirror( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSyncUpdateDouble( wxMouseEvent& event ) { event.Skip(); }
+    virtual void OnSyncUpdate( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSyncCustomDouble( wxMouseEvent& event ) { event.Skip(); }
+    virtual void OnSyncCustom( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnErrorIgnore( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnErrorPopup( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnDeletionPermanent( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnDeletionRecycler( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnDeletionVersioning( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnParameterChange( 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(); }
+    virtual void OnApply( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+    wxBoxSizer* bSizerNamingConvention;
+
+    SyncCfgDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Synchronization settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+    ~SyncCfgDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class LogControlGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class LogControlGenerated : public wxPanel 
+class LogControlGenerated : public wxPanel
 {
-	private:
-	
-	protected:
-		wxStaticLine* m_staticline12;
-		ToggleButton* m_bpButtonErrors;
-		ToggleButton* m_bpButtonWarnings;
-		ToggleButton* m_bpButtonInfo;
-		wxStaticLine* m_staticline13;
-		zen::Grid* m_gridMessages;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnErrors( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnWarnings( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnInfo( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		LogControlGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL ); 
-		~LogControlGenerated();
-	
+private:
+
+protected:
+    wxStaticLine* m_staticline12;
+    ToggleButton* m_bpButtonErrors;
+    ToggleButton* m_bpButtonWarnings;
+    ToggleButton* m_bpButtonInfo;
+    wxStaticLine* m_staticline13;
+    zen::Grid* m_gridMessages;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnErrors( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnWarnings( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnInfo( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+
+    LogControlGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxTAB_TRAVERSAL );
+    ~LogControlGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class AboutDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class AboutDlgGenerated : public wxDialog 
+class AboutDlgGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		wxStaticBitmap* m_bitmapLogo;
-		wxStaticLine* m_staticline341;
-		wxStaticText* m_build;
-		wxStaticLine* m_staticline3411;
-		wxPanel* m_panel33;
-		wxBoxSizer* bSizerCodeInfo;
-		wxStaticText* m_staticText72;
-		wxHyperlinkCtrl* m_hyperlink11;
-		wxHyperlinkCtrl* m_hyperlink9;
-		wxHyperlinkCtrl* m_hyperlink10;
-		wxHyperlinkCtrl* m_hyperlink7;
-		wxHyperlinkCtrl* m_hyperlink14;
-		wxHyperlinkCtrl* m_hyperlink15;
-		wxHyperlinkCtrl* m_hyperlink13;
-		wxHyperlinkCtrl* m_hyperlink16;
-		wxHyperlinkCtrl* m_hyperlink12;
-		wxHyperlinkCtrl* m_hyperlink18;
-		wxPanel* m_panel40;
-		wxPanel* m_panel39;
-		wxStaticText* m_staticText83;
-		wxHyperlinkCtrl* m_hyperlinkDonate;
-		wxAnimationCtrl* m_animCtrlWink;
-		wxScrolledWindow* m_scrolledWindowTranslators;
-		wxBoxSizer* bSizerTranslators;
-		wxStaticText* m_staticText54;
-		wxFlexGridSizer* fgSizerTranslators;
-		wxStaticLine* m_staticline43;
-		wxStaticText* m_staticText94;
-		wxHyperlinkCtrl* m_hyperlink1;
-		wxStaticBitmap* m_bitmap9;
-		wxHyperlinkCtrl* m_hyperlink2;
-		wxStaticBitmap* m_bitmap10;
-		wxStaticLine* m_staticline34;
-		wxStaticText* m_staticText93;
-		wxStaticBitmap* m_bitmap13;
-		wxHyperlinkCtrl* m_hyperlink5;
-		wxStaticLine* m_staticline36;
-		wxPanel* m_panel41;
-		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 = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); 
-		~AboutDlgGenerated();
-	
+private:
+
+protected:
+    wxPanel* m_panel41;
+    wxStaticBitmap* m_bitmapLogo;
+    wxStaticLine* m_staticline341;
+    wxStaticText* m_build;
+    wxStaticLine* m_staticline3411;
+    wxStaticText* m_staticText72;
+    wxHyperlinkCtrl* m_hyperlink11;
+    wxHyperlinkCtrl* m_hyperlink9;
+    wxHyperlinkCtrl* m_hyperlink10;
+    wxHyperlinkCtrl* m_hyperlink7;
+    wxHyperlinkCtrl* m_hyperlink14;
+    wxHyperlinkCtrl* m_hyperlink15;
+    wxHyperlinkCtrl* m_hyperlink13;
+    wxHyperlinkCtrl* m_hyperlink16;
+    wxHyperlinkCtrl* m_hyperlink12;
+    wxHyperlinkCtrl* m_hyperlink18;
+    wxPanel* m_panel40;
+    wxPanel* m_panel39;
+    wxStaticText* m_staticText83;
+    wxButton* m_buttonDonate;
+    wxAnimationCtrl* m_animCtrlWink;
+    wxScrolledWindow* m_scrolledWindowTranslators;
+    wxBoxSizer* bSizerTranslators;
+    wxStaticText* m_staticText54;
+    wxFlexGridSizer* fgSizerTranslators;
+    wxStaticLine* m_staticline43;
+    wxStaticText* m_staticText94;
+    wxHyperlinkCtrl* m_hyperlink1;
+    wxStaticBitmap* m_bitmap9;
+    wxHyperlinkCtrl* m_hyperlink2;
+    wxStaticBitmap* m_bitmap10;
+    wxStaticLine* m_staticline34;
+    wxStaticText* m_staticText93;
+    wxStaticBitmap* m_bitmap13;
+    wxHyperlinkCtrl* m_hyperlink5;
+    wxStaticLine* m_staticline36;
+    wxButton* m_buttonClose;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void OnDonate( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnOK( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+
+    AboutDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("About"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+    ~AboutDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class MessageDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class MessageDlgGenerated : public wxDialog 
+class MessageDlgGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		wxStaticBitmap* m_bitmapMsgType;
-		wxTextCtrl* m_textCtrlMessage;
-		wxStaticLine* m_staticline6;
-		wxPanel* m_panel33;
-		wxCheckBox* m_checkBoxCustom;
-		wxButton* m_buttonCustom1;
-		wxButton* m_buttonCustom2;
-		wxButton* m_buttonCancel;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnButton1( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnButton2( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		MessageDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("dummy"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER ); 
-		~MessageDlgGenerated();
-	
+private:
+
+protected:
+    wxPanel* m_panel33;
+    wxStaticBitmap* m_bitmapMsgType;
+    wxTextCtrl* m_textCtrlMessage;
+    wxStaticLine* m_staticline6;
+    wxCheckBox* m_checkBoxCustom;
+    wxButton* m_buttonCustom1;
+    wxButton* m_buttonCustom2;
+    wxButton* m_buttonCancel;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void OnButton1( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnButton2( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+
+    MessageDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("dummy"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER );
+    ~MessageDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class DeleteDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class DeleteDlgGenerated : public wxDialog 
+class DeleteDlgGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		wxPanel* m_panelHeader;
-		wxStaticBitmap* m_bitmapDeleteType;
-		wxStaticText* m_staticTextHeader;
-		wxStaticLine* m_staticline91;
-		wxTextCtrl* m_textCtrlFileList;
-		wxStaticLine* m_staticline9;
-		wxPanel* m_panel36;
-		wxCheckBox* m_checkBoxUseRecycler;
-		wxCheckBox* m_checkBoxDeleteBothSides;
-		wxButton* m_buttonOK;
-		wxButton* m_buttonCancel;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnUseRecycler( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnDelOnBothSides( 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 = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER ); 
-		~DeleteDlgGenerated();
-	
+private:
+
+protected:
+    wxStaticBitmap* m_bitmapDeleteType;
+    wxStaticText* m_staticTextHeader;
+    wxStaticLine* m_staticline91;
+    wxTextCtrl* m_textCtrlFileList;
+    wxStaticLine* m_staticline9;
+    wxCheckBox* m_checkBoxUseRecycler;
+    wxCheckBox* m_checkBoxDeleteBothSides;
+    wxButton* m_buttonOK;
+    wxButton* m_buttonCancel;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void OnUseRecycler( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnDelOnBothSides( 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 = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER );
+    ~DeleteDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class FilterDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class FilterDlgGenerated : public wxDialog 
+class FilterDlgGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		wxPanel* m_panelHeader;
-		wxStaticBitmap* m_bitmap26;
-		wxStaticText* m_staticTextHeader;
-		wxStaticText* m_staticText44;
-		wxBitmapButton* m_bpButtonHelp;
-		wxStaticLine* m_staticline17;
-		wxStaticText* m_staticText78;
-		wxStaticBitmap* m_bitmapInclude;
-		wxTextCtrl* m_textCtrlInclude;
-		wxStaticLine* m_staticline22;
-		wxStaticText* m_staticText77;
-		wxStaticBitmap* m_bitmapExclude;
-		wxTextCtrl* m_textCtrlExclude;
-		wxStaticLine* m_staticline24;
-		wxStaticText* m_staticText79;
-		wxStaticBitmap* m_bitmapFilterDate;
-		wxSpinCtrl* m_spinCtrlTimespan;
-		wxChoice* m_choiceUnitTimespan;
-		wxStaticLine* m_staticline23;
-		wxStaticText* m_staticText80;
-		wxStaticBitmap* m_bitmapFilterSize;
-		wxStaticText* m_staticText101;
-		wxSpinCtrl* m_spinCtrlMinSize;
-		wxChoice* m_choiceUnitMinSize;
-		wxStaticText* m_staticText102;
-		wxSpinCtrl* m_spinCtrlMaxSize;
-		wxChoice* m_choiceUnitMaxSize;
-		wxStaticLine* m_staticline16;
-		wxPanel* m_panel38;
-		wxButton* m_button9;
-		wxButton* m_buttonOk;
-		wxButton* m_button17;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnHelp( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnUpdateNameFilter( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnUpdateChoice( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnDefault( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnApply( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		FilterDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Configure filter"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
-		~FilterDlgGenerated();
-	
+private:
+
+protected:
+    wxStaticBitmap* m_bitmap26;
+    wxStaticText* m_staticTextHeader;
+    wxStaticText* m_staticText44;
+    wxBitmapButton* m_bpButtonHelp;
+    wxStaticLine* m_staticline17;
+    wxPanel* m_panel38;
+    wxStaticText* m_staticText78;
+    wxStaticBitmap* m_bitmapInclude;
+    wxTextCtrl* m_textCtrlInclude;
+    wxStaticLine* m_staticline22;
+    wxStaticText* m_staticText77;
+    wxStaticBitmap* m_bitmapExclude;
+    wxTextCtrl* m_textCtrlExclude;
+    wxStaticLine* m_staticline24;
+    wxStaticText* m_staticText79;
+    wxStaticBitmap* m_bitmapFilterDate;
+    wxSpinCtrl* m_spinCtrlTimespan;
+    wxChoice* m_choiceUnitTimespan;
+    wxStaticLine* m_staticline23;
+    wxStaticText* m_staticText80;
+    wxStaticBitmap* m_bitmapFilterSize;
+    wxStaticText* m_staticText101;
+    wxSpinCtrl* m_spinCtrlMinSize;
+    wxChoice* m_choiceUnitMinSize;
+    wxStaticText* m_staticText102;
+    wxSpinCtrl* m_spinCtrlMaxSize;
+    wxChoice* m_choiceUnitMaxSize;
+    wxStaticLine* m_staticline16;
+    wxButton* m_button9;
+    wxButton* m_buttonOk;
+    wxButton* m_button17;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void OnHelp( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnUpdateNameFilter( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnUpdateChoice( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnDefault( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnApply( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+
+    FilterDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Configure filter"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+    ~FilterDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class GlobalSettingsDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class GlobalSettingsDlgGenerated : public wxDialog 
+class GlobalSettingsDlgGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		wxPanel* m_panelHeader;
-		wxStaticBitmap* m_bitmapSettings;
-		wxStaticText* m_staticTextHeader;
-		wxStaticLine* m_staticline19;
-		wxCheckBox* m_checkBoxTransCopy;
-		wxStaticText* m_staticText82;
-		wxCheckBox* m_checkBoxCopyLocked;
-		wxStaticText* m_staticTextCopyLocked;
-		wxCheckBox* m_checkBoxCopyPermissions;
-		wxStaticText* m_staticText8211;
-		wxStaticLine* m_staticline191;
-		zen::BitmapButton* m_buttonResetDialogs;
-		wxStaticLine* m_staticline192;
-		wxStaticText* m_staticText85;
-		wxBitmapButton* m_bpButtonAddRow;
-		wxBitmapButton* m_bpButtonRemoveRow;
-		wxGrid* m_gridCustomCommand;
-		wxStaticLine* m_staticline20;
-		wxPanel* m_panel39;
-		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 = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
-		~GlobalSettingsDlgGenerated();
-	
+private:
+
+protected:
+    wxStaticBitmap* m_bitmapSettings;
+    wxStaticText* m_staticTextHeader;
+    wxStaticLine* m_staticline19;
+    wxPanel* m_panel39;
+    wxCheckBox* m_checkBoxTransCopy;
+    wxStaticText* m_staticText82;
+    wxCheckBox* m_checkBoxCopyLocked;
+    wxStaticText* m_staticTextCopyLocked;
+    wxCheckBox* m_checkBoxCopyPermissions;
+    wxStaticText* m_staticText8211;
+    wxStaticLine* m_staticline191;
+    zen::BitmapButton* m_buttonResetDialogs;
+    wxStaticLine* m_staticline192;
+    wxStaticText* m_staticText85;
+    wxBitmapButton* m_bpButtonAddRow;
+    wxBitmapButton* m_bpButtonRemoveRow;
+    wxGrid* m_gridCustomCommand;
+    wxStaticLine* m_staticline20;
+    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 = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+    ~GlobalSettingsDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class SyncPreviewDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class SyncPreviewDlgGenerated : public wxDialog 
+class SyncPreviewDlgGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		wxPanel* m_panelHeader;
-		zen::BitmapButton* m_buttonStartSync;
-		wxStaticLine* m_staticline16;
-		wxStaticText* m_staticText84;
-		wxStaticText* m_staticTextVariant;
-		wxStaticLine* m_staticline14;
-		wxStaticText* m_staticText83;
-		wxStaticBitmap* m_bitmapCreateLeft;
-		wxStaticBitmap* m_bitmapUpdateLeft;
-		wxStaticBitmap* m_bitmapDeleteLeft;
-		wxStaticBitmap* m_bitmapData;
-		wxStaticBitmap* m_bitmapDeleteRight;
-		wxStaticBitmap* m_bitmapUpdateRight;
-		wxStaticBitmap* m_bitmapCreateRight;
-		wxStaticText* m_staticTextCreateLeft;
-		wxStaticText* m_staticTextUpdateLeft;
-		wxStaticText* m_staticTextDeleteLeft;
-		wxStaticText* m_staticTextData;
-		wxStaticText* m_staticTextDeleteRight;
-		wxStaticText* m_staticTextUpdateRight;
-		wxStaticText* m_staticTextCreateRight;
-		wxStaticLine* m_staticline12;
-		wxPanel* m_panel42;
-		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 = _("Confirm"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); 
-		~SyncPreviewDlgGenerated();
-	
+private:
+
+protected:
+    zen::BitmapButton* m_buttonStartSync;
+    wxStaticLine* m_staticline16;
+    wxStaticText* m_staticText84;
+    wxStaticText* m_staticTextVariant;
+    wxStaticLine* m_staticline14;
+    wxPanel* m_panelStatistics;
+    wxStaticText* m_staticText83;
+    wxStaticBitmap* m_bitmapCreateLeft;
+    wxStaticBitmap* m_bitmapUpdateLeft;
+    wxStaticBitmap* m_bitmapDeleteLeft;
+    wxStaticBitmap* m_bitmapData;
+    wxStaticBitmap* m_bitmapDeleteRight;
+    wxStaticBitmap* m_bitmapUpdateRight;
+    wxStaticBitmap* m_bitmapCreateRight;
+    wxStaticText* m_staticTextCreateLeft;
+    wxStaticText* m_staticTextUpdateLeft;
+    wxStaticText* m_staticTextDeleteLeft;
+    wxStaticText* m_staticTextData;
+    wxStaticText* m_staticTextDeleteRight;
+    wxStaticText* m_staticTextUpdateRight;
+    wxStaticText* m_staticTextCreateRight;
+    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 = _("Confirm"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+    ~SyncPreviewDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
-/// Class PopupFrameGenerated1
+/// Class PopupDialogGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class PopupFrameGenerated1 : public wxFrame 
+class PopupDialogGenerated : public wxDialog
 {
-	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 = wxDefaultSize, long style = wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP|wxSTATIC_BORDER );
-		
-		~PopupFrameGenerated1();
-	
+private:
+
+protected:
+
+public:
+    wxStaticBitmap* m_bitmapLeft;
+    wxStaticText* m_staticTextMain;
+
+    PopupDialogGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+    ~PopupDialogGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// 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 = wxDefaultSize, 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 = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+    ~SearchDialogGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class SelectTimespanDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class SelectTimespanDlgGenerated : public wxDialog 
+class SelectTimespanDlgGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		wxCalendarCtrl* m_calendarFrom;
-		wxCalendarCtrl* m_calendarTo;
-		wxStaticLine* m_staticline21;
-		wxPanel* m_panel40;
-		wxButton* m_buttonOkay;
-		wxButton* m_button29;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnChangeSelectionFrom( wxCalendarEvent& event ) { event.Skip(); }
-		virtual void OnChangeSelectionTo( wxCalendarEvent& event ) { event.Skip(); }
-		virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		SelectTimespanDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Select time span"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); 
-		~SelectTimespanDlgGenerated();
-	
+private:
+
+protected:
+    wxPanel* m_panel35;
+    wxCalendarCtrl* m_calendarFrom;
+    wxCalendarCtrl* m_calendarTo;
+    wxStaticLine* m_staticline21;
+    wxButton* m_buttonOkay;
+    wxButton* m_button29;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void OnChangeSelectionFrom( wxCalendarEvent& event ) { event.Skip(); }
+    virtual void OnChangeSelectionTo( wxCalendarEvent& event ) { event.Skip(); }
+    virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+
+    SelectTimespanDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Select time span"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+    ~SelectTimespanDlgGenerated();
+
 };
 
 #endif //__GUI_GENERATED_H__
diff --git a/ui/gui_status_handler.cpp b/ui/gui_status_handler.cpp
index 4ef4fa96..fa327136 100644
--- a/ui/gui_status_handler.cpp
+++ b/ui/gui_status_handler.cpp
@@ -35,7 +35,7 @@ CompareStatusHandler::CompareStatusHandler(MainDialog& dlg) :
 
         //register keys
         mainDlg.Connect(wxEVT_CHAR_HOOK, wxKeyEventHandler(CompareStatusHandler::OnKeyPressed), nullptr, this);
-        mainDlg.m_buttonAbort->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CompareStatusHandler::OnAbortCompare), nullptr, this);
+        mainDlg.m_buttonCancel->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CompareStatusHandler::OnAbortCompare), nullptr, this);
     }
     mainDlg.Update(); //don't wait until idle event!
 }
@@ -54,7 +54,7 @@ CompareStatusHandler::~CompareStatusHandler()
 
     //unregister keys
     mainDlg.Disconnect(wxEVT_CHAR_HOOK, wxKeyEventHandler(CompareStatusHandler::OnKeyPressed), nullptr, this);
-    mainDlg.m_buttonAbort->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CompareStatusHandler::OnAbortCompare), nullptr, this);
+    mainDlg.m_buttonCancel->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(CompareStatusHandler::OnAbortCompare), nullptr, this);
 
     if (abortIsRequested())
         mainDlg.flashStatusInformation(_("Operation aborted!"));
diff --git a/ui/main_dlg.cpp b/ui/main_dlg.cpp
index bc53f488..26036817 100644
--- a/ui/main_dlg.cpp
+++ b/ui/main_dlg.cpp
@@ -461,8 +461,8 @@ MainDialog::MainDialog(const xmlAccess::XmlGuiConfig& guiCfg,
 
     setRelativeFontSize(*m_buttonCompare, 1.5);
     setRelativeFontSize(*m_buttonSync,    1.5);
-    setRelativeFontSize(*m_buttonAbort,   1.5);
-	    m_buttonAbort->refreshButtonLabel(); //required after font change!
+    setRelativeFontSize(*m_buttonCancel,  1.5);
+    m_buttonCancel->refreshButtonLabel(); //required after font change!
 
     //---------------- support for dockable gui style --------------------------------
     bSizerPanelHolder->Detach(m_panelTopButtons);
@@ -578,7 +578,7 @@ MainDialog::MainDialog(const xmlAccess::XmlGuiConfig& guiCfg,
     zen::setMainWindow(this);
 
     //init handling of first folder pair
-    firstFolderPair.reset(new DirectoryPairFirst(*this));
+    firstFolderPair = make_unique<DirectoryPairFirst>(*this);
 
     initViewFilterButtons();
 
@@ -591,17 +591,16 @@ MainDialog::MainDialog(const xmlAccess::XmlGuiConfig& guiCfg,
     setConfig(guiCfg, referenceFiles);
 
     //set icons for this dialog
-    m_buttonCompare     ->setBitmapFront(GlobalResources::getImage(L"compare"), 5);
-    m_bpButtonSyncConfig->SetBitmapLabel(GlobalResources::getImage(L"syncConfig"));
-    m_bpButtonCmpConfig ->SetBitmapLabel(GlobalResources::getImage(L"cmpConfig"));
-    m_bpButtonOpen      ->SetBitmapLabel(GlobalResources::getImage(L"load"));
-    m_bpButtonBatchJob  ->SetBitmapLabel(GlobalResources::getImage(L"batch"));
-
-    m_bpButtonAddPair   ->SetBitmapLabel(GlobalResources::getImage(L"item_add"));
+    m_buttonCompare     ->setBitmapFront(getResourceImage(L"compare"), 5);
+    m_bpButtonSyncConfig->SetBitmapLabel(getResourceImage(L"syncConfig"));
+    m_bpButtonCmpConfig ->SetBitmapLabel(getResourceImage(L"cmpConfig"));
+    m_bpButtonOpen      ->SetBitmapLabel(getResourceImage(L"load"));
+    m_bpButtonBatchJob  ->SetBitmapLabel(getResourceImage(L"batch"));
+    m_bpButtonAddPair   ->SetBitmapLabel(getResourceImage(L"item_add"));
     {
         IconBuffer tmp(IconBuffer::SIZE_SMALL);
-        const wxBitmap bmpFile = tmp.genericFileIcon();
-        const wxBitmap bmpDir  = tmp.genericDirIcon();
+        const wxBitmap& bmpFile = tmp.genericFileIcon();
+        const wxBitmap& bmpDir  = tmp.genericDirIcon();
 
         m_bitmapSmallDirectoryLeft ->SetBitmap(bmpDir);
         m_bitmapSmallFileLeft      ->SetBitmap(bmpFile);
@@ -618,19 +617,19 @@ MainDialog::MainDialog(const xmlAccess::XmlGuiConfig& guiCfg,
     std::fill(dummyImg.GetAlpha(), dummyImg.GetAlpha() + dummySize * dummySize, wxIMAGE_ALPHA_TRANSPARENT);
 
     //menu icons: workaround for wxWidgets: small hack to update menu items: actually this is a wxWidgets bug (affects Windows- and Linux-build)
-    setMenuItemImage(m_menuItem10,  GlobalResources::getImage(L"compareSmall"));
-    setMenuItemImage(m_menuItem11,  GlobalResources::getImage(L"syncSmall"));
+    setMenuItemImage(m_menuItem10,  getResourceImage(L"compareSmall"));
+    setMenuItemImage(m_menuItem11,  getResourceImage(L"syncSmall"));
 
     setMenuItemImage(m_menuItemNew,  dummyImg); //it's ridiculous, but wxWidgets screws up aligning short-cut label texts if we don't set an image!
     setMenuItemImage(m_menuItemSaveAs, dummyImg);
-    setMenuItemImage(m_menuItemLoad,  GlobalResources::getImage(L"loadSmall"));
-    setMenuItemImage(m_menuItemSave,  GlobalResources::getImage(L"saveSmall"));
+    setMenuItemImage(m_menuItemLoad,  getResourceImage(L"loadSmall"));
+    setMenuItemImage(m_menuItemSave,  getResourceImage(L"saveSmall"));
 
-    setMenuItemImage(m_menuItemGlobSett, GlobalResources::getImage(L"settingsSmall"));
-    setMenuItemImage(m_menuItem7,        GlobalResources::getImage(L"batchSmall"));
+    setMenuItemImage(m_menuItemGlobSett, getResourceImage(L"settingsSmall"));
+    setMenuItemImage(m_menuItem7,        getResourceImage(L"batchSmall"));
 
-    setMenuItemImage(m_menuItemManual, GlobalResources::getImage(L"helpSmall"));
-    setMenuItemImage(m_menuItemAbout,  GlobalResources::getImage(L"aboutSmall"));
+    setMenuItemImage(m_menuItemManual, getResourceImage(L"helpSmall"));
+    setMenuItemImage(m_menuItemAbout,  getResourceImage(L"aboutSmall"));
 
     if (!manualProgramUpdateRequired())
         m_menuItemCheckVer->Enable(false);
@@ -640,7 +639,7 @@ MainDialog::MainDialog(const xmlAccess::XmlGuiConfig& guiCfg,
                   [&](const ExistingTranslations::Entry& entry)
     {
         wxMenuItem* newItem = new wxMenuItem(m_menuLanguages, wxID_ANY, entry.languageName);
-        newItem->SetBitmap(GlobalResources::getImage(entry.languageFlag));
+        newItem->SetBitmap(getResourceImage(entry.languageFlag));
 
         //map menu item IDs with language IDs: evaluated when processing event handler
         languageMenuItemMap.insert(std::make_pair(newItem->GetId(), entry.languageID));
@@ -1069,7 +1068,7 @@ public:
         mainDlg.disableAllElements(true); //disable everything except abort button
 
         //register abort button
-        mainDlg.m_buttonAbort->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ManualDeletionHandler::OnAbortDeletion), nullptr, this );
+        mainDlg.m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ManualDeletionHandler::OnAbortDeletion), nullptr, this );
         mainDlg.Connect(wxEVT_CHAR_HOOK, wxKeyEventHandler(ManualDeletionHandler::OnKeyPressed), nullptr, this);
     }
 
@@ -1077,7 +1076,7 @@ public:
     {
         //de-register abort button
         mainDlg.Disconnect(wxEVT_CHAR_HOOK, wxKeyEventHandler(ManualDeletionHandler::OnKeyPressed), nullptr, this);
-        mainDlg.m_buttonAbort->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ManualDeletionHandler::OnAbortDeletion ), nullptr, this );
+        mainDlg.m_buttonCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ManualDeletionHandler::OnAbortDeletion ), nullptr, this );
 
         mainDlg.enableAllElements();
     }
@@ -1440,10 +1439,10 @@ void MainDialog::disableAllElements(bool enableAbort)
     if (enableAbort)
     {
         //show abort button
-        m_buttonAbort->Enable();
-        m_buttonAbort->Show();
-        if (m_buttonAbort->IsShownOnScreen())
-            m_buttonAbort->SetFocus();
+        m_buttonCancel->Enable();
+        m_buttonCancel->Show();
+        if (m_buttonCancel->IsShownOnScreen())
+            m_buttonCancel->SetFocus();
         m_buttonCompare->Disable();
         m_buttonCompare->Hide();
         m_panelTopButtons->Layout();
@@ -1477,8 +1476,8 @@ void MainDialog::enableAllElements()
     m_menubar1->EnableTop(2, true);
 
     //show compare button
-    m_buttonAbort->Disable();
-    m_buttonAbort->Hide();
+    m_buttonCancel->Disable();
+    m_buttonCancel->Hide();
     m_buttonCompare->Enable();
     m_buttonCompare->Show();
 
@@ -1888,9 +1887,9 @@ void MainDialog::onNaviGridContext(GridClickEvent& event)
     if (!selection.empty())
     {
         if (selection[0]->isActive())
-            menu.addItem(_("Exclude temporarily") + L"\tSpace", [this, &selection] { setFilterManually(selection, false); }, &GlobalResources::getImage(L"checkboxFalse"));
+            menu.addItem(_("Exclude temporarily") + L"\tSpace", [this, &selection] { setFilterManually(selection, false); }, &getResourceImage(L"checkboxFalse"));
         else
-            menu.addItem(_("Include temporarily") + L"\tSpace", [this, &selection] { setFilterManually(selection, true); }, &GlobalResources::getImage(L"checkboxTrue"));
+            menu.addItem(_("Include temporarily") + L"\tSpace", [this, &selection] { setFilterManually(selection, true); }, &getResourceImage(L"checkboxTrue"));
     }
     else
         menu.addItem(_("Exclude temporarily") + L"\tSpace", [] {}, nullptr, false);
@@ -1901,13 +1900,13 @@ void MainDialog::onNaviGridContext(GridClickEvent& event)
     {
         //by relative path
         menu.addItem(_("Exclude via filter:") + L" " + (FILE_NAME_SEPARATOR + selection[0]->getObjRelativeName()),
-                     [this, &selection] { excludeItems(selection); }, &GlobalResources::getImage(L"filterSmall"));
+                     [this, &selection] { excludeItems(selection); }, &getResourceImage(L"filterSmall"));
     }
     else if (selection.size() > 1)
     {
         //by relative path
         menu.addItem(_("Exclude via filter:") + L" " + _("<multiple selection>"),
-                     [this, &selection] { excludeItems(selection); }, &GlobalResources::getImage(L"filterSmall"));
+                     [this, &selection] { excludeItems(selection); }, &getResourceImage(L"filterSmall"));
     }
 
     //----------------------------------------------------------------------------------------------------
@@ -1980,9 +1979,9 @@ void MainDialog::onMainGridContextRim(bool leftSide)
     if (!selection.empty())
     {
         if (selection[0]->isActive())
-            menu.addItem(_("Exclude temporarily") + L"\tSpace", [this, &selection] { setFilterManually(selection, false); }, &GlobalResources::getImage(L"checkboxFalse"));
+            menu.addItem(_("Exclude temporarily") + L"\tSpace", [this, &selection] { setFilterManually(selection, false); }, &getResourceImage(L"checkboxFalse"));
         else
-            menu.addItem(_("Include temporarily") + L"\tSpace", [this, &selection] { setFilterManually(selection, true); }, &GlobalResources::getImage(L"checkboxTrue"));
+            menu.addItem(_("Include temporarily") + L"\tSpace", [this, &selection] { setFilterManually(selection, true); }, &getResourceImage(L"checkboxTrue"));
     }
     else
         menu.addItem(_("Exclude temporarily") + L"\tSpace", [] {}, nullptr, false);
@@ -2014,13 +2013,13 @@ void MainDialog::onMainGridContextRim(bool leftSide)
         submenu.addItem(utfCvrtTo<wxString>(FILE_NAME_SEPARATOR + selection[0]->getObjRelativeName()),
                         [this, &selection] { excludeItems(selection); });
 
-        menu.addSubmenu(_("Exclude via filter:"), submenu, &GlobalResources::getImage(L"filterSmall"));
+        menu.addSubmenu(_("Exclude via filter:"), submenu, &getResourceImage(L"filterSmall"));
     }
     else if (selection.size() > 1)
     {
         //by relative path
         menu.addItem(_("Exclude via filter:") + L" " + _("<multiple selection>"),
-                     [this, &selection] { excludeItems(selection); }, &GlobalResources::getImage(L"filterSmall"));
+                     [this, &selection] { excludeItems(selection); }, &getResourceImage(L"filterSmall"));
     }
 
     //----------------------------------------------------------------------------------------------------
@@ -2140,8 +2139,8 @@ void MainDialog::excludeItems(const std::vector<FileSystemObject*>& selection)
 void MainDialog::onGridLabelContextC(GridClickEvent& event)
 {
     ContextMenu menu;
-    menu.addItem(_("Category") + L"\tF8", [&] { showSyncAction(false); }, showSyncAction_ ? nullptr : &GlobalResources::getImage(L"compareSmall"));
-    menu.addItem(_("Action"),             [&] { showSyncAction(true ); }, showSyncAction_ ? &GlobalResources::getImage(L"syncSmall") : nullptr);
+    menu.addItem(_("Category") + L"\tF8", [&] { showSyncAction(false); }, showSyncAction_ ? nullptr : &getResourceImage(L"compareSmall"));
+    menu.addItem(_("Action"),             [&] { showSyncAction(true ); }, showSyncAction_ ? &getResourceImage(L"syncSmall") : nullptr);
     menu.popup(*this);
 }
 
@@ -2424,10 +2423,10 @@ void MainDialog::updateUnsavedCfgStatus()
     const wxString activeCfgFilename = activeConfigFiles.size() == 1 && activeConfigFiles[0] != lastRunConfigName() ? activeConfigFiles[0] : wxString();
 
     const bool haveUnsavedCfg = lastConfigurationSaved != getConfig();
-    const bool singleCfgLoaded = !activeCfgFilename.empty();
 
     //update save config button
-    const bool allowSave = !singleCfgLoaded || haveUnsavedCfg;
+    const bool allowSave = haveUnsavedCfg ||
+                           activeConfigFiles.size() > 1;
 
     auto makeBrightGrey = [](const wxBitmap& bmp) -> wxBitmap
     {
@@ -2435,11 +2434,10 @@ void MainDialog::updateUnsavedCfgStatus()
         brighten(img, 80);
         return img;
     };
-    //setImage(*m_bpButtonSave, greyScale(GlobalResources::getImage(L"save")));
+    //setImage(*m_bpButtonSave, greyScale(getResourceImage(L"save")));
 
-    setImage(*m_bpButtonSave, allowSave ? GlobalResources::getImage(L"save") : makeBrightGrey(GlobalResources::getImage(L"save")));
+    setImage(*m_bpButtonSave, allowSave ? getResourceImage(L"save") : makeBrightGrey(getResourceImage(L"save")));
     m_bpButtonSave->Enable(allowSave);
-
     m_menuItemSave->Enable(allowSave); //bitmap is automatically greyscaled on Win7 (introducing a crappy looking shift), but not on XP
 
     //set main dialog title
@@ -2447,8 +2445,17 @@ void MainDialog::updateUnsavedCfgStatus()
     if (haveUnsavedCfg)
         title += L'*';
 
-    if (singleCfgLoaded)
+    if (!activeCfgFilename.empty())
         title += activeCfgFilename;
+    else if (activeConfigFiles.size() > 1)
+    {
+#ifdef _MSC_VER
+#pragma warning(disable:4428)	// VC wrongly issues warning C4428: universal-character-name encountered in source
+#endif
+        const wchar_t* EM_DASH = L" \u2014 ";
+        title += xmlAccess::extractJobName(toZ(activeConfigFiles[0]));
+        std::for_each(activeConfigFiles.begin() + 1, activeConfigFiles.end(), [&](const wxString& filename) { title += EM_DASH + xmlAccess::extractJobName(toZ(filename)); });
+    }
     else
         title += L"FreeFileSync - " + _("Folder Comparison and Synchronization");
 
@@ -2613,14 +2620,14 @@ bool MainDialog::saveOldConfig() //return false on user abort
                 //only if check is active and non-default config file loaded
             {
                 bool neverSave = !globalCfg.optDialogs.popupOnConfigChange;
-                CheckBox cb(_("Never save changes"), neverSave);
 
                 switch (showQuestionDlg(this,
                                         ReturnQuestionDlg::BUTTON_YES | ReturnQuestionDlg::BUTTON_NO | ReturnQuestionDlg::BUTTON_CANCEL,
                                         replaceCpy(_("Do you want to save changes to %x?"), L"%x", fmtFileName(afterLast(utfCvrtTo<Zstring>(activeCfgFilename), FILE_NAME_SEPARATOR))),
-                                        activeCfgFilename, //caption
-                                        _("&Save"), _("Do&n't save"),
-                                        &cb))
+                                        QuestConfig().setCaption(activeCfgFilename).
+                                        setLabelYes(_("&Save")).
+                                        setLabelNo(_("Do&n't save")).
+                                        showCheckBox(neverSave, _("Never save changes"))))
                 {
                     case ReturnQuestionDlg::BUTTON_YES:
 
@@ -3054,17 +3061,17 @@ void MainDialog::OnToggleViewButton(wxCommandEvent& event)
 inline
 wxBitmap buttonPressed(const std::string& name)
 {
-    wxBitmap background = GlobalResources::getImage(L"buttonPressed");
+    wxBitmap background = getResourceImage(L"buttonPressed");
     return mirrorIfRtl(
                layOver(
-                   GlobalResources::getImage(utfCvrtTo<wxString>(name)), background));
+                   getResourceImage(utfCvrtTo<wxString>(name)), background));
 }
 
 
 inline
 wxBitmap buttonReleased(const std::string& name)
 {
-    wxImage output = GlobalResources::getImage(utfCvrtTo<wxString>(name)).ConvertToImage().ConvertToGreyscale(1.0/3, 1.0/3, 1.0/3); //treat all channels equally!
+    wxImage output = getResourceImage(utfCvrtTo<wxString>(name)).ConvertToImage().ConvertToGreyscale(1.0/3, 1.0/3, 1.0/3); //treat all channels equally!
     zen::move(output, 0, -1); //move image right one pixel
 
     brighten(output, 80);
@@ -3210,12 +3217,12 @@ void MainDialog::updateFilterButtons()
     //global filter: test for Null-filter
     if (!isNullFilter(currentCfg.mainCfg.globalFilter))
     {
-        setImage(*m_bpButtonFilter, GlobalResources::getImage(L"filter"));
+        setImage(*m_bpButtonFilter, getResourceImage(L"filter"));
         m_bpButtonFilter->SetToolTip(_("Filter is active"));
     }
     else
     {
-        setImage(*m_bpButtonFilter, greyScale(GlobalResources::getImage(L"filter")));
+        setImage(*m_bpButtonFilter, greyScale(getResourceImage(L"filter")));
         m_bpButtonFilter->SetToolTip(_("No filter selected"));
     }
 
@@ -3325,12 +3332,12 @@ void MainDialog::updateGui()
     if (!folderCmp.empty())
     {
         m_buttonSync->SetForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNTEXT));
-        m_buttonSync->setBitmapFront(GlobalResources::getImage(L"sync"), 5);
+        m_buttonSync->setBitmapFront(getResourceImage(L"sync"), 5);
     }
     else
     {
         m_buttonSync->SetForegroundColour(wxColor(128, 128, 128)); //Some colors seem to have problems with 16-bit desktop color, well this one hasn't!
-        m_buttonSync->setBitmapFront(greyScale(GlobalResources::getImage(L"sync")), 5);
+        m_buttonSync->setBitmapFront(greyScale(getResourceImage(L"sync")), 5);
     }
 
     auiMgr.Update(); //fix small display distortion, if view filter panel is empty
@@ -3354,18 +3361,18 @@ void MainDialog::updateStatistics()
 
     setText(*m_staticTextData, filesizeToShortString(st.getDataToProcess()));
     if (st.getDataToProcess() == 0)
-        m_bitmapData->SetBitmap(greyScale(GlobalResources::getImage(L"data")));
+        m_bitmapData->SetBitmap(greyScale(getResourceImage(L"data")));
     else
-        m_bitmapData->SetBitmap(GlobalResources::getImage(L"data"));
+        m_bitmapData->SetBitmap(getResourceImage(L"data"));
 
     auto setValue = [](wxStaticText& txtControl, int value, wxStaticBitmap& bmpControl, const wchar_t* bmpName)
     {
         setText(txtControl, toGuiString(value));
 
         if (value == 0)
-            bmpControl.SetBitmap(greyScale(mirrorIfRtl(GlobalResources::getImage(bmpName))));
+            bmpControl.SetBitmap(greyScale(mirrorIfRtl(getResourceImage(bmpName))));
         else
-            bmpControl.SetBitmap(mirrorIfRtl(GlobalResources::getImage(bmpName)));
+            bmpControl.SetBitmap(mirrorIfRtl(getResourceImage(bmpName)));
     };
 
     setValue(*m_staticTextCreateLeft,  st.getCreate<LEFT_SIDE >(), *m_bitmapCreateLeft,  L"createLeftSmall");
@@ -3874,7 +3881,7 @@ void MainDialog::updateGuiForFolderPair()
     m_bpButtonAltCompCfg ->Show(showLocalCfgFirstPair);
     m_bpButtonAltSyncCfg ->Show(showLocalCfgFirstPair);
     m_bpButtonLocalFilter->Show(showLocalCfgFirstPair);
-    setImage(*m_bpButtonSwapSides, GlobalResources::getImage(showLocalCfgFirstPair ? L"swapSlim" : L"swap"));
+    setImage(*m_bpButtonSwapSides, getResourceImage(showLocalCfgFirstPair ? L"swapSlim" : L"swap"));
     m_panelTopMiddle->Layout();      //both required to update button size for calculations below!!!
     m_panelDirectoryPairs->Layout(); //   -> updates size of stretched m_panelTopLeft!
 
@@ -4203,6 +4210,8 @@ void MainDialog::OnRegularUpdateCheck(wxIdleEvent& event)
 
 void MainDialog::OnLayoutWindowAsync(wxIdleEvent& event)
 {
+    warn_static("harmonize with async version check?")
+
     //execute just once per startup!
     Disconnect(wxEVT_IDLE, wxIdleEventHandler(MainDialog::OnLayoutWindowAsync), nullptr, this);
 
@@ -4229,12 +4238,6 @@ void MainDialog::OnShowHelp(wxCommandEvent& event)
     zen::displayHelpEntry(this);
 }
 
-
-void MainDialog::OnMenuQuit(wxCommandEvent& event)
-{
-    Close();
-}
-
 //#########################################################################################################
 
 //language selection
@@ -4268,4 +4271,3 @@ void MainDialog::showSyncAction(bool value)
 
     updateGui();
 }
-
diff --git a/ui/main_dlg.h b/ui/main_dlg.h
index d4b06a08..e1b2d44f 100644
--- a/ui/main_dlg.h
+++ b/ui/main_dlg.h
@@ -222,12 +222,13 @@ private:
     void applySyncConfig();
 
     //menu events
-    void OnMenuGlobalSettings(wxCommandEvent& event);
-    void OnMenuExportFileList(wxCommandEvent& event);
-    void OnMenuCheckVersion  (wxCommandEvent& event);
-    void OnMenuAbout         (wxCommandEvent& event);
-    void OnShowHelp          (wxCommandEvent& event);
-    void OnMenuQuit          (wxCommandEvent& event);
+    virtual void OnMenuGlobalSettings(wxCommandEvent& event);
+    virtual void OnMenuExportFileList(wxCommandEvent& event);
+    virtual void OnMenuCheckVersion  (wxCommandEvent& event);
+    virtual void OnMenuAbout         (wxCommandEvent& event);
+    virtual void OnShowHelp          (wxCommandEvent& event);
+    virtual void OnMenuQuit          (wxCommandEvent& event) { Close(); }
+
     void OnMenuLanguageSwitch(wxCommandEvent& event);
 
     void switchProgramLanguage(int langID);
diff --git a/ui/msg_popup.cpp b/ui/msg_popup.cpp
index 59579541..fb33dfb0 100644
--- a/ui/msg_popup.cpp
+++ b/ui/msg_popup.cpp
@@ -11,6 +11,15 @@
 
 using namespace zen;
 
+namespace
+{
+void setAsStandard(wxButton& btn)
+{
+    btn.SetDefault();
+    btn.SetFocus();
+}
+}
+
 
 class ErrorDlg : public MessageDlgGenerated
 {
@@ -28,8 +37,8 @@ private:
     void OnButton2(wxCommandEvent& event);
 
     bool* ignoreErrors;
-    wxButton& buttonIgnore;           //
-    wxButton& buttonRetry;            // map generic controls
+    wxButton& buttonRetry;            //
+    wxButton& buttonIgnore;           // map generic controls
     wxCheckBox& checkBoxIgnoreErrors; //
 };
 
@@ -37,21 +46,21 @@ private:
 ErrorDlg::ErrorDlg(wxWindow* parent, int activeButtons, const wxString& messageText, const wxString& caption, bool* ignoreNextErrors) :
     MessageDlgGenerated(parent),
     ignoreErrors(ignoreNextErrors),
-    buttonIgnore(*m_buttonCustom1),
-    buttonRetry (*m_buttonCustom2),
+    buttonRetry (*m_buttonCustom1),
+    buttonIgnore(*m_buttonCustom2),
     checkBoxIgnoreErrors(*m_checkBoxCustom)
 {
 #ifdef FFS_WIN
     new zen::MouseMoveWindow(*this); //allow moving main dialog by clicking (nearly) anywhere...; ownership passed to "this"
 #endif
     SetTitle(!caption.empty() ? caption : _("Error"));
-    m_bitmapMsgType->SetBitmap(GlobalResources::getImage(L"msg_error"));
+    m_bitmapMsgType->SetBitmap(getResourceImage(L"msg_error"));
     m_textCtrlMessage->SetValue(messageText);
     checkBoxIgnoreErrors.SetLabel(_("Ignore further errors"));
     buttonIgnore.SetLabel(_("&Ignore"));
     buttonRetry .SetLabel(_("&Retry"));
-    buttonIgnore.SetId(wxID_IGNORE);
-    buttonRetry .SetId(wxID_RETRY);
+    //buttonIgnore.SetId(wxID_IGNORE); -> setting id after button creation breaks "mouse snap to" functionality
+    //buttonRetry .SetId(wxID_RETRY);  -> also wxWidgets docs seem to hide some info: "Normally, the identifier should be provided on creation and should not be modified subsequently."
 
     if (ignoreNextErrors)
         checkBoxIgnoreErrors.SetValue(*ignoreNextErrors);
@@ -72,29 +81,29 @@ ErrorDlg::ErrorDlg(wxWindow* parent, int activeButtons, const wxString& messageT
 
     //set button focus precedence
     if (activeButtons & ReturnErrorDlg::BUTTON_RETRY)
-        buttonRetry.SetFocus();
+        setAsStandard(buttonRetry);
     else if (activeButtons & ReturnErrorDlg::BUTTON_IGNORE)
-        buttonIgnore.SetFocus();
+        setAsStandard(buttonIgnore);
     else if (activeButtons & ReturnErrorDlg::BUTTON_CANCEL)
-        m_buttonCancel->SetFocus();
+        setAsStandard(*m_buttonCancel);
 
     Fit(); //child-element widths have changed: image was set
 }
 
 
-void ErrorDlg::OnButton1(wxCommandEvent& event) //ignore
+void ErrorDlg::OnButton1(wxCommandEvent& event) //retry
 {
     if (ignoreErrors)
         *ignoreErrors = checkBoxIgnoreErrors.GetValue();
-    EndModal(ReturnErrorDlg::BUTTON_IGNORE);
+    EndModal(ReturnErrorDlg::BUTTON_RETRY);
 }
 
 
-void ErrorDlg::OnButton2(wxCommandEvent& event) //retry
+void ErrorDlg::OnButton2(wxCommandEvent& event) //ignore
 {
     if (ignoreErrors)
         *ignoreErrors = checkBoxIgnoreErrors.GetValue();
-    EndModal(ReturnErrorDlg::BUTTON_RETRY);
+    EndModal(ReturnErrorDlg::BUTTON_IGNORE);
 }
 
 
@@ -145,13 +154,13 @@ WarningDlg::WarningDlg(wxWindow* parent,  int activeButtons, const wxString& mes
     new zen::MouseMoveWindow(*this); //allow moving main dialog by clicking (nearly) anywhere...; ownership passed to "this"
 #endif
     SetTitle(_("Warning"));
-    m_bitmapMsgType->SetBitmap(GlobalResources::getImage(L"msg_warning"));
+    m_bitmapMsgType->SetBitmap(getResourceImage(L"msg_warning"));
     m_textCtrlMessage->SetValue(messageText);
     checkBoxDontShowAgain.SetLabel(_("Don't show this dialog again"));
     buttonIgnore.SetLabel(_("&Ignore"));
     buttonSwitch.SetLabel(_("&Switch"));
-    buttonIgnore.SetId(wxID_IGNORE);
-    buttonSwitch.SetId(wxID_MORE);
+    //buttonIgnore.SetId(wxID_IGNORE); -> see comment in ErrorDlg
+    //buttonSwitch.SetId(wxID_MORE);
 
     checkBoxDontShowAgain.SetValue(dontShowAgain);
 
@@ -169,9 +178,9 @@ WarningDlg::WarningDlg(wxWindow* parent,  int activeButtons, const wxString& mes
 
     //set button focus precedence
     if (activeButtons & ReturnWarningDlg::BUTTON_IGNORE)
-        buttonIgnore.SetFocus();
+        setAsStandard(buttonIgnore);
     else if (activeButtons & ReturnWarningDlg::BUTTON_CANCEL)
-        m_buttonCancel->SetFocus();
+        setAsStandard(*m_buttonCancel);
 
     Fit(); //child-element widths have changed: image was set
 }
@@ -197,13 +206,13 @@ ReturnWarningDlg::ButtonPressed zen::showWarningDlg(wxWindow* parent, int active
     warningDlg.Raise();
     return static_cast<ReturnWarningDlg::ButtonPressed>(warningDlg.ShowModal());
 }
-//########################################################################################
 
+//########################################################################################
 
 class QuestionDlg : public MessageDlgGenerated
 {
 public:
-    QuestionDlg(wxWindow* parent, int activeButtons, const wxString& messageText, const wxString& caption, const wxString& labelYes, const wxString& labelNo, CheckBox* checkbox);
+    QuestionDlg(wxWindow* parent, int activeButtons, const wxString& messageText, const wxString& caption, const wxString& labelYes, const wxString& labelNo, bool* checkBoxValue, const wxString& checkBoxLabel);
 
 private:
     void OnClose (wxCloseEvent&   event) { EndModal(ReturnQuestionDlg::BUTTON_CANCEL); }
@@ -211,7 +220,7 @@ private:
     void OnButton1(wxCommandEvent& event);
     void OnButton2(wxCommandEvent& event);
 
-    CheckBox* checkbox_; //optional
+    bool* checkBoxValue_; //optional
     wxButton& buttonYes; // map generic controls
     wxButton& buttonNo;  //
 };
@@ -223,9 +232,11 @@ QuestionDlg::QuestionDlg(wxWindow* parent,
                          const wxString& caption, //optional
                          const wxString& labelYes,
                          const wxString& labelNo,
-                         CheckBox* checkbox) :
+                         //optional checkbox:
+                         bool* checkBoxValue,
+                         const wxString& checkBoxLabel) :
     MessageDlgGenerated(parent),
-    checkbox_(checkbox),
+    checkBoxValue_(checkBoxValue),
     buttonYes(*m_buttonCustom1),
     buttonNo (*m_buttonCustom2)
 {
@@ -233,17 +244,17 @@ QuestionDlg::QuestionDlg(wxWindow* parent,
     new zen::MouseMoveWindow(*this); //allow moving main dialog by clicking (nearly) anywhere...; ownership passed to "this"
 #endif
     SetTitle(!caption.empty()? caption : _("Question"));
-    m_bitmapMsgType->SetBitmap(GlobalResources::getImage(L"msg_question"));
+    m_bitmapMsgType->SetBitmap(getResourceImage(L"msg_question"));
     m_textCtrlMessage->SetValue(messageText);
     buttonYes.SetLabel(!labelYes.empty() ? labelYes : _("&Yes"));
     buttonNo .SetLabel(!labelNo .empty() ? labelNo  : _("&No"));
-    buttonYes.SetId(wxID_YES);
-    buttonNo .SetId(wxID_NO);
+    //buttonYes.SetId(wxID_YES); -> see comment in ErrorDlg
+    //buttonNo .SetId(wxID_NO);
 
-    if (checkbox_)
+    if (checkBoxValue)
     {
-        m_checkBoxCustom->SetValue(checkbox_->value_);
-        m_checkBoxCustom->SetLabel(checkbox_->label_);
+        m_checkBoxCustom->SetValue(*checkBoxValue);
+        m_checkBoxCustom->SetLabel(checkBoxLabel);
     }
     else
         m_checkBoxCustom->Hide();
@@ -259,26 +270,26 @@ QuestionDlg::QuestionDlg(wxWindow* parent,
 
     //set button focus precedence
     if (activeButtons & ReturnQuestionDlg::BUTTON_YES)
-        buttonYes.SetFocus();
-    else if (activeButtons & ReturnQuestionDlg::BUTTON_CANCEL)
-        m_buttonCancel->SetFocus();
+        setAsStandard(buttonYes);
     else if (activeButtons & ReturnQuestionDlg::BUTTON_NO)
-        buttonNo.SetFocus();
+        setAsStandard(buttonNo);
+    else if (activeButtons & ReturnQuestionDlg::BUTTON_CANCEL)
+        setAsStandard(*m_buttonCancel);
 
     Fit(); //child-element widths have changed: image was set
 }
 
 void QuestionDlg::OnButton1(wxCommandEvent& event) //yes
 {
-    if (checkbox_)
-        checkbox_->value_ = m_checkBoxCustom->GetValue();
+    if (checkBoxValue_)
+        *checkBoxValue_ = m_checkBoxCustom->GetValue();
     EndModal(ReturnQuestionDlg::BUTTON_YES);
 }
 
 void QuestionDlg::OnButton2(wxCommandEvent& event) //no
 {
-    if (checkbox_)
-        checkbox_->value_ = m_checkBoxCustom->GetValue();
+    if (checkBoxValue_)
+        *checkBoxValue_ = m_checkBoxCustom->GetValue();
     EndModal(ReturnQuestionDlg::BUTTON_NO);
 }
 
@@ -286,11 +297,9 @@ void QuestionDlg::OnButton2(wxCommandEvent& event) //no
 ReturnQuestionDlg::ButtonPressed zen::showQuestionDlg(wxWindow* parent,
                                                       int activeButtons,
                                                       const wxString& messageText,
-                                                      const wxString& caption, //optional
-                                                      const wxString& labelYes, const wxString& labelNo,
-                                                      CheckBox* checkbox)
+                                                      const QuestConfig& cfg)
 {
-    QuestionDlg qtnDlg(parent, activeButtons, messageText, caption, labelYes, labelNo, checkbox);
+    QuestionDlg qtnDlg(parent, activeButtons, messageText, cfg.caption, cfg.labelYes, cfg.labelNo, cfg.checkBoxValue, cfg.checkBoxLabel);
     qtnDlg.Raise();
     return static_cast<ReturnQuestionDlg::ButtonPressed>(qtnDlg.ShowModal());
 }
diff --git a/ui/msg_popup.h b/ui/msg_popup.h
index c5557480..5e59eb6b 100644
--- a/ui/msg_popup.h
+++ b/ui/msg_popup.h
@@ -19,8 +19,8 @@ struct ReturnErrorDlg
 {
     enum ButtonPressed
     {
-        BUTTON_IGNORE = 1,
-        BUTTON_RETRY  = 2,
+        BUTTON_RETRY  = 1,
+        BUTTON_IGNORE = 2,
         BUTTON_CANCEL = 4
     };
 };
@@ -60,21 +60,30 @@ struct ReturnQuestionDlg
     };
 };
 
-struct CheckBox
+class QuestConfig;
+ReturnQuestionDlg::ButtonPressed showQuestionDlg(wxWindow* parent, int activeButtons, const wxString& messageText, const QuestConfig& cfg);
+
+class QuestConfig
 {
-    CheckBox(const wxString& label, bool& value) : label_(label), value_(value) {}
+public:
+    QuestConfig() : checkBoxValue() {}
+    QuestConfig& setCaption (const wxString& label) { caption  = label; return *this; }
+    QuestConfig& setLabelYes(const wxString& label) { labelYes = label; return *this; }
+    QuestConfig& setLabelNo (const wxString& label) { labelNo  = label; return *this; }
+    QuestConfig& showCheckBox(bool& value, const wxString& label) { checkBoxLabel = label; checkBoxValue = &value; return *this; }
+
+private:
+    friend ReturnQuestionDlg::ButtonPressed showQuestionDlg(wxWindow* parent, int activeButtons, const wxString& messageText, const QuestConfig& cfg);
 
-    wxString label_; //in
-    bool& value_;    //in/out
+    wxString caption;
+    wxString labelYes; //overwrite default "Yes, No" labels
+    wxString labelNo;  //
+    //optional checkbox:
+    bool* checkBoxValue;    //in/out
+    wxString checkBoxLabel; //in
 };
 
-ReturnQuestionDlg::ButtonPressed showQuestionDlg(wxWindow* parent,
-                                                 int activeButtons,
-                                                 const wxString& messageText,
-                                                 const wxString& caption  = wxString(),
-                                                 const wxString& labelYes = wxString(), //overwrite default "Yes, No" labels
-                                                 const wxString& labelNo  = wxString(), //
-                                                 CheckBox* checkbox = nullptr);
+ReturnQuestionDlg::ButtonPressed showQuestionDlg(wxWindow* parent, int activeButtons, const wxString& messageText, const QuestConfig& cfg = QuestConfig());
 }
 
 #endif // MESSAGEPOPUP_H_INCLUDED
diff --git a/ui/osx_dock.h b/ui/osx_dock.h
index a3ffa0c5..f2765780 100644
--- a/ui/osx_dock.h
+++ b/ui/osx_dock.h
@@ -7,23 +7,10 @@
 #ifndef OSX_DOCK_837210847312534
 #define OSX_DOCK_837210847312534
 
-#include <string>
+#include <zen/osx_error.h>
 
 namespace osx
 {
-class OsxError //Exception base class used to notify file/directory copy/delete errors
-{
-public:
-    explicit OsxError(const std::string& message) : msg(message) {}
-    virtual ~OsxError() {}
-
-    const std::string& toString() const { return msg; }
-
-private:
-    std::string msg;
-};
-
-
 void dockIconSetText(const char* str); //throw OsxError
 }
 
diff --git a/ui/osx_dock.mm b/ui/osx_dock.mm
index 5ac6d154..a7161f60 100644
--- a/ui/osx_dock.mm
+++ b/ui/osx_dock.mm
@@ -5,31 +5,20 @@
 // **************************************************************************
 
 #include "osx_dock.h"
-#import <Cocoa/Cocoa.h>
+#include <zen/osx_throw_exception.h>
+#include <Cocoa/Cocoa.h>
 
 
-void osx::dockIconSetText(const char* str)
+void osx::dockIconSetText(const char* str) //throw OsxError
 {
     @try
     {
-		NSString* label = [NSString stringWithCString:str encoding:NSUTF8StringEncoding];
-		[[NSApp dockTile] setBadgeLabel:label];
+		NSString* label = [NSString stringWithCString:str encoding:NSUTF8StringEncoding]; 
+		//stringWithCString returns string which is already set to autorelease!
+		[[NSApp dockTile] setBadgeLabel:label]; //label may be nil
     }
     @catch (NSException* e)
     {
-		std::string msg;
-		if (const char* name  = [[e name  ] cStringUsingEncoding:NSUTF8StringEncoding])
-			msg += name;
-		if (const char* descr = [[e reason] cStringUsingEncoding:NSUTF8StringEncoding])
-		{
-			msg += "\n";
-			msg += descr;
-		}
-		throw OsxError(msg);
-		/*
-		e.g.
-		NSInvalidArgumentException
-		*** +[NSString stringWithCString:encoding:]: NULL cString
-		*/
+		throwOsxError(e); //throw OsxError
     }
 }
diff --git a/ui/progress_indicator.cpp b/ui/progress_indicator.cpp
index 1e5285be..b36ccb0f 100644
--- a/ui/progress_indicator.cpp
+++ b/ui/progress_indicator.cpp
@@ -205,6 +205,8 @@ void CompareProgressDialog::Pimpl::updateStatusPanelNow()
                     //current speed -> Win 7 copy uses 1 sec update interval
                     setText(*m_staticTextSpeed, perf->getBytesPerSecond(), &layoutChanged);
                 }
+
+                warn_static("more often: eveyr 100 ms?")
                 //remaining time
                 setText(*m_staticTextRemTime, perf->getRemainingTime(to<double>(dataTotal - dataCurrent)), &layoutChanged);
             }
@@ -270,16 +272,16 @@ namespace
 inline
 wxBitmap buttonPressed(const std::string& name)
 {
-    wxBitmap background = GlobalResources::getImage(L"log button pressed");
-    return layOver(GlobalResources::getImage(utfCvrtTo<wxString>(name)), background);
+    wxBitmap background = getResourceImage(L"log button pressed");
+    return layOver(getResourceImage(utfCvrtTo<wxString>(name)), background);
 }
 
 
 inline
 wxBitmap buttonReleased(const std::string& name)
 {
-    wxImage output = greyScale(GlobalResources::getImage(utfCvrtTo<wxString>(name))).ConvertToImage();
-    //GlobalResources::getImage(utfCvrtTo<wxString>(name)).ConvertToImage().ConvertToGreyscale(1.0/3, 1.0/3, 1.0/3); //treat all channels equally!
+    wxImage output = greyScale(getResourceImage(utfCvrtTo<wxString>(name))).ConvertToImage();
+    //getResourceImage(utfCvrtTo<wxString>(name)).ConvertToImage().ConvertToGreyscale(1.0/3, 1.0/3, 1.0/3); //treat all channels equally!
     //brighten(output, 30);
 
     zen::move(output, 0, -1); //move image right one pixel
@@ -470,14 +472,14 @@ public:
                         switch (entry.type)
                         {
                             case TYPE_INFO:
-                                dc.DrawLabel(wxString(), GlobalResources::getImage(L"msg_small_info"), rectTmp, wxALIGN_CENTER);
+                                dc.DrawLabel(wxString(), getResourceImage(L"msg_small_info"), rectTmp, wxALIGN_CENTER);
                                 break;
                             case TYPE_WARNING:
-                                dc.DrawLabel(wxString(), GlobalResources::getImage(L"msg_small_warning"), rectTmp, wxALIGN_CENTER);
+                                dc.DrawLabel(wxString(), getResourceImage(L"msg_small_warning"), rectTmp, wxALIGN_CENTER);
                                 break;
                             case TYPE_ERROR:
                             case TYPE_FATAL_ERROR:
-                                dc.DrawLabel(wxString(), GlobalResources::getImage(L"msg_small_error"), rectTmp, wxALIGN_CENTER);
+                                dc.DrawLabel(wxString(), getResourceImage(L"msg_small_error"), rectTmp, wxALIGN_CENTER);
                                 break;
                         }
                     break;
@@ -504,7 +506,7 @@ public:
                     return 2 * COLUMN_BORDER_LEFT + dc.GetTextExtent(getValue(row, colType)).GetWidth();
 
                 case COL_TYPE_MSG_CATEGORY:
-                    return GlobalResources::getImage(L"msg_small_info").GetWidth();
+                    return getResourceImage(L"msg_small_info").GetWidth();
 
                 case COL_TYPE_MSG_TEXT:
                     return COLUMN_BORDER_LEFT + dc.GetTextExtent(getValue(row, colType)).GetWidth();
@@ -521,12 +523,12 @@ public:
 
     static int getColumnCategoryDefaultWidth()
     {
-        return GlobalResources::getImage(L"msg_small_info").GetWidth();
+        return getResourceImage(L"msg_small_info").GetWidth();
     }
 
     static int getRowDefaultHeight(const Grid& grid)
     {
-        return std::max(GlobalResources::getImage(L"msg_small_info").GetHeight(), grid.getMainWin().GetCharHeight() + 2) + 1; //+ some space + bottom border
+        return std::max(getResourceImage(L"msg_small_info").GetHeight(), grid.getMainWin().GetCharHeight() + 2) + 1; //+ some space + bottom border
     }
 
     virtual wxString getToolTip(size_t row, ColumnType colType) const
@@ -927,13 +929,15 @@ SyncProgressDialog::Pimpl::Pimpl(AbortCallback& abortCb,
     paused_   (false),
     finalResult(RESULT_ABORTED), //dummy value
     isZombie(false),
-    lastStatCallSpeed  (-1000000), //some big number
+    lastStatCallSpeed(-1000000), //some big number
     phaseStartMs(0)
 {
 #ifdef FFS_WIN
     new MouseMoveWindow(*this); //allow moving main dialog by clicking (nearly) anywhere...; ownership passed to "this"
 #endif
 
+    assert(m_buttonClose->GetId() == wxID_OK); //we cannot use wxID_CLOSE else Esc key won't work: yet another wxWidgets bug??
+
     setRelativeFontSize(*m_staticTextPhase, 1.5);
 
     if (mainDialog)
@@ -951,6 +955,8 @@ SyncProgressDialog::Pimpl::Pimpl(AbortCallback& abortCb,
     m_gauge1->SetRange(GAUGE_FULL_RANGE);
     m_gauge1->SetValue(0);
 
+    warn_static("not honored on osx")
+
     EnableCloseButton(false);
 
     if (IsShown()) //don't steal focus when starting in sys-tray!
@@ -960,16 +966,16 @@ SyncProgressDialog::Pimpl::Pimpl(AbortCallback& abortCb,
 
     try //try to get access to Windows 7/Ubuntu taskbar
     {
-        taskbar_.reset(new Taskbar(mainDialog ? *static_cast<wxTopLevelWindow*>(mainDialog) : *this));
+        taskbar_ = make_unique<Taskbar>(mainDialog ? *static_cast<wxTopLevelWindow*>(mainDialog) : *this);
     }
     catch (const TaskbarNotAvailable&) {}
 
     //hide "processed" statistics until end of process
-    bSizerFinalStat           ->Show(false);
+    m_listbookResult          ->Hide();
     m_staticTextLabelItemsProc->Show(false);
     bSizerItemsProc           ->Show(false);
-    m_buttonOK                ->Show(false);
-    m_panelFooter->Layout();
+    m_buttonClose             ->Show(false);
+    Layout();
 
     //register key event
     Connect(wxEVT_CHAR_HOOK, wxKeyEventHandler(Pimpl::OnKeyPressed), nullptr, this);
@@ -980,12 +986,13 @@ SyncProgressDialog::Pimpl::Pimpl(AbortCallback& abortCb,
 
     m_panelGraph->setAttributes(Graph2D::MainAttributes().
                                 setLabelX(Graph2D::X_LABEL_BOTTOM, 20, std::make_shared<LabelFormatterTimeElapsed>()).
-                                setLabelY(Graph2D::Y_LABEL_RIGHT,  70, std::make_shared<LabelFormatterBytes>()));
+                                setLabelY(Graph2D::Y_LABEL_RIGHT,  70, std::make_shared<LabelFormatterBytes>()).
+                                setSelectionMode(Graph2D::SELECT_NONE));
 
     m_panelGraph->setData(graphDataBytes,
-                          Graph2D::CurveAttributes().setLineWidth(2)
-                          .setColor     (wxColor(  0, 192,   0))   //medium green
-                          .fillCurveArea(wxColor(192, 255, 192))); //faint green
+                          Graph2D::CurveAttributes().setLineWidth(2).
+                          setColor     (wxColor(  0, 192,   0)).  //medium green
+                          fillCurveArea(wxColor(192, 255, 192))); //faint green
 
     m_panelGraph->addData(graphDataBytesTotal, Graph2D::CurveAttributes().setLineWidth(2).setColor(wxColor(0, 64, 0))); //dark green
 
@@ -1005,8 +1012,12 @@ SyncProgressDialog::Pimpl::~Pimpl()
     {
         mainDialog->enableAllElements();
         mainDialog->SetTitle(titelTextBackup); //restore title text
-        mainDialog->Raise();
-        mainDialog->SetFocus();
+
+        //make sure main dialog is shown again if still "minimized to systray"! see SyncProgressDialog::closeWindowDirectly()
+        if (mainDialog->IsIconized()) //caveat: if window is maximized calling Iconize(false) will erroneously un-maximize!
+            mainDialog->Iconize(false);
+
+        mainDialog->Show();
     }
 }
 
@@ -1025,9 +1036,9 @@ void SyncProgressDialog::Pimpl::OnKeyPressed(wxKeyEvent& event)
                 handler->ProcessEvent(dummy);
             return;
         }
-        else if (m_buttonOK->IsShown())
+        else if (m_buttonClose->IsShown())
         {
-            if (wxEvtHandler* handler = m_buttonOK->GetEventHandler())
+            if (wxEvtHandler* handler = m_buttonClose->GetEventHandler())
                 handler->ProcessEvent(dummy);
             return;
         }
@@ -1340,7 +1351,7 @@ void SyncProgressDialog::Pimpl::updateDialogStatus() //depends on "syncStat_, pa
     if (syncStat_) //sync running
     {
         if (paused_)
-            m_bitmapStatus->SetBitmap(GlobalResources::getImage(L"statusPause"));
+            m_bitmapStatus->SetBitmap(getResourceImage(L"statusPause"));
         else
             switch (syncStat_->currentPhase())
             {
@@ -1348,15 +1359,15 @@ void SyncProgressDialog::Pimpl::updateDialogStatus() //depends on "syncStat_, pa
                     break;
 
                 case ProcessCallback::PHASE_SCANNING:
-                    m_bitmapStatus->SetBitmap(GlobalResources::getImage(L"statusScanning"));
+                    m_bitmapStatus->SetBitmap(getResourceImage(L"statusScanning"));
                     break;
 
                 case ProcessCallback::PHASE_COMPARING_CONTENT:
-                    m_bitmapStatus->SetBitmap(GlobalResources::getImage(L"statusBinaryCompare"));
+                    m_bitmapStatus->SetBitmap(getResourceImage(L"statusBinaryCompare"));
                     break;
 
                 case ProcessCallback::PHASE_SYNCHRONIZING:
-                    m_bitmapStatus->SetBitmap(GlobalResources::getImage(L"statusSyncing"));
+                    m_bitmapStatus->SetBitmap(getResourceImage(L"statusSyncing"));
                     break;
             }
 
@@ -1366,22 +1377,22 @@ void SyncProgressDialog::Pimpl::updateDialogStatus() //depends on "syncStat_, pa
         switch (finalResult)
         {
             case RESULT_ABORTED:
-                m_bitmapStatus->SetBitmap(GlobalResources::getImage(L"statusAborted"));
+                m_bitmapStatus->SetBitmap(getResourceImage(L"statusAborted"));
                 m_bitmapStatus->SetToolTip(_("Synchronization aborted!"));
                 break;
 
             case RESULT_FINISHED_WITH_ERROR:
-                m_bitmapStatus->SetBitmap(GlobalResources::getImage(L"statusFinishedErrors"));
+                m_bitmapStatus->SetBitmap(getResourceImage(L"statusFinishedErrors"));
                 m_bitmapStatus->SetToolTip(_("Synchronization completed with errors!"));
                 break;
 
             case RESULT_FINISHED_WITH_WARNINGS:
-                m_bitmapStatus->SetBitmap(GlobalResources::getImage(L"statusFinishedWarnings"));
+                m_bitmapStatus->SetBitmap(getResourceImage(L"statusFinishedWarnings"));
                 m_bitmapStatus->SetToolTip(_("Synchronization completed with warnings."));
                 break;
 
             case RESULT_FINISHED_WITH_SUCCESS:
-                m_bitmapStatus->SetBitmap(GlobalResources::getImage(L"statusFinishedSuccess"));
+                m_bitmapStatus->SetBitmap(getResourceImage(L"statusFinishedSuccess"));
                 m_bitmapStatus->SetToolTip(_("Synchronization completed successfully."));
                 break;
         }
@@ -1431,7 +1442,6 @@ void SyncProgressDialog::Pimpl::updateDialogStatus() //depends on "syncStat_, pa
             m_buttonPause->SetLabel(_("Pause"));
     }
 
-    m_panelHeader->Layout();
     Layout();
 }
 
@@ -1450,6 +1460,8 @@ void SyncProgressDialog::Pimpl::closeWindowDirectly() //this should really be ca
     syncStat_ = nullptr; //set *after* last call to "updateGui"
     //----------------------------------
 
+    //resumeFromSystray(); -> NO, instead ~Pimpl() makes sure that main dialog is shown again!
+
     Close();
 }
 
@@ -1523,31 +1535,32 @@ void SyncProgressDialog::Pimpl::processHasFinished(SyncResult resultId, const Er
 
     resumeFromSystray(); //if in tray mode...
 
-    warn_static("not honored on osx")
-
     EnableCloseButton(true);
 
     m_buttonAbort->Disable();
     m_buttonAbort->Hide();
     m_buttonPause->Disable();
     m_buttonPause->Hide();
-    m_buttonOK->Show();
-    m_buttonOK->Enable();
+    m_buttonClose->Show();
+    m_buttonClose->Enable();
 
     if (IsShown()) //don't steal focus when residing in sys-tray!
-        m_buttonOK->SetFocus();
+        m_buttonClose->SetFocus();
 
     m_animationControl1->Stop();
     m_animationControl1->Hide();
 
     //hide current operation status
-    m_staticlineHeader->Hide();
     m_staticTextStatus->Hide();
 
     bSizerExecFinished->Show(false);
 
     //show and prepare final statistics
-    bSizerFinalStat->Show(true);
+    m_listbookResult->Show();
+
+#ifdef FFS_WIN
+    m_staticlineHeader->Hide(); //win: m_listbookResult already has a window frame
+#endif
 
     //show total time
     m_staticTextLabelElapsedTime->SetLabel(_("Total time:")); //it's not "elapsed time" anymore
@@ -1563,10 +1576,10 @@ void SyncProgressDialog::Pimpl::processHasFinished(SyncResult resultId, const Er
     //note: alternative solutions involving wxLC_LIST, wxLC_REPORT and SetWindowStyleFlag() do not work portably! wxListBook using wxLC_ICON is obviously a class invariant!
 
     //1. re-arrange graph into results listbook
-    bSizerTop->Detach(m_panelProgress);
+    bSizerRoot->Detach(m_panelProgress);
     m_panelProgress->Reparent(m_listbookResult);
 #ifdef FFS_LINUX //does not seem to be required on Win or OS X
-    wxYield(); //wxGTK 2.9.3 fails miserably at "reparent" whithout this
+    wxTheApp->Yield(); //wxGTK 2.9.3 fails miserably at "reparent" whithout this
 #endif
     m_listbookResult->AddPage(m_panelProgress, _("Statistics"), true); //AddPage() takes ownership!
 
@@ -1580,7 +1593,6 @@ void SyncProgressDialog::Pimpl::processHasFinished(SyncResult resultId, const Er
     if (log.getItemCount(TYPE_ERROR | TYPE_FATAL_ERROR) > 0)
         m_listbookResult->ChangeSelection(posLog);
 
-    m_panelFooter->Layout();
     Layout();
 
     //play (optional) sound notification after sync has completed -> only play when waiting on results dialog, seems to be pointless otherwise!
@@ -1661,7 +1673,7 @@ void SyncProgressDialog::Pimpl::minimizeToTray()
 {
     if (!trayIcon.get())
     {
-        trayIcon.reset(new FfsTrayIcon);
+        trayIcon = make_unique<FfsTrayIcon>();
         trayIcon->Connect(FFS_REQUEST_RESUME_TRAY_EVENT, wxCommandEventHandler(SyncProgressDialog::Pimpl::OnResumeFromTray), nullptr, this);
         //tray icon has shorter lifetime than this => no need to disconnect event later
     }
@@ -1701,7 +1713,6 @@ void SyncProgressDialog::Pimpl::resumeFromSystray()
 
 //########################################################################################
 
-
 //redirect to implementation
 SyncProgressDialog::SyncProgressDialog(AbortCallback& abortCb,
                                        const Statistics& syncStat,
diff --git a/ui/small_dlgs.cpp b/ui/small_dlgs.cpp
index 7ecb8013..fd62b0cb 100644
--- a/ui/small_dlgs.cpp
+++ b/ui/small_dlgs.cpp
@@ -35,19 +35,22 @@ public:
     AboutDlg(wxWindow* parent);
 
 private:
-    void OnClose(wxCloseEvent&   event) { EndModal(ReturnSmallDlg::BUTTON_CANCEL); }
-    void OnOK   (wxCommandEvent& event) { EndModal(ReturnSmallDlg::BUTTON_OKAY); }
+    virtual void OnClose (wxCloseEvent&   event) { EndModal(ReturnSmallDlg::BUTTON_CANCEL); }
+    virtual void OnOK    (wxCommandEvent& event) { EndModal(ReturnSmallDlg::BUTTON_OKAY); }
+    virtual void OnDonate(wxCommandEvent& event) { wxLaunchDefaultBrowser(L"https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=zenju@gmx.de&no_shipping=1&lc=US&currency_code=EUR"); }
 };
 
 
 AboutDlg::AboutDlg(wxWindow* parent) : AboutDlgGenerated(parent)
 {
-    setRelativeFontSize(*m_hyperlinkDonate, 1.25);
+    setRelativeFontSize(*m_buttonDonate, 1.25);
 
-    m_bitmap9 ->SetBitmap(GlobalResources::getImage(L"website"));
-    m_bitmap10->SetBitmap(GlobalResources::getImage(L"email"));
-    m_bitmap13->SetBitmap(GlobalResources::getImage(L"gpl"));
-    //m_bitmapSmiley->SetBitmap(GlobalResources::getImage(L"smiley"));
+    assert(m_buttonClose->GetId() == wxID_OK); //we cannot use wxID_CLOSE else Esc key won't work: yet another wxWidgets bug??
+
+    m_bitmap9 ->SetBitmap(getResourceImage(L"website"));
+    m_bitmap10->SetBitmap(getResourceImage(L"email"));
+    m_bitmap13->SetBitmap(getResourceImage(L"gpl"));
+    //m_bitmapSmiley->SetBitmap(getResourceImage(L"smiley"));
 
     m_animCtrlWink->SetAnimation(GlobalResources::instance().aniWink);
     m_animCtrlWink->Play();
@@ -56,7 +59,7 @@ AboutDlg::AboutDlg(wxWindow* parent) : AboutDlgGenerated(parent)
     for (auto it = ExistingTranslations::get().begin(); it != ExistingTranslations::get().end(); ++it)
     {
         //flag
-        wxStaticBitmap* staticBitmapFlag = new wxStaticBitmap(m_scrolledWindowTranslators, wxID_ANY, GlobalResources::getImage(it->languageFlag), wxDefaultPosition, wxSize(-1, 11), 0 );
+        wxStaticBitmap* staticBitmapFlag = new wxStaticBitmap(m_scrolledWindowTranslators, wxID_ANY, getResourceImage(it->languageFlag), wxDefaultPosition, wxSize(-1, 11), 0 );
         fgSizerTranslators->Add(staticBitmapFlag, 0, wxALIGN_CENTER);
 
         //language name
@@ -93,9 +96,6 @@ AboutDlg::AboutDlg(wxWindow* parent) : AboutDlgGenerated(parent)
 
     m_build->SetLabel(replaceCpy(_("Build: %x"), L"%x", build));
 
-    //m_animationControl1->SetAnimation(GlobalResources::instance().animationMoney);
-    //m_animationControl1->Play();
-
     Fit(); //child-element widths have changed: image was set
 
     //generate logo
@@ -104,7 +104,7 @@ AboutDlg::AboutDlg(wxWindow* parent) : AboutDlgGenerated(parent)
 
     wxBitmap bmpLogo;
     {
-        wxImage tmp = GlobalResources::getImage(L"logo").ConvertToImage();
+        wxImage tmp = getResourceImage(L"logo").ConvertToImage();
         tmp.Resize(wxSize(GetClientSize().GetWidth(), tmp.GetHeight()), wxPoint(0, 0), 255, 255, 255); //enlarge to fit full width
         bmpLogo = wxBitmap(tmp);
     }
@@ -119,7 +119,7 @@ AboutDlg::AboutDlg(wxWindow* parent) : AboutDlgGenerated(parent)
 
     Fit(); //child-element widths have changed: image was set
 
-    m_buttonOkay->SetFocus();
+    m_buttonClose->SetFocus(); //on GTK ESC is only associated with wxID_OK correctly if we set at least *any* focus at all!!!
 }
 
 
@@ -140,13 +140,13 @@ public:
     ~FilterDlg() {}
 
 private:
-    void OnClose       (  wxCloseEvent& event) { EndModal(ReturnSmallDlg::BUTTON_CANCEL); }
-    void OnCancel      (wxCommandEvent& event) { EndModal(ReturnSmallDlg::BUTTON_CANCEL); }
-    void OnHelp        (wxCommandEvent& event) { displayHelpEntry(L"html/Exclude Items.html", this); }
-    void OnDefault     (wxCommandEvent& event);
-    void OnApply       (wxCommandEvent& event);
-    void OnUpdateChoice(wxCommandEvent& event) { updateGui(); }
-    void OnUpdateNameFilter(wxCommandEvent& event) { updateGui(); }
+    virtual void OnClose       (wxCloseEvent&   event) { EndModal(ReturnSmallDlg::BUTTON_CANCEL); }
+    virtual void OnCancel      (wxCommandEvent& event) { EndModal(ReturnSmallDlg::BUTTON_CANCEL); }
+    virtual void OnHelp        (wxCommandEvent& event) { displayHelpEntry(L"html/Exclude Items.html", this); }
+    virtual void OnDefault     (wxCommandEvent& event);
+    virtual void OnApply       (wxCommandEvent& event);
+    virtual void OnUpdateChoice(wxCommandEvent& event) { updateGui(); }
+    virtual void OnUpdateNameFilter(wxCommandEvent& event) { updateGui(); }
 
     void updateGui();
     void setFilter(const FilterConfig& filter);
@@ -194,8 +194,8 @@ FilterDlg::FilterDlg(wxWindow* parent,
     add(USIZE_KB,   _("KB")).
     add(USIZE_MB,   _("MB"));
 
-    m_bitmap26->SetBitmap(GlobalResources::getImage(L"filter"));
-    m_bpButtonHelp->SetBitmapLabel(GlobalResources::getImage(L"help"));
+    m_bitmap26->SetBitmap(getResourceImage(L"filter"));
+    m_bpButtonHelp->SetBitmapLabel(getResourceImage(L"help"));
 
     setFilter(filter);
 
@@ -210,7 +210,7 @@ FilterDlg::FilterDlg(wxWindow* parent,
     m_staticTextHeader->SetLabel(_("Filter"));
 
     Fit(); //child-element widths have changed: image was set
-    m_panelHeader->Layout();
+    Layout();
 }
 
 
@@ -222,11 +222,9 @@ void FilterDlg::onKeyEvent(wxKeyEvent& event)
         switch (keyCode)
         {
             case 'A': //CTRL + A
-            {
                 if (auto textCtrl = dynamic_cast<wxTextCtrl*>(event.GetEventObject()))
                     textCtrl->SetSelection(-1, -1); //select all
                 return;
-            }
         }
     event.Skip();
 }
@@ -238,24 +236,24 @@ void FilterDlg::updateGui()
 
     m_bitmapInclude->SetBitmap(
         !NameFilter::isNull(activeCfg.includeFilter, FilterConfig().excludeFilter) ?
-        GlobalResources::getImage(L"filter_include") :
-        greyScale(GlobalResources::getImage(L"filter_include")));
+        getResourceImage(L"filter_include") :
+        greyScale(getResourceImage(L"filter_include")));
 
     m_bitmapExclude->SetBitmap(
         !NameFilter::isNull(FilterConfig().includeFilter, activeCfg.excludeFilter) ?
-        GlobalResources::getImage(L"filter_exclude") :
-        greyScale(GlobalResources::getImage(L"filter_exclude")));
+        getResourceImage(L"filter_exclude") :
+        greyScale(getResourceImage(L"filter_exclude")));
 
     m_bitmapFilterDate->SetBitmap(
         activeCfg.unitTimeSpan != UTIME_NONE ?
-        GlobalResources::getImage(L"clock") :
-        greyScale(GlobalResources::getImage(L"clock")));
+        getResourceImage(L"clock") :
+        greyScale(getResourceImage(L"clock")));
 
     m_bitmapFilterSize->SetBitmap(
         activeCfg.unitSizeMin != USIZE_NONE ||
         activeCfg.unitSizeMax != USIZE_NONE ?
-        GlobalResources::getImage(L"size") :
-        greyScale(GlobalResources::getImage(L"size")));
+        getResourceImage(L"size") :
+        greyScale(getResourceImage(L"size")));
 
     m_spinCtrlTimespan->Enable(activeCfg.unitTimeSpan == UTIME_LAST_X_DAYS);
     m_spinCtrlMinSize ->Enable(activeCfg.unitSizeMin != USIZE_NONE);
@@ -335,11 +333,11 @@ public:
                  bool& useRecycleBin);
 
 private:
-    void OnOK(wxCommandEvent& event);
-    void OnCancel(wxCommandEvent& event) { EndModal(ReturnSmallDlg::BUTTON_CANCEL); }
-    void OnClose (wxCloseEvent&   event) { EndModal(ReturnSmallDlg::BUTTON_CANCEL); }
-    void OnDelOnBothSides(wxCommandEvent& event);
-    void OnUseRecycler(wxCommandEvent& event);
+    virtual void OnOK(wxCommandEvent& event);
+    virtual void OnCancel(wxCommandEvent& event) { EndModal(ReturnSmallDlg::BUTTON_CANCEL); }
+    virtual void OnClose (wxCloseEvent&   event) { EndModal(ReturnSmallDlg::BUTTON_CANCEL); }
+    virtual void OnDelOnBothSides(wxCommandEvent& event);
+    virtual void OnUseRecycler(wxCommandEvent& event);
 
     void updateGui();
 
@@ -380,7 +378,7 @@ DeleteDialog::DeleteDialog(wxWindow* parent,
     updateGui();
 
     Fit(); //child-element widths have changed: image was set: "fit" only *once* on construction!
-    m_panelHeader->Layout();
+    Layout();
 
     m_buttonOK->SetFocus();
 }
@@ -388,7 +386,7 @@ DeleteDialog::DeleteDialog(wxWindow* parent,
 
 void DeleteDialog::updateGui()
 {
-    wxWindowUpdateLocker dummy(m_panelHeader); //avoid display distortion
+    wxWindowUpdateLocker dummy(this); //avoid display distortion
 
     const std::pair<Zstring, int> delInfo = zen::deleteFromGridAndHDPreview(
                                                 rowsToDeleteOnLeft,
@@ -399,13 +397,13 @@ void DeleteDialog::updateGui()
     {
         header = _P("Do you really want to move the following object to the Recycle Bin?",
                     "Do you really want to move the following %x objects to the Recycle Bin?", delInfo.second);
-        m_bitmapDeleteType->SetBitmap(GlobalResources::getImage(L"recycler"));
+        m_bitmapDeleteType->SetBitmap(getResourceImage(L"recycler"));
     }
     else
     {
         header = _P("Do you really want to delete the following object?",
                     "Do you really want to delete the following %x objects?", delInfo.second);
-        m_bitmapDeleteType->SetBitmap(GlobalResources::getImage(L"deleteFile"));
+        m_bitmapDeleteType->SetBitmap(getResourceImage(L"deleteFile"));
     }
     replace(header, L"%x", toGuiString(delInfo.second));
     m_staticTextHeader->SetLabel(header);
@@ -413,7 +411,6 @@ void DeleteDialog::updateGui()
     const wxString& fileList = utfCvrtTo<wxString>(delInfo.first);
     m_textCtrlFileList->ChangeValue(fileList);
 
-    m_panelHeader->Layout();
     Layout();
 }
 
@@ -462,9 +459,9 @@ public:
                    const zen::SyncStatistics& st,
                    bool& dontShowAgain);
 private:
-    void OnClose (wxCloseEvent&   event) { EndModal(ReturnSmallDlg::BUTTON_CANCEL); }
-    void OnCancel(wxCommandEvent& event) { EndModal(ReturnSmallDlg::BUTTON_CANCEL); }
-    void OnStartSync(wxCommandEvent& event);
+    virtual void OnClose (wxCloseEvent&   event) { EndModal(ReturnSmallDlg::BUTTON_CANCEL); }
+    virtual void OnCancel(wxCommandEvent& event) { EndModal(ReturnSmallDlg::BUTTON_CANCEL); }
+    virtual void OnStartSync(wxCommandEvent& event);
 
     bool& m_dontShowAgain;
 };
@@ -483,7 +480,7 @@ SyncPreviewDlg::SyncPreviewDlg(wxWindow* parent,
 
     setRelativeFontSize(*m_buttonStartSync, 1.5);
     m_buttonStartSync->setInnerBorderSize(8);
-    m_buttonStartSync->setBitmapFront(GlobalResources::getImage(L"sync"), 5);
+    m_buttonStartSync->setBitmapFront(getResourceImage(L"sync"), 5);
 
     m_staticTextVariant->SetLabel(variantName);
     m_checkBoxDontShowAgain->SetValue(dontShowAgain);
@@ -491,18 +488,18 @@ SyncPreviewDlg::SyncPreviewDlg(wxWindow* parent,
     //update preview of item count and bytes to be transferred:
     setText(*m_staticTextData, filesizeToShortString(st.getDataToProcess()));
     if (st.getDataToProcess() == 0)
-        m_bitmapData->SetBitmap(greyScale(GlobalResources::getImage(L"data")));
+        m_bitmapData->SetBitmap(greyScale(getResourceImage(L"data")));
     else
-        m_bitmapData->SetBitmap(GlobalResources::getImage(L"data"));
+        m_bitmapData->SetBitmap(getResourceImage(L"data"));
 
     auto setValue = [](wxStaticText& txtControl, int value, wxStaticBitmap& bmpControl, const wchar_t* bmpName)
     {
         setText(txtControl, toGuiString(value));
 
         if (value == 0)
-            bmpControl.SetBitmap(greyScale(mirrorIfRtl(GlobalResources::getImage(bmpName))));
+            bmpControl.SetBitmap(greyScale(mirrorIfRtl(getResourceImage(bmpName))));
         else
-            bmpControl.SetBitmap(mirrorIfRtl(GlobalResources::getImage(bmpName)));
+            bmpControl.SetBitmap(mirrorIfRtl(getResourceImage(bmpName)));
     };
 
     setValue(*m_staticTextCreateLeft,  st.getCreate<LEFT_SIDE >(), *m_bitmapCreateLeft,  L"createLeftSmall");
@@ -512,9 +509,10 @@ SyncPreviewDlg::SyncPreviewDlg(wxWindow* parent,
     setValue(*m_staticTextUpdateRight, st.getUpdate<RIGHT_SIDE>(), *m_bitmapUpdateRight, L"updateRightSmall");
     setValue(*m_staticTextDeleteRight, st.getDelete<RIGHT_SIDE>(), *m_bitmapDeleteRight, L"deleteRightSmall");
 
-    m_buttonStartSync->SetFocus();
-    m_panelHeader->Layout(); //m_buttonStartSync changed => this *is* required!
+    m_panelStatistics->Layout(); //m_buttonStartSync changed => this *is* required!
+
     Fit();
+    m_buttonStartSync->SetFocus();
 }
 
 
@@ -537,8 +535,8 @@ ReturnSmallDlg::ButtonPressed zen::showSyncPreviewDlg(wxWindow* parent,
 
     return static_cast<ReturnSmallDlg::ButtonPressed>(preview.ShowModal());
 }
-//########################################################################################
 
+//########################################################################################
 
 class CompareCfgDialog : public CmpCfgDlgGenerated
 {
@@ -546,17 +544,16 @@ public:
     CompareCfgDialog(wxWindow* parent, CompConfig& cmpConfig);
 
 private:
-    void OnOkay(wxCommandEvent& event);
-    void OnClose (wxCloseEvent&   event) { EndModal(ReturnSmallDlg::BUTTON_CANCEL); }
-    void OnCancel(wxCommandEvent& event) { EndModal(ReturnSmallDlg::BUTTON_CANCEL); }
-    void OnShowHelp(wxCommandEvent& event) { displayHelpEntry(L"html/Comparison Settings.html", this); }
+    virtual void OnOkay(wxCommandEvent& event);
+    virtual void OnClose (wxCloseEvent&   event) { EndModal(ReturnSmallDlg::BUTTON_CANCEL); }
+    virtual void OnCancel(wxCommandEvent& event) { EndModal(ReturnSmallDlg::BUTTON_CANCEL); }
+    virtual void OnShowHelp(wxCommandEvent& event) { displayHelpEntry(L"html/Comparison Settings.html", this); }
 
-    void OnTimeSize(wxCommandEvent& event) { compareVar = CMP_BY_TIME_SIZE; updateGui(); }
-    void OnContent (wxCommandEvent& event) { compareVar = CMP_BY_CONTENT;   updateGui(); }
+    virtual void OnTimeSize(wxCommandEvent& event) { compareVar = CMP_BY_TIME_SIZE; updateGui(); }
+    virtual void OnContent (wxCommandEvent& event) { compareVar = CMP_BY_CONTENT;   updateGui(); }
 
-    void OnTimeSizeDouble(wxMouseEvent& event);
-    void OnFilesizeDouble(wxMouseEvent& event);
-    void OnContentDouble(wxMouseEvent& event);
+    virtual void OnTimeSizeDouble(wxMouseEvent& event);
+    virtual void OnContentDouble(wxMouseEvent& event);
 
     void updateGui();
 
@@ -578,7 +575,7 @@ CompareCfgDialog::CompareCfgDialog(wxWindow* parent,
     setRelativeFontSize(*m_toggleBtnTimeSize, 1.25);
     setRelativeFontSize(*m_toggleBtnContent,  1.25);
 
-    m_bpButtonHelp->SetBitmapLabel(GlobalResources::getImage(L"help"));
+    m_bpButtonHelp->SetBitmapLabel(getResourceImage(L"help"));
 
     enumDescrHandleSyml.
     add(SYMLINK_IGNORE,       _("Exclude")).
@@ -592,6 +589,8 @@ CompareCfgDialog::CompareCfgDialog(wxWindow* parent,
 
     updateGui();
     Fit();
+
+    m_buttonOkay->SetFocus();
 }
 
 
@@ -618,8 +617,8 @@ void CompareCfgDialog::updateGui()
         else
             bmpCtrl.SetBitmap(greyScale(bmp));
     };
-    setBitmap(*m_bitmapByTime,    compareVar == CMP_BY_TIME_SIZE, GlobalResources::getImage(L"clock"));
-    setBitmap(*m_bitmapByContent, compareVar == CMP_BY_CONTENT,   GlobalResources::getImage(L"cmpByContent"));
+    setBitmap(*m_bitmapByTime,    compareVar == CMP_BY_TIME_SIZE, getResourceImage(L"clock"));
+    setBitmap(*m_bitmapByContent, compareVar == CMP_BY_CONTENT,   getResourceImage(L"cmpByContent"));
 }
 
 
@@ -662,14 +661,14 @@ public:
     GlobalSettingsDlg(wxWindow* parent, xmlAccess::XmlGlobalSettings& globalSettings);
 
 private:
-    void OnOkay(wxCommandEvent& event);
-    void OnResetDialogs(wxCommandEvent& event);
-    void OnDefault(wxCommandEvent& event);
-    void OnCancel(wxCommandEvent& event) { EndModal(ReturnSmallDlg::BUTTON_CANCEL); }
-    void OnClose (wxCloseEvent&   event) { EndModal(ReturnSmallDlg::BUTTON_CANCEL); }
-    void OnAddRow(wxCommandEvent& event);
-    void OnRemoveRow(wxCommandEvent& event);
-    void OnResize(wxSizeEvent& event);
+    virtual void OnOkay(wxCommandEvent& event);
+    virtual void OnResetDialogs(wxCommandEvent& event);
+    virtual void OnDefault(wxCommandEvent& event);
+    virtual void OnCancel(wxCommandEvent& event) { EndModal(ReturnSmallDlg::BUTTON_CANCEL); }
+    virtual void OnClose (wxCloseEvent&   event) { EndModal(ReturnSmallDlg::BUTTON_CANCEL); }
+    virtual void OnAddRow(wxCommandEvent& event);
+    virtual void OnRemoveRow(wxCommandEvent& event);
+    void onResize(wxSizeEvent& event);
 
     void set(const xmlAccess::ExternalApps& extApp);
     xmlAccess::ExternalApps getExtApp();
@@ -688,10 +687,10 @@ GlobalSettingsDlg::GlobalSettingsDlg(wxWindow* parent, xmlAccess::XmlGlobalSetti
 
     setRelativeFontSize(*m_staticTextHeader, 1.25);
 
-    m_bitmapSettings    ->SetBitmap     (GlobalResources::getImage(L"settings"));
-    m_buttonResetDialogs->setBitmapFront(GlobalResources::getImage(L"warningSmall"), 5);
-    m_bpButtonAddRow    ->SetBitmapLabel(GlobalResources::getImage(L"item_add"));
-    m_bpButtonRemoveRow ->SetBitmapLabel(GlobalResources::getImage(L"item_delete"));
+    m_bitmapSettings    ->SetBitmap     (getResourceImage(L"settings"));
+    m_buttonResetDialogs->setBitmapFront(getResourceImage(L"warningSmall"), 5);
+    m_bpButtonAddRow    ->SetBitmapLabel(getResourceImage(L"item_add"));
+    m_bpButtonRemoveRow ->SetBitmapLabel(getResourceImage(L"item_delete"));
 
     m_checkBoxCopyLocked     ->SetValue(globalSettings.copyLockedFiles);
     m_checkBoxTransCopy      ->SetValue(globalSettings.transactionalFileCopy);
@@ -717,18 +716,18 @@ GlobalSettingsDlg::GlobalSettingsDlg(wxWindow* parent, xmlAccess::XmlGlobalSetti
     m_gridCustomCommand->SetMargins(0, 0);
 
     Fit(); //child-element widths have changed: image was set
-    m_panelHeader->Layout();
+    Layout();
 
     //automatically fit column width to match totl grid width
-    Connect(wxEVT_SIZE, wxSizeEventHandler(GlobalSettingsDlg::OnResize), nullptr, this);
+    Connect(wxEVT_SIZE, wxSizeEventHandler(GlobalSettingsDlg::onResize), nullptr, this);
     wxSizeEvent dummy;
-    OnResize(dummy);
+    onResize(dummy);
 
     m_buttonOkay->SetFocus();
 }
 
 
-void GlobalSettingsDlg::OnResize(wxSizeEvent& event)
+void GlobalSettingsDlg::onResize(wxSizeEvent& event)
 {
     const int widthTotal = m_gridCustomCommand->GetGridWindow()->GetClientSize().GetWidth() - 20;
 
@@ -848,8 +847,8 @@ ReturnSmallDlg::ButtonPressed zen::showGlobalSettingsDlg(wxWindow* parent, xmlAc
     GlobalSettingsDlg settingsDlg(parent, globalSettings);
     return static_cast<ReturnSmallDlg::ButtonPressed>(settingsDlg.ShowModal());
 }
-//########################################################################################
 
+//########################################################################################
 
 class SelectTimespanDlg : public SelectTimespanDlgGenerated
 {
@@ -857,9 +856,9 @@ public:
     SelectTimespanDlg(wxWindow* parent, Int64& timeFrom, Int64& timeTo);
 
 private:
-    void OnOkay(wxCommandEvent& event);
-    void OnCancel(wxCommandEvent& event) { EndModal(ReturnSmallDlg::BUTTON_CANCEL); }
-    void OnClose (wxCloseEvent&   event) { EndModal(ReturnSmallDlg::BUTTON_CANCEL); }
+    virtual void OnOkay(wxCommandEvent& event);
+    virtual void OnCancel(wxCommandEvent& event) { EndModal(ReturnSmallDlg::BUTTON_CANCEL); }
+    virtual void OnClose (wxCloseEvent&   event) { EndModal(ReturnSmallDlg::BUTTON_CANCEL); }
 
     virtual void OnChangeSelectionFrom(wxCalendarEvent& event)
     {
@@ -925,8 +924,6 @@ SelectTimespanDlg::SelectTimespanDlg(wxWindow* parent, Int64& timeFrom, Int64& t
     m_calendarFrom->SetDate(utcToLocalDateTime(to<time_t>(timeFrom_)));
     m_calendarTo  ->SetDate(utcToLocalDateTime(to<time_t>(timeTo_)));
 
-    m_buttonOkay->SetFocus();
-
     //wxDatePickerCtrl::BestSize() does not respect year field and trims it, both wxMSW/wxGTK - why isn't there anybody testing this wxWidgets stuff???
     wxSize minSz = m_calendarFrom->GetBestSize();
     minSz.x += 30;
@@ -934,6 +931,7 @@ SelectTimespanDlg::SelectTimespanDlg(wxWindow* parent, Int64& timeFrom, Int64& t
     m_calendarTo  ->SetMinSize(minSz);
 
     Fit();
+    m_buttonOkay->SetFocus();
 }
 
 
diff --git a/ui/sorting.h b/ui/sorting.h
index afb4d999..75b2593a 100644
--- a/ui/sorting.h
+++ b/ui/sorting.h
@@ -8,10 +8,8 @@
 #define SORTING_H_INCLUDED
 
 #include <zen/assert_static.h>
-#include "../file_hierarchy.h"
 #include <zen/type_tools.h>
-//#include "../synchronization.h"
-
+#include "../file_hierarchy.h"
 
 namespace zen
 {
diff --git a/ui/sync_cfg.cpp b/ui/sync_cfg.cpp
index 83743e0d..2d92e231 100644
--- a/ui/sync_cfg.cpp
+++ b/ui/sync_cfg.cpp
@@ -107,15 +107,15 @@ void updateConfigIcons(const DirectionConfig& directionCfg,
         switch (dirCfg.exLeftSideOnly)
         {
             case SYNC_DIR_RIGHT:
-                buttonLeftOnly->SetBitmapLabel(mirrorIfRtl(GlobalResources::getImage(L"createRight")));
+                buttonLeftOnly->SetBitmapLabel(mirrorIfRtl(getResourceImage(L"createRight")));
                 buttonLeftOnly->SetToolTip(getSyncOpDescription(SO_CREATE_NEW_RIGHT));
                 break;
             case SYNC_DIR_LEFT:
-                buttonLeftOnly->SetBitmapLabel(mirrorIfRtl(GlobalResources::getImage(L"deleteLeft")));
+                buttonLeftOnly->SetBitmapLabel(mirrorIfRtl(getResourceImage(L"deleteLeft")));
                 buttonLeftOnly->SetToolTip(getSyncOpDescription(SO_DELETE_LEFT));
                 break;
             case SYNC_DIR_NONE:
-                buttonLeftOnly->SetBitmapLabel(mirrorIfRtl(GlobalResources::getImage(L"none")));
+                buttonLeftOnly->SetBitmapLabel(mirrorIfRtl(getResourceImage(L"none")));
                 buttonLeftOnly->SetToolTip(getSyncOpDescription(SO_DO_NOTHING));
                 break;
         }
@@ -123,15 +123,15 @@ void updateConfigIcons(const DirectionConfig& directionCfg,
         switch (dirCfg.exRightSideOnly)
         {
             case SYNC_DIR_RIGHT:
-                buttonRightOnly->SetBitmapLabel(mirrorIfRtl(GlobalResources::getImage(L"deleteRight")));
+                buttonRightOnly->SetBitmapLabel(mirrorIfRtl(getResourceImage(L"deleteRight")));
                 buttonRightOnly->SetToolTip(getSyncOpDescription(SO_DELETE_RIGHT));
                 break;
             case SYNC_DIR_LEFT:
-                buttonRightOnly->SetBitmapLabel(mirrorIfRtl(GlobalResources::getImage(L"createLeft")));
+                buttonRightOnly->SetBitmapLabel(mirrorIfRtl(getResourceImage(L"createLeft")));
                 buttonRightOnly->SetToolTip(getSyncOpDescription(SO_CREATE_NEW_LEFT));
                 break;
             case SYNC_DIR_NONE:
-                buttonRightOnly->SetBitmapLabel(mirrorIfRtl(GlobalResources::getImage(L"none")));
+                buttonRightOnly->SetBitmapLabel(mirrorIfRtl(getResourceImage(L"none")));
                 buttonRightOnly->SetToolTip(getSyncOpDescription(SO_DO_NOTHING));
                 break;
         }
@@ -139,15 +139,15 @@ void updateConfigIcons(const DirectionConfig& directionCfg,
         switch (dirCfg.leftNewer)
         {
             case SYNC_DIR_RIGHT:
-                buttonLeftNewer->SetBitmapLabel(mirrorIfRtl(GlobalResources::getImage(L"updateRight")));
+                buttonLeftNewer->SetBitmapLabel(mirrorIfRtl(getResourceImage(L"updateRight")));
                 buttonLeftNewer->SetToolTip(getSyncOpDescription(SO_OVERWRITE_RIGHT));
                 break;
             case SYNC_DIR_LEFT:
-                buttonLeftNewer->SetBitmapLabel(mirrorIfRtl(GlobalResources::getImage(L"updateLeft")));
+                buttonLeftNewer->SetBitmapLabel(mirrorIfRtl(getResourceImage(L"updateLeft")));
                 buttonLeftNewer->SetToolTip(getSyncOpDescription(SO_OVERWRITE_LEFT));
                 break;
             case SYNC_DIR_NONE:
-                buttonLeftNewer->SetBitmapLabel(mirrorIfRtl(GlobalResources::getImage(L"none")));
+                buttonLeftNewer->SetBitmapLabel(mirrorIfRtl(getResourceImage(L"none")));
                 buttonLeftNewer->SetToolTip(getSyncOpDescription(SO_DO_NOTHING));
                 break;
         }
@@ -155,15 +155,15 @@ void updateConfigIcons(const DirectionConfig& directionCfg,
         switch (dirCfg.rightNewer)
         {
             case SYNC_DIR_RIGHT:
-                buttonRightNewer->SetBitmapLabel(mirrorIfRtl(GlobalResources::getImage(L"updateRight")));
+                buttonRightNewer->SetBitmapLabel(mirrorIfRtl(getResourceImage(L"updateRight")));
                 buttonRightNewer->SetToolTip(getSyncOpDescription(SO_OVERWRITE_RIGHT));
                 break;
             case SYNC_DIR_LEFT:
-                buttonRightNewer->SetBitmapLabel(mirrorIfRtl(GlobalResources::getImage(L"updateLeft")));
+                buttonRightNewer->SetBitmapLabel(mirrorIfRtl(getResourceImage(L"updateLeft")));
                 buttonRightNewer->SetToolTip(getSyncOpDescription(SO_OVERWRITE_LEFT));
                 break;
             case SYNC_DIR_NONE:
-                buttonRightNewer->SetBitmapLabel(mirrorIfRtl(GlobalResources::getImage(L"none")));
+                buttonRightNewer->SetBitmapLabel(mirrorIfRtl(getResourceImage(L"none")));
                 buttonRightNewer->SetToolTip(getSyncOpDescription(SO_DO_NOTHING));
                 break;
         }
@@ -171,15 +171,15 @@ void updateConfigIcons(const DirectionConfig& directionCfg,
         switch (dirCfg.different)
         {
             case SYNC_DIR_RIGHT:
-                buttonDifferent->SetBitmapLabel(mirrorIfRtl(GlobalResources::getImage(L"updateRight")));
+                buttonDifferent->SetBitmapLabel(mirrorIfRtl(getResourceImage(L"updateRight")));
                 buttonDifferent->SetToolTip(getSyncOpDescription(SO_OVERWRITE_RIGHT));
                 break;
             case SYNC_DIR_LEFT:
-                buttonDifferent->SetBitmapLabel(mirrorIfRtl(GlobalResources::getImage(L"updateLeft")));
+                buttonDifferent->SetBitmapLabel(mirrorIfRtl(getResourceImage(L"updateLeft")));
                 buttonDifferent->SetToolTip(getSyncOpDescription(SO_OVERWRITE_LEFT));
                 break;
             case SYNC_DIR_NONE:
-                buttonDifferent->SetBitmapLabel(mirrorIfRtl(GlobalResources::getImage(L"none")));
+                buttonDifferent->SetBitmapLabel(mirrorIfRtl(getResourceImage(L"none")));
                 buttonDifferent->SetToolTip(getSyncOpDescription(SO_DO_NOTHING));
                 break;
         }
@@ -187,15 +187,15 @@ void updateConfigIcons(const DirectionConfig& directionCfg,
         switch (dirCfg.conflict)
         {
             case SYNC_DIR_RIGHT:
-                buttonConflict->SetBitmapLabel(mirrorIfRtl(GlobalResources::getImage(L"updateRight")));
+                buttonConflict->SetBitmapLabel(mirrorIfRtl(getResourceImage(L"updateRight")));
                 buttonConflict->SetToolTip(getSyncOpDescription(SO_OVERWRITE_RIGHT));
                 break;
             case SYNC_DIR_LEFT:
-                buttonConflict->SetBitmapLabel(mirrorIfRtl(GlobalResources::getImage(L"updateLeft")));
+                buttonConflict->SetBitmapLabel(mirrorIfRtl(getResourceImage(L"updateLeft")));
                 buttonConflict->SetToolTip(getSyncOpDescription(SO_OVERWRITE_LEFT));
                 break;
             case SYNC_DIR_NONE:
-                buttonConflict->SetBitmapLabel(mirrorIfRtl(GlobalResources::getImage(L"conflict"))); //silent dependency to algorithm.cpp::Redetermine!!!
+                buttonConflict->SetBitmapLabel(mirrorIfRtl(getResourceImage(L"conflict"))); //silent dependency to algorithm.cpp::Redetermine!!!
                 buttonConflict->SetToolTip(_("Leave as unresolved conflict"));
                 break;
         }
@@ -221,13 +221,13 @@ SyncCfgDialog::SyncCfgDialog(wxWindow* parent,
     new zen::MouseMoveWindow(*this); //allow moving main dialog by clicking (nearly) anywhere...; ownership passed to "this"
 #endif
     //set icons for this dialog
-    m_bitmapLeftOnly  ->SetBitmap(mirrorIfRtl(greyScale(GlobalResources::getImage(L"leftOnly"  ))));
-    m_bitmapRightOnly ->SetBitmap(mirrorIfRtl(greyScale(GlobalResources::getImage(L"rightOnly" ))));
-    m_bitmapLeftNewer ->SetBitmap(mirrorIfRtl(greyScale(GlobalResources::getImage(L"leftNewer" ))));
-    m_bitmapRightNewer->SetBitmap(mirrorIfRtl(greyScale(GlobalResources::getImage(L"rightNewer"))));
-    m_bitmapDifferent ->SetBitmap(mirrorIfRtl(greyScale(GlobalResources::getImage(L"different" ))));
-    m_bitmapConflict  ->SetBitmap(mirrorIfRtl(greyScale(GlobalResources::getImage(L"conflict"  ))));
-    m_bitmapDatabase  ->SetBitmap(GlobalResources::getImage(L"database"));
+    m_bitmapLeftOnly  ->SetBitmap(mirrorIfRtl(greyScale(getResourceImage(L"leftOnly"  ))));
+    m_bitmapRightOnly ->SetBitmap(mirrorIfRtl(greyScale(getResourceImage(L"rightOnly" ))));
+    m_bitmapLeftNewer ->SetBitmap(mirrorIfRtl(greyScale(getResourceImage(L"leftNewer" ))));
+    m_bitmapRightNewer->SetBitmap(mirrorIfRtl(greyScale(getResourceImage(L"rightNewer"))));
+    m_bitmapDifferent ->SetBitmap(mirrorIfRtl(greyScale(getResourceImage(L"different" ))));
+    m_bitmapConflict  ->SetBitmap(mirrorIfRtl(greyScale(getResourceImage(L"conflict"  ))));
+    m_bitmapDatabase  ->SetBitmap(getResourceImage(L"database"));
 
     setRelativeFontSize(*m_toggleBtnAutomatic, 1.25);
     setRelativeFontSize(*m_toggleBtnMirror,    1.25);
@@ -257,7 +257,6 @@ SyncCfgDialog::SyncCfgDialog(wxWindow* parent,
     setConfig(newCfg);
 
     Fit();
-    bSizerConfig->Layout(); //wxButtonWithImage size might have changed
 
     m_buttonOK->SetFocus();
 }
@@ -340,6 +339,7 @@ void SyncCfgDialog::updateGui()
             bSizerRightNewer->Show(false);
             break;
     }
+    bSizerConfig->Layout(); //[!]
 
     //update toggle buttons -> they have no parameter-ownership at all!
     m_staticTextAutomatic->SetForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT));
@@ -429,6 +429,7 @@ void SyncCfgDialog::updateGui()
     }
 
     Layout();
+    bSizerNamingConvention->Layout(); //[!] not handled by previous "Layout"
     Refresh(); //removes a few artifacts when toggling display of versioning folder
     GetSizer()->SetSizeHints(this); //this works like a charm for GTK2 with window resizing problems!!! (includes call to Fit())
 }
diff --git a/ui/tray_icon.cpp b/ui/tray_icon.cpp
index fa7c810d..58b24697 100644
--- a/ui/tray_icon.cpp
+++ b/ui/tray_icon.cpp
@@ -18,49 +18,60 @@ const wxEventType FFS_REQUEST_RESUME_TRAY_EVENT = wxNewEventType();
 
 namespace
 {
-void fillRange(wxImage& img, int pixelFirst, int pixelLast, const wxColor& col)
+void fillRange(wxImage& img, int pixelFirst, int pixelLast, const wxColor& col) //tolerant input range
 {
-    const int pixelCount = img.GetWidth() >= 0 ? img.GetWidth() * img.GetHeight() : -1;
-
-    if (0 <= pixelFirst && pixelFirst < pixelLast && pixelLast <= pixelCount)
+    if (img.IsOk())
     {
-        unsigned char* const bytesBegin = img.GetData() + pixelFirst * 3;
-        unsigned char* const bytesEnd   = img.GetData() + pixelLast  * 3;
+        const int width  = img.GetWidth ();
+        const int height = img.GetHeight();
 
-        for (unsigned char* bytePos = bytesBegin; bytePos < bytesEnd; bytePos += 3)
+        if (width > 0 && height > 0)
         {
-            bytePos[0] = col.Red  ();
-            bytePos[1] = col.Green();
-            bytePos[2] = col.Blue ();
-        }
+            pixelFirst = std::max(pixelFirst, 0);
+            pixelLast  = std::min(pixelLast, width * height);
 
-        if (img.HasAlpha()) //make progress indicator fully opaque:
-            std::fill(img.GetAlpha() + pixelFirst, img.GetAlpha() + pixelLast, wxIMAGE_ALPHA_OPAQUE);
+            if (pixelFirst < pixelLast)
+            {
+                unsigned char* const bytesBegin = img.GetData() + pixelFirst * 3;
+                unsigned char* const bytesEnd   = img.GetData() + pixelLast  * 3;
+
+                for (unsigned char* bytePos = bytesBegin; bytePos < bytesEnd; bytePos += 3)
+                {
+                    bytePos[0] = col.Red  ();
+                    bytePos[1] = col.Green();
+                    bytePos[2] = col.Blue ();
+                }
+
+                if (img.HasAlpha()) //make progress indicator fully opaque:
+                    std::fill(img.GetAlpha() + pixelFirst, img.GetAlpha() + pixelLast, wxIMAGE_ALPHA_OPAQUE);
+            }
+        }
     }
 }
 
+
 wxIcon generateProgressIcon(const wxImage& logo, double fraction) //generate icon with progress indicator
 {
+    if (!logo.IsOk())
+        return wxIcon();
+
     const int pixelCount = logo.GetWidth() * logo.GetHeight();
     const int startFillPixel = std::min(numeric::round(fraction * pixelCount), pixelCount);
 
     //minor optimization
     static std::pair<int, wxIcon> buffer = std::make_pair(-1, wxNullIcon);
-    if (buffer.first == startFillPixel)
-        return buffer.second;
-
-    wxIcon progIcon;
 
+    if (buffer.first != startFillPixel)
     {
-        wxImage genImage(logo);
-
-        //gradually make FFS icon brighter while nearing completion
-        zen::brighten(genImage, -200 * (1 - fraction));
-
         //progress bar
-        if (genImage.GetWidth()  > 0 &&
-            genImage.GetHeight() > 0)
+        if (logo.GetWidth()  > 0 &&
+            logo.GetHeight() > 0)
         {
+            wxImage genImage(logo.Copy()); //workaround wxWidgets' screwed-up design from hell: their copy-construction implements reference-counting WITHOUT copy-on-write!
+
+            //gradually make FFS icon brighter while nearing completion
+            zen::brighten(genImage, -200 * (1 - fraction));
+
             //fill black border row
             if (startFillPixel <= pixelCount - genImage.GetWidth())
             {
@@ -73,9 +84,9 @@ wxIcon generateProgressIcon(const wxImage& logo, double fraction) //generate ico
                 int bStart = startFillPixel - genImage.GetWidth();
                 if (bStart % genImage.GetWidth() != 0) //add one more black pixel, see ascii-art
                     --bStart;
-                fillRange(genImage, std::max(bStart, 0), startFillPixel, *wxBLACK);
+                fillRange(genImage, bStart, startFillPixel, *wxBLACK);
             }
-            else if (startFillPixel != pixelCount)
+            else if (startFillPixel < pixelCount)
             {
                 //special handling for last row
                 /*
@@ -85,9 +96,9 @@ wxIcon generateProgressIcon(const wxImage& logo, double fraction) //generate ico
                         ---bSyyy  S : start yellow remainder
                 */
                 int bStart = startFillPixel - genImage.GetWidth() - 1;
-                int bEnd = (bStart / genImage.GetWidth() + 1) * (genImage.GetWidth());
+                int bEnd = (bStart / genImage.GetWidth() + 1) * genImage.GetWidth();
 
-                fillRange(genImage, std::max(bStart, 0), bEnd, *wxBLACK);
+                fillRange(genImage, bStart, bEnd, *wxBLACK);
                 fillRange(genImage, startFillPixel - 1, startFillPixel, *wxBLACK);
             }
 
@@ -121,22 +132,21 @@ wxIcon generateProgressIcon(const wxImage& logo, double fraction) //generate ico
                             ::memset(alpha + row * genImage.GetWidth() + indicatorXBegin, wxIMAGE_ALPHA_OPAQUE, indicatorWidth);
                     }
             */
-            progIcon.CopyFromBitmap(wxBitmap(genImage));
+            buffer.second.CopyFromBitmap(wxBitmap(genImage));
         }
+        else
+            buffer.second = wxIcon();
     }
 
-    //fill buffer
-    buffer.first  = startFillPixel;
-    buffer.second = progIcon;
-    return progIcon;
+    return buffer.second;
 }
 
 //------------------------------------------------------------------------------------------------
 
 enum Selection
 {
-    CONTEXT_RESTORE,
-    CONTEXT_ABOUT
+    CONTEXT_RESTORE = 1, //wxWidgets: "A MenuItem ID of Zero does not work under Mac"
+    CONTEXT_ABOUT = wxID_ABOUT
 };
 }
 
@@ -172,9 +182,9 @@ FfsTrayIcon::FfsTrayIcon() :
     trayIcon(new TaskBarImpl(*this)),
     fractionLast(1), //show FFS logo by default
 #if defined FFS_WIN || defined FFS_MAC //16x16 seems to be the only size that is shown correctly on OS X
-    logo(GlobalResources::getImage(L"FFS_tray_16x16").ConvertToImage())
+    logo(getResourceImage(L"FFS_tray_16x16").ConvertToImage())
 #elif defined FFS_LINUX
-    logo(GlobalResources::getImage(L"FFS_tray_24x24").ConvertToImage())
+    logo(getResourceImage(L"FFS_tray_24x24").ConvertToImage())
 #endif
 {
     trayIcon->SetIcon(generateProgressIcon(logo, fractionLast), L"FreeFileSync");
diff --git a/ui/tree_view.cpp b/ui/tree_view.cpp
index 271fa90a..eff840bc 100644
--- a/ui/tree_view.cpp
+++ b/ui/tree_view.cpp
@@ -631,10 +631,10 @@ public:
     GridDataNavi(Grid& grid, const std::shared_ptr<TreeView>& treeDataView) : treeDataView_(treeDataView),
         fileIcon(IconBuffer(IconBuffer::SIZE_SMALL).genericFileIcon()),
         dirIcon (IconBuffer(IconBuffer::SIZE_SMALL).genericDirIcon ()),
-        rootBmp(GlobalResources::getImage(L"rootFolder").ConvertToImage().Scale(iconSizeSmall, iconSizeSmall, wxIMAGE_QUALITY_HIGH)),
+        rootBmp(getResourceImage(L"rootFolder").ConvertToImage().Scale(iconSizeSmall, iconSizeSmall, wxIMAGE_QUALITY_HIGH)),
         widthNodeIcon(iconSizeSmall),
         widthLevelStep(widthNodeIcon),
-        widthNodeStatus(GlobalResources::getImage(L"nodeExpanded").GetWidth()),
+        widthNodeStatus(getResourceImage(L"nodeExpanded").GetWidth()),
         grid_(grid),
         showPercentBar(true)
     {
@@ -700,7 +700,7 @@ private:
             auto sortInfo = treeDataView_->getSortDirection();
             if (colType == static_cast<ColumnType>(sortInfo.first))
             {
-                const wxBitmap& marker = GlobalResources::getImage(sortInfo.second ? L"sortAscending" : L"sortDescending");
+                const wxBitmap& marker = getResourceImage(sortInfo.second ? L"sortAscending" : L"sortDescending");
                 wxPoint markerBegin = rectInside.GetTopLeft() + wxPoint((rectInside.width - marker.GetWidth()) / 2, 0);
                 dc.DrawBitmap(marker, markerBegin, true); //respect 2-pixel gap
             }
@@ -816,7 +816,7 @@ private:
                         //node status
                         auto drawStatus = [&](const wchar_t* image)
                         {
-                            const wxBitmap& bmp = GlobalResources::getImage(image);
+                            const wxBitmap& bmp = getResourceImage(image);
 
                             wxRect rectStat(rectTmp.GetTopLeft(), wxSize(bmp.GetWidth(), bmp.GetHeight()));
                             rectStat.y += (rectTmp.height - rectStat.height) / 2;
@@ -842,30 +842,25 @@ private:
                         rectTmp.width -= widthNodeStatus + GAP_SIZE;
                         if (rectTmp.width > 0)
                         {
+                            wxBitmap nodeIcon;
                             bool isActive = true;
                             //icon
                             if (dynamic_cast<const TreeView::RootNode*>(node.get()))
-                                drawBitmapRtlNoMirror(dc, rootBmp, rectTmp, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, buffer);
+                                nodeIcon = rootBmp;
                             else if (auto dir = dynamic_cast<const TreeView::DirNode*>(node.get()))
                             {
-                                drawIconRtlNoMirror(dc, dirIcon, rectTmp.GetTopLeft() + wxPoint(0, (rectTmp.height - dirIcon.GetHeight()) / 2), buffer);
+                                nodeIcon = dirIcon;
                                 isActive = dir->dirObj_.isActive();
                             }
                             else if (dynamic_cast<const TreeView::FilesNode*>(node.get()))
-                                drawIconRtlNoMirror(dc, fileIcon, rectTmp.GetTopLeft() + wxPoint(0, (rectTmp.height - fileIcon.GetHeight()) / 2), buffer);
+                                nodeIcon = fileIcon;
 
-                            //convert icon to greyscale if row is not active
-                            if (!isActive)
-                            {
-                                wxBitmap bmp(widthNodeIcon, rectTmp.height);
-                                wxMemoryDC memDc(bmp);
-                                memDc.Blit(0, 0, widthNodeIcon, rectTmp.height, &dc, rectTmp.x, rectTmp.y); //blit in
-
-                                bmp = wxBitmap(bmp.ConvertToImage().ConvertToGreyscale(1.0/3, 1.0/3, 1.0/3)); //treat all channels equally!
-                                memDc.SelectObject(bmp);
+                            if (isActive)
+                                drawBitmapRtlNoMirror(dc, nodeIcon, rectTmp, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, buffer);
 
-                                dc.Blit(rectTmp.x, rectTmp.y, widthNodeIcon, rectTmp.height, &memDc, 0, 0); //blit out
-                            }
+                            else
+                                drawBitmapRtlNoMirror(dc, wxBitmap(nodeIcon.ConvertToImage().ConvertToGreyscale(1.0 / 3, 1.0 / 3, 1.0 / 3)), //treat all channels equally!
+                                                      rectTmp, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, buffer);
 
                             rectTmp.x     += widthNodeIcon + GAP_SIZE;
                             rectTmp.width -= widthNodeIcon + GAP_SIZE;
@@ -1119,8 +1114,8 @@ private:
     }
 
     std::shared_ptr<TreeView> treeDataView_;
-    const wxIcon fileIcon;
-    const wxIcon dirIcon;
+    const wxBitmap fileIcon;
+    const wxBitmap dirIcon;
     const wxBitmap rootBmp;
     std::unique_ptr<wxBitmap> buffer; //avoid costs of recreating this temporal variable
     const int widthNodeIcon;
@@ -1138,7 +1133,7 @@ void treeview::init(Grid& grid, const std::shared_ptr<TreeView>& treeDataView)
     grid.setDataProvider(std::make_shared<GridDataNavi>(grid, treeDataView));
     grid.showRowLabel(false);
 
-    const int rowHeight = std::max(IconBuffer::getSize(IconBuffer::SIZE_SMALL), grid.getMainWin().GetCharHeight()) + 1; //add some space
+    const int rowHeight = std::max(IconBuffer::getSize(IconBuffer::SIZE_SMALL), grid.getMainWin().GetCharHeight()) + 2; //allow 1 pixel space on top and bottom; dearly needed on OS X!
     grid.setRowHeight(rowHeight);
 }