4.1

33 files changed, 5673 insertions, 4831 deletions

diff --git a/ui/Taskbar_Seven/Taskbar_Seven.vcxproj b/ui/Taskbar_Seven/Taskbar_Seven.vcxproj
new file mode 100644
index 00000000..37786768
--- /dev/null
+++ b/ui/Taskbar_Seven/Taskbar_Seven.vcxproj
@@ -0,0 +1,239 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{70394AEF-5897-4911-AFA1-82EAF0581EFA}</ProjectGuid>
+    <RootNamespace>ShadowDll</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>Windows7.1SDK</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>Windows7.1SDK</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>Windows7.1SDK</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>Windows7.1SDK</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">OBJ\$(ProjectName)_$(Configuration)_$(Platform)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">OBJ\$(ProjectName)_$(Configuration)_$(Platform)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">OBJ\$(ProjectName)_$(Configuration)_$(Platform)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">OBJ\$(ProjectName)_$(Configuration)_$(Platform)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">OBJ\$(ProjectName)_$(Configuration)_$(Platform)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">OBJ\$(ProjectName)_$(Configuration)_$(Platform)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Taskbar7_$(Platform)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Taskbar7_$(Platform)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Taskbar7_$(Platform)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Taskbar7_$(Platform)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)Build.html</Path>
+    </BuildLog>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;TASKBAR_SEVEN_DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <DisableSpecificWarnings>4100</DisableSpecificWarnings>
+      <AdditionalIncludeDirectories>../..</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <ProfileGuidedDatabase>
+      </ProfileGuidedDatabase>
+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <BuildLog>
+      <Path>$(IntDir)Build.html</Path>
+    </BuildLog>
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_USRDLL;TASKBAR_SEVEN_DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4100</DisableSpecificWarnings>
+      <AdditionalIncludeDirectories>../..</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <ProfileGuidedDatabase>
+      </ProfileGuidedDatabase>
+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <BuildLog>
+      <Path>$(IntDir)Build.html</Path>
+    </BuildLog>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;TASKBAR_SEVEN_DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4100</DisableSpecificWarnings>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <AdditionalIncludeDirectories>../..</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+      <ProfileGuidedDatabase>
+      </ProfileGuidedDatabase>
+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <BuildLog>
+      <Path>$(IntDir)Build.html</Path>
+    </BuildLog>
+    <Midl>
+      <TargetEnvironment>X64</TargetEnvironment>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_USRDLL;TASKBAR_SEVEN_DLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <DisableSpecificWarnings>4100</DisableSpecificWarnings>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <AdditionalIncludeDirectories>../..</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+      <ProfileGuidedDatabase>
+      </ProfileGuidedDatabase>
+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
+      <TargetMachine>MachineX64</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="dll_main.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+      </PrecompiledHeader>
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsManaged>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+      </PrecompiledHeader>
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsManaged>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+      </PrecompiledHeader>
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsManaged>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+      </PrecompiledHeader>
+      <CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsManaged>
+    </ClCompile>
+    <ClCompile Include="taskbar.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="taskbar.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/ui/Taskbar_Seven/dll_main.cpp b/ui/Taskbar_Seven/dll_main.cpp
new file mode 100644
index 00000000..3805c99d
--- /dev/null
+++ b/ui/Taskbar_Seven/dll_main.cpp
@@ -0,0 +1,25 @@
+// **************************************************************************
+// * This file is part of the FreeFileSync project. It is distributed under *
+// * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
+// * Copyright (C) 2008-2011 ZenJu (zhnmju123 AT gmx.de)                    *
+// **************************************************************************
+
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+//optional: add init/teardown logic here
+BOOL APIENTRY DllMain(HINSTANCE hinstDLL,
+                      DWORD     fdwReason,
+                      LPVOID    lpvReserved)
+{
+    switch (fdwReason)
+    {
+        case DLL_PROCESS_ATTACH:
+        case DLL_PROCESS_DETACH:
+        case DLL_THREAD_ATTACH:
+        case DLL_THREAD_DETACH:
+            break;
+    }
+    return TRUE;
+}
diff --git a/ui/Taskbar_Seven/taskbar.cpp b/ui/Taskbar_Seven/taskbar.cpp
new file mode 100644
index 00000000..368152f4
--- /dev/null
+++ b/ui/Taskbar_Seven/taskbar.cpp
@@ -0,0 +1,112 @@
+// **************************************************************************
+// * This file is part of the FreeFileSync project. It is distributed under *
+// * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
+// * Copyright (C) 2008-2011 ZenJu (zhnmju123 AT gmx.de)                    *
+// **************************************************************************
+
+#include "taskbar.h"
+
+#define WIN32_LEAN_AND_MEAN
+#include "windows.h"
+#include <ShObjIdl.h>
+
+#include <map>
+#include <string>
+#include <comdef.h>
+#include <zen/com_error.h>
+#include <zen/com_ptr.h>
+
+using namespace zen;
+
+
+namespace
+{
+std::wstring lastErrorMessage;
+
+
+ComPtr<ITaskbarList3> getInstance()
+{
+    ComPtr<ITaskbarList3> taskbarlist;
+
+    HRESULT hr = ::CoCreateInstance(CLSID_TaskbarList,
+                                    NULL,
+                                    CLSCTX_ALL,
+                                    IID_PPV_ARGS(taskbarlist.init()));
+    if (FAILED(hr))
+        lastErrorMessage = generateErrorMsg(L"Error calling \"CoCreateInstance\".", hr);
+
+    return taskbarlist;
+}
+}
+//##################################################################################################
+
+
+bool tbseven::setStatus(void* hwnd, //HWND: window assciated to the taskbar icon
+                        TaskBarStatus status)
+{
+    TBPFLAG flag = TBPF_NORMAL;
+    switch (status)
+    {
+        case STATUS_NOPROGRESS:
+            flag = TBPF_NOPROGRESS;
+            break;
+        case STATUS_INDETERMINATE:
+            flag = TBPF_INDETERMINATE;
+            break;
+        case STATUS_NORMAL:
+            flag = TBPF_NORMAL;
+            break;
+        case STATUS_ERROR:
+            flag = TBPF_ERROR;
+            break;
+        case STATUS_PAUSED:
+            flag = TBPF_PAUSED;
+            break;
+    }
+
+    ComPtr<ITaskbarList3> taskbarlist = getInstance();
+    if (!taskbarlist) //error msg already set
+        return false;
+
+    HRESULT hr = taskbarlist->SetProgressState(static_cast<HWND>(hwnd),  //[in]  HWND hwnd,
+                                               flag); //[in]  TBPFLAG tbpFlags
+    if (FAILED(hr))
+    {
+        lastErrorMessage = generateErrorMsg(L"Error calling \"SetProgressState\".", hr);
+        return false;
+    }
+
+    return true;
+}
+
+
+bool tbseven::setProgress(void* hwnd, //HWND: window assciated to the taskbar icon
+                          size_t current,
+                          size_t total)
+{
+    ComPtr<ITaskbarList3> taskbarlist = getInstance();
+    if (!taskbarlist) //error msg already set
+        return false;
+
+    HRESULT hr = taskbarlist->SetProgressValue(
+                     static_cast<HWND>(hwnd), //[in]  HWND hwnd,
+                     current, //[in]  ULONGLONG ullCompleted,
+                     total);  //[in]  ULONGLONG ullTotal
+    if (FAILED(hr))
+    {
+        lastErrorMessage = generateErrorMsg(L"Error calling \"SetProgressValue\".", hr);
+        return false;
+    }
+
+    return true;
+}
+
+
+void tbseven::getLastError(wchar_t* buffer, size_t bufferSize)
+{
+    if (bufferSize > 0)
+    {
+        size_t endPos = lastErrorMessage.copy(buffer, bufferSize - 1);
+        buffer[endPos] = 0;
+    }
+}
diff --git a/ui/Taskbar_Seven/taskbar.h b/ui/Taskbar_Seven/taskbar.h
new file mode 100644
index 00000000..082f463f
--- /dev/null
+++ b/ui/Taskbar_Seven/taskbar.h
@@ -0,0 +1,72 @@
+// **************************************************************************
+// * This file is part of the FreeFileSync project. It is distributed under *
+// * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
+// * Copyright (C) 2008-2011 ZenJu (zhnmju123 AT gmx.de)                    *
+// **************************************************************************
+
+#ifndef TASKBAR_SEVEN_DLL_H
+#define TASKBAR_SEVEN_DLL_H
+
+#ifdef TASKBAR_SEVEN_DLL_EXPORTS
+#define DLL_FUNCTION_DECLARATION extern "C" __declspec(dllexport)
+#else
+#define DLL_FUNCTION_DECLARATION extern "C" __declspec(dllimport)
+#endif
+
+#include <zen/build_info.h>
+
+
+namespace tbseven
+{
+/*--------------
+  |declarations|
+  --------------*/
+
+enum TaskBarStatus
+{
+    STATUS_NOPROGRESS,
+    STATUS_INDETERMINATE,
+    STATUS_NORMAL,
+    STATUS_ERROR,
+    STATUS_PAUSED
+};
+
+
+//COM needs to be initialized before calling any of these functions! CoInitializeEx/CoUninitialize
+
+DLL_FUNCTION_DECLARATION
+bool setStatus(void* hwnd, //HWND: window assciated to the taskbar icon
+               TaskBarStatus status);
+
+
+DLL_FUNCTION_DECLARATION
+bool setProgress(void* hwnd, //HWND: window assciated to the taskbar icon
+                 size_t current,
+                 size_t total);
+
+//if any of the functions above returns 'false', this message returns last error
+DLL_FUNCTION_DECLARATION
+void getLastError(wchar_t* buffer, size_t bufferSize);
+
+/*----------
+  |typedefs|
+  ----------*/
+typedef bool (*SetStatusFct   )(void* hwnd, TaskBarStatus status);
+typedef bool (*SetProgressFct )(void* hwnd, size_t current, size_t total);
+typedef void (*GetLastErrorFct)(wchar_t* buffer, size_t bufferSize);
+
+/*--------------
+  |symbol names|
+  --------------*/
+//(use const pointers to ensure internal linkage)
+const char setStatusFctName   [] = "setStatus";
+const char setProgressFctName [] = "setProgress";
+const char getLastErrorFctName[] = "getLastError";
+
+/*---------------
+  |library names|
+  ---------------*/
+inline const wchar_t* getDllName() { return zen::is64BitBuild ? L"Taskbar7_x64.dll" : L"Taskbar7_Win32.dll"; }
+}
+
+#endif //TASKBAR_SEVEN_DLL_H
diff --git a/ui/batch_config.cpp b/ui/batch_config.cpp
index 6e784179..0ef87903 100644
--- a/ui/batch_config.cpp
+++ b/ui/batch_config.cpp
@@ -5,19 +5,19 @@
 // **************************************************************************
 
 #include "batch_config.h"
-#include "../shared/dir_picker_i18n.h"
+#include <wx+/dir_picker.h>
 #include "folder_pair.h"
 #include <iterator>
 #include <wx/wupdlock.h>
-#include "../shared/help_provider.h"
-#include "../shared/file_handling.h"
+#include "../lib/help_provider.h"
+#include <zen/file_handling.h>
 #include "msg_popup.h"
 #include "gui_generated.h"
 #include <wx/dnd.h>
 #include <wx/msgdlg.h>
-#include "../shared/custom_button.h"
-#include "../shared/wx_choice_enum.h"
-#include "../shared/mouse_move_dlg.h"
+#include <wx+/button.h>
+#include <wx+/choice_enum.h>
+#include <wx+/mouse_move_dlg.h>
 
 using namespace zen;
 
@@ -66,8 +66,6 @@ private:
 
     void updateGui(); //re-evaluate gui after config changes
 
-    void showNotebookpage(wxWindow* page, const wxString& pageName, bool show);
-
     //error handling
     //xmlAccess::OnError getSelectionHandleError() const; -> obsolete, use getEnumVal()
     void setSelectionHandleError(xmlAccess::OnError value);
@@ -80,7 +78,7 @@ private:
     void setConfig(const xmlAccess::XmlBatchConfig& batchCfg);
     xmlAccess::XmlBatchConfig getConfig() const;
 
-    std::shared_ptr<DirectoryPairBatchFirst> firstFolderPair; //always bound!!!
+    std::unique_ptr<DirectoryPairBatchFirst> firstFolderPair; //always bound!!!
     std::vector<DirectoryPairBatch*> additionalFolderPairs;
 
     //used when saving batch file
@@ -90,7 +88,7 @@ private:
 
     std::unique_ptr<wxMenu> contextMenu;
 
-    std::unique_ptr<DirectoryName<wxTextCtrl>> logfileDir;
+    std::unique_ptr<DirectoryName<FolderHistoryBox>> logfileDir;
 
     zen::EnumDescrList<xmlAccess::OnError> enumDescrMap;
 
@@ -268,7 +266,7 @@ BatchDialog::BatchDialog(wxWindow* window,
     setupFileDrop(*this);
     Connect(FFS_DROP_FILE_EVENT, FFSFileDropEventHandler(BatchDialog::OnFilesDropped), NULL, this);
 
-    logfileDir.reset(new DirectoryName<wxTextCtrl>(*m_panelBatchSettings, *m_dirPickerLogfileDir, *m_textCtrlLogfileDir));
+    logfileDir.reset(new DirectoryName<FolderHistoryBox>(*m_panelBatchSettings, *m_dirPickerLogfileDir, *m_comboBoxLogfileDir));
 
     //set icons for this dialog
     m_bpButtonAddPair->SetBitmapLabel(GlobalResources::getImage(wxT("addFolderPair")));
@@ -439,7 +437,7 @@ void BatchDialog::OnHelp(wxCommandEvent& event)
 #endif
 }
 
-
+/*
 void BatchDialog::showNotebookpage(wxWindow* page, const wxString& pageName, bool show)
 {
     int windowPosition = -1;
@@ -467,7 +465,7 @@ void BatchDialog::showNotebookpage(wxWindow* page, const wxString& pageName, boo
         }
     }
 }
-
+*/
 
 void BatchDialog::OnClose(wxCloseEvent&   event)
 {
@@ -857,23 +855,10 @@ void BatchDialog::clearAddFolderPairs()
 
 /*
 #ifdef FFS_WIN
-#include <wx/msw/wrapwin.h> //includes "windows.h"
+#include <zen/win.h> //includes "windows.h"
 #include <shlobj.h>
 #endif  // FFS_WIN
 
-template <typename T>
-struct CleanUp
-{
-    CleanUp(T* element) : m_element(element) {}
-
-    ~CleanUp()
-    {
-        m_element->Release();
-    }
-
-    T* m_element;
-};
-
 
 bool BatchDialog::createBatchFile(const wxString& filename)
 {
diff --git a/ui/batch_config.h b/ui/batch_config.h
index 02f9b5f8..642cea00 100644
--- a/ui/batch_config.h
+++ b/ui/batch_config.h
@@ -7,8 +7,8 @@
 #ifndef BATCHCONFIG_H_INCLUDED
 #define BATCHCONFIG_H_INCLUDED
 
-#include "../library/process_xml.h"
-#include "../shared/folder_history_box.h"
+#include "../lib/process_xml.h"
+#include "../lib/folder_history_box.h"
 
 namespace zen
 {
diff --git a/ui/batch_status_handler.cpp b/ui/batch_status_handler.cpp
index 84168014..a8c7b2c5 100644
--- a/ui/batch_status_handler.cpp
+++ b/ui/batch_status_handler.cpp
@@ -8,14 +8,12 @@
 #include "msg_popup.h"
 #include <wx/ffile.h>
 #include <wx/msgdlg.h>
-#include "../shared/standard_paths.h"
-#include "../shared/file_handling.h"
-#include "../shared/resolve_path.h"
-#include "../shared/string_conv.h"
-#include "../shared/global_func.h"
-#include "../shared/app_main.h"
-#include "../shared/util.h"
-#include "../shared/file_traverser.h"
+#include "../lib/ffs_paths.h"
+#include <zen/file_handling.h>
+#include "../lib/resolve_path.h"
+#include <wx+/string_conv.h>
+#include <wx+/app_main.h>
+#include <zen/file_traverser.h>
 
 using namespace zen;
 
@@ -30,7 +28,7 @@ public:
     virtual void onFile(const Zchar* shortName, const Zstring& fullName, const FileInfo& details)
     {
         const Zstring fileName(shortName);
-        if (fileName.StartsWith(prefix_) && fileName.EndsWith(Zstr(".log")))
+        if (startsWith(fileName, prefix_) && endsWith(fileName, Zstr(".log")))
             logfiles_.push_back(fullName);
     }
 
@@ -38,7 +36,7 @@ public:
 
     virtual ReturnValDir onDir(const Zchar* shortName, const Zstring& fullName)
     {
-        return Loki::Int2Type<ReturnValDir::TRAVERSING_DIR_IGNORE>(); //DON'T traverse into subdirs
+        return Int2Type<ReturnValDir::TRAVERSING_DIR_IGNORE>(); //DON'T traverse into subdirs
     }
 
     virtual HandleError onError(const std::wstring& errorText) { return TRAV_ERROR_IGNORE; } //errors are not really critical in this context
@@ -127,8 +125,6 @@ public:
 private:
     static wxString findUniqueLogname(const wxString& logfileDirectory, const wxString& jobName)
     {
-        using namespace common;
-
         //create logfile directory
         Zstring logfileDir = logfileDirectory.empty() ?
                              toZ(zen::getConfigDir() + wxT("Logs")) :
@@ -138,7 +134,7 @@ private:
             zen::createDirectory(logfileDir); //create recursively if necessary: may throw (FileError&)
 
         //assemble logfile name
-        if (!logfileDir.EndsWith(FILE_NAME_SEPARATOR))
+        if (!endsWith(logfileDir, FILE_NAME_SEPARATOR))
             logfileDir += FILE_NAME_SEPARATOR;
 
         wxString logfileName = toWx(logfileDir);
@@ -232,13 +228,17 @@ BatchStatusHandler::~BatchStatusHandler()
     //decide whether to stay on status screen or exit immediately...
     if (switchToGuiRequested) //-> avoid recursive yield() calls, thous switch not before ending batch mode
     {
-        switchBatchToGui_.execute(); //open FreeFileSync GUI
+        try
+        {
+            switchBatchToGui_.execute(); //open FreeFileSync GUI
+        }
+        catch (...) {}
         syncStatusFrame.closeWindowDirectly(); //syncStatusFrame is main window => program will quit directly
     }
     else if (!exitWhenFinished || syncStatusFrame.getAsWindow()->IsShown()) //warning: wxWindow::Show() is called within processHasFinished()!
     {
         //notify about (logical) application main window => program won't quit, but stay on this dialog
-        zen::AppMainWindow::setMainWindow(syncStatusFrame.getAsWindow());
+        zen::setMainWindow(syncStatusFrame.getAsWindow());
 
         //notify to syncStatusFrame that current process has ended
         if (abortIsRequested())
diff --git a/ui/batch_status_handler.h b/ui/batch_status_handler.h
index 43fa5549..548447f6 100644
--- a/ui/batch_status_handler.h
+++ b/ui/batch_status_handler.h
@@ -7,9 +7,9 @@
 #ifndef BATCHSTATUSHANDLER_H_INCLUDED
 #define BATCHSTATUSHANDLER_H_INCLUDED
 
-#include "../library/status_handler.h"
-#include "../library/process_xml.h"
-#include "../library/error_log.h"
+#include "../lib/status_handler.h"
+#include "../lib/process_xml.h"
+#include "../lib/error_log.h"
 #include "progress_indicator.h"
 #include "switch_to_gui.h"
 
diff --git a/ui/check_version.cpp b/ui/check_version.cpp
index 16eb7719..99870352 100644
--- a/ui/check_version.cpp
+++ b/ui/check_version.cpp
@@ -12,12 +12,13 @@
 #include "../version/version.h"
 #include <wx/utils.h>
 #include <wx/timer.h>
-#include <string_tools.h>
+#include <zen/string_tools.h>
 #include "msg_popup.h"
-#include "../shared/standard_paths.h"
-#include "loki/ScopeGuard.h"
+#include "../lib/ffs_paths.h"
+#include <zen/scope_guard.h>
 #include <wx/tokenzr.h>
-#include "../shared/i18n.h"
+#include <zen/i18n.h>
+
 
 bool getOnlineVersion(wxString& version)
 {
diff --git a/ui/folder_pair.h b/ui/folder_pair.h
index 6c535664..5d26d724 100644
--- a/ui/folder_pair.h
+++ b/ui/folder_pair.h
@@ -8,16 +8,15 @@
 #define FOLDERPAIR_H_INCLUDED
 
 #include "../structures.h"
-#include "../shared/dir_name.h"
-#include "../library/resources.h"
+#include "../lib/dir_name.h"
+#include "../lib/resources.h"
 #include "small_dlgs.h"
 #include "sync_cfg.h"
 #include <wx/event.h>
 #include <wx/menu.h>
-#include "../shared/util.h"
-#include "../shared/string_conv.h"
-#include "../library/norm_filter.h"
-#include "../shared/custom_button.h"
+#include <wx+/string_conv.h>
+#include "../lib/norm_filter.h"
+#include <wx+/button.h>
 
 namespace zen
 {
diff --git a/ui/grid_view.cpp b/ui/grid_view.cpp
index 17fb3ff4..22c158fd 100644
--- a/ui/grid_view.cpp
+++ b/ui/grid_view.cpp
@@ -8,7 +8,7 @@
 #include "sorting.h"
 #include "../synchronization.h"
 #include <boost/bind.hpp>
-#include "../shared/stl_tools.h"
+#include <zen/stl_tools.h>
 
 using namespace zen;
 
diff --git a/ui/gui_generated.cpp b/ui/gui_generated.cpp
index b0fb1b6d..5ecb0948 100644
--- a/ui/gui_generated.cpp
+++ b/ui/gui_generated.cpp
@@ -5,11 +5,13 @@
 // PLEASE DO "NOT" EDIT THIS FILE!
 ///////////////////////////////////////////////////////////////////////////
 
-#include "../library/custom_grid.h"
-#include "../shared/custom_button.h"
-#include "../shared/dir_picker_i18n.h"
-#include "../shared/folder_history_box.h"
-#include "../shared/toggle_button.h"
+#include "../lib/custom_grid.h"
+#include "../lib/folder_history_box.h"
+#include "../wx+/button.h"
+#include "../wx+/dir_picker.h"
+#include "../wx+/graph.h"
+#include "../wx+/toggle_button.h"
+#include "wx_form_build_hide_warnings.h"
 
 #include "gui_generated.h"
 
@@ -17,858 +19,847 @@
 
 MainDialogGenerated::MainDialogGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxFrame( parent, id, title, pos, size, style )
 {
-    this->SetSizeHints( wxSize( 640,400 ), wxDefaultSize );
-
-    m_menubar1 = new wxMenuBar( 0 );
-    m_menuFile = new wxMenu();
-    m_menuItem10 = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("1. &Compare") ) + wxT('\t') + wxT("F5"), wxEmptyString, wxITEM_NORMAL );
-    m_menuFile->Append( m_menuItem10 );
-
-    m_menuItem11 = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("2. &Synchronize...") ) + wxT('\t') + wxT("F6"), wxEmptyString, wxITEM_NORMAL );
-    m_menuFile->Append( m_menuItem11 );
-
-    wxMenuItem* m_separator1;
-    m_separator1 = m_menuFile->AppendSeparator();
-
-    m_menuItemSwitchView = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("S&witch view") ) + wxT('\t') + wxT("F8"), wxEmptyString, wxITEM_NORMAL );
-    m_menuFile->Append( m_menuItemSwitchView );
-
-    wxMenuItem* m_separator2;
-    m_separator2 = m_menuFile->AppendSeparator();
-
-    m_menuItemNew = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("&New") ) + wxT('\t') + wxT("Ctrl-N"), wxEmptyString, wxITEM_NORMAL );
-    m_menuFile->Append( m_menuItemNew );
-
-    m_menuItemSave = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("S&ave configuration...") ) + wxT('\t') + wxT("Ctrl-S"), wxEmptyString, wxITEM_NORMAL );
-    m_menuFile->Append( m_menuItemSave );
-
-    m_menuItemLoad = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("&Load configuration...") ) + wxT('\t') + wxT("Ctrl-O"), wxEmptyString, wxITEM_NORMAL );
-    m_menuFile->Append( m_menuItemLoad );
-
-    wxMenuItem* m_separator3;
-    m_separator3 = m_menuFile->AppendSeparator();
-
-    wxMenuItem* m_menuItem4;
-    m_menuItem4 = new wxMenuItem( m_menuFile, wxID_EXIT, wxString( _("&Quit") ) + wxT('\t') + wxT("Ctrl-Q"), wxEmptyString, wxITEM_NORMAL );
-    m_menuFile->Append( m_menuItem4 );
-
-    m_menubar1->Append( m_menuFile, _("&Program") );
-
-    m_menuAdvanced = new wxMenu();
-    m_menuLanguages = new wxMenu();
-    m_menuAdvanced->Append( -1, _("&Language"), m_menuLanguages );
-
-    wxMenuItem* m_separator4;
-    m_separator4 = m_menuAdvanced->AppendSeparator();
-
-    m_menuItemGlobSett = new wxMenuItem( m_menuAdvanced, wxID_ANY, wxString( _("&Global settings...") ) , wxEmptyString, wxITEM_NORMAL );
-    m_menuAdvanced->Append( m_menuItemGlobSett );
-
-    m_menuItem7 = new wxMenuItem( m_menuAdvanced, wxID_ANY, wxString( _("&Create batch job...") ) , wxEmptyString, wxITEM_NORMAL );
-    m_menuAdvanced->Append( m_menuItem7 );
-
-    wxMenuItem* m_menuItem5;
-    m_menuItem5 = new wxMenuItem( m_menuAdvanced, wxID_ANY, wxString( _("&Export file list...") ) , wxEmptyString, wxITEM_NORMAL );
-    m_menuAdvanced->Append( m_menuItem5 );
-
-    m_menubar1->Append( m_menuAdvanced, _("&Advanced") );
-
-    m_menuHelp = new wxMenu();
-    wxMenuItem* m_menuItemReadme;
-    m_menuItemReadme = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("&Content") ) + wxT('\t') + wxT("F1"), wxEmptyString, wxITEM_NORMAL );
-    m_menuHelp->Append( m_menuItemReadme );
-
-    m_menuItemCheckVer = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("&Check for new version") ) , wxEmptyString, wxITEM_NORMAL );
-    m_menuHelp->Append( m_menuItemCheckVer );
-
-    wxMenuItem* m_separator5;
-    m_separator5 = m_menuHelp->AppendSeparator();
-
-    m_menuItemAbout = new wxMenuItem( m_menuHelp, wxID_ABOUT, wxString( _("&About...") ) + wxT('\t') + wxT("Shift-F1"), wxEmptyString, wxITEM_NORMAL );
-    m_menuHelp->Append( m_menuItemAbout );
-
-    m_menubar1->Append( m_menuHelp, _("&Help") );
-
-    this->SetMenuBar( m_menubar1 );
-
-    bSizerPanelHolder = new wxBoxSizer( wxVERTICAL );
-
-    m_panelTopButtons = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxRAISED_BORDER|wxTAB_TRAVERSAL );
-    bSizerTopButtons = new wxBoxSizer( wxHORIZONTAL );
-
-    wxBoxSizer* bSizer155;
-    bSizer155 = new wxBoxSizer( wxHORIZONTAL );
-
-
-    bSizer155->Add( 15, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    wxFlexGridSizer* fgSizer121;
-    fgSizer121 = new wxFlexGridSizer( 2, 2, 0, 0 );
-    fgSizer121->SetFlexibleDirection( wxBOTH );
-    fgSizer121->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-
-    m_staticTextCmpVariant = new wxStaticText( m_panelTopButtons, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextCmpVariant->Wrap( -1 );
-    m_staticTextCmpVariant->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
-    m_staticTextCmpVariant->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
-
-    fgSizer121->Add( m_staticTextCmpVariant, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxTOP, 1 );
-
-
-    fgSizer121->Add( 0, 0, 1, 0, 5 );
-
-    wxBoxSizer* bSizer30;
-    bSizer30 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_buttonCompare = new wxButtonWithImage( m_panelTopButtons, wxID_OK, _("Compare"), wxDefaultPosition, wxSize( 180,42 ), 0 );
-    m_buttonCompare->SetDefault();
-    m_buttonCompare->SetFont( wxFont( 14, 74, 90, 92, false, wxEmptyString ) );
-    m_buttonCompare->SetToolTip( _("Compare both sides") );
-
-    bSizer30->Add( m_buttonCompare, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_buttonAbort = new wxButton( m_panelTopButtons, wxID_CANCEL, _("&Abort"), wxDefaultPosition, wxSize( 180,42 ), 0 );
-    m_buttonAbort->SetFont( wxFont( 14, 74, 90, 92, false, wxEmptyString ) );
-    m_buttonAbort->Enable( false );
-    m_buttonAbort->Hide();
-
-    bSizer30->Add( m_buttonAbort, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    fgSizer121->Add( bSizer30, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_bpButtonCmpConfig = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,42 ), wxBU_AUTODRAW );
-    m_bpButtonCmpConfig->SetToolTip( _("Comparison settings") );
-
-    fgSizer121->Add( m_bpButtonCmpConfig, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 3 );
-
-    bSizer155->Add( fgSizer121, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 );
-
-    bSizerTopButtons->Add( bSizer155, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizerTopButtons->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-
-    wxBoxSizer* bSizer1551;
-    bSizer1551 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxFlexGridSizer* fgSizer12;
-    fgSizer12 = new wxFlexGridSizer( 2, 2, 0, 0 );
-    fgSizer12->SetFlexibleDirection( wxBOTH );
-    fgSizer12->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-
-
-    fgSizer12->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    m_staticTextSyncVariant = new wxStaticText( m_panelTopButtons, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextSyncVariant->Wrap( -1 );
-    m_staticTextSyncVariant->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
-    m_staticTextSyncVariant->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
-
-    fgSizer12->Add( m_staticTextSyncVariant, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP, 1 );
-
-    m_bpButtonSyncConfig = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,42 ), wxBU_AUTODRAW );
-    m_bpButtonSyncConfig->SetToolTip( _("Synchronization settings") );
-
-    fgSizer12->Add( m_bpButtonSyncConfig, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 3 );
-
-    m_buttonStartSync = new wxButtonWithImage( m_panelTopButtons, wxID_ANY, _("Synchronize..."), wxDefaultPosition, wxSize( 180,42 ), 0 );
-    m_buttonStartSync->SetFont( wxFont( 14, 74, 90, 92, false, wxEmptyString ) );
-    m_buttonStartSync->SetToolTip( _("Start synchronization") );
-
-    fgSizer12->Add( m_buttonStartSync, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizer1551->Add( fgSizer12, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 );
-
-
-    bSizer1551->Add( 15, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizerTopButtons->Add( bSizer1551, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_panelTopButtons->SetSizer( bSizerTopButtons );
-    m_panelTopButtons->Layout();
-    bSizerTopButtons->Fit( m_panelTopButtons );
-    bSizerPanelHolder->Add( m_panelTopButtons, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-
-    m_panelDirectoryPairs = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    wxBoxSizer* bSizer1601;
-    bSizer1601 = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer91;
-    bSizer91 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_panelTopLeft = new wxPanel( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelTopLeft->SetMinSize( wxSize( 1,1 ) );
-
-    sbSizerDirLeft = new wxStaticBoxSizer( new wxStaticBox( m_panelTopLeft, wxID_ANY, _("Drag && drop") ), wxHORIZONTAL );
-
-    m_bpButtonAddPair = new wxBitmapButton( m_panelTopLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
-    m_bpButtonAddPair->SetToolTip( _("Add folder pair") );
-
-    sbSizerDirLeft->Add( m_bpButtonAddPair, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 3 );
-
-    m_bpButtonRemovePair = new wxBitmapButton( m_panelTopLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
-    m_bpButtonRemovePair->SetToolTip( _("Remove folder pair") );
-
-    sbSizerDirLeft->Add( m_bpButtonRemovePair, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_directoryLeft = new FolderHistoryBox( m_panelTopLeft, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
-    sbSizerDirLeft->Add( m_directoryLeft, 1, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_dirPickerLeft = new FfsDirPickerCtrl( m_panelTopLeft, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_dirPickerLeft->SetToolTip( _("Select a folder") );
-
-    sbSizerDirLeft->Add( m_dirPickerLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_panelTopLeft->SetSizer( sbSizerDirLeft );
-    m_panelTopLeft->Layout();
-    sbSizerDirLeft->Fit( m_panelTopLeft );
-    bSizer91->Add( m_panelTopLeft, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_panelTopMiddle = new wxPanel( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    wxBoxSizer* bSizer93;
-    bSizer93 = new wxBoxSizer( wxVERTICAL );
-
-
-    bSizer93->Add( 0, 3, 0, 0, 5 );
-
-    m_bpButtonSwapSides = new wxBitmapButton( m_panelTopMiddle, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
-    m_bpButtonSwapSides->SetToolTip( _("Swap sides") );
-
-    bSizer93->Add( m_bpButtonSwapSides, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-
-    wxBoxSizer* bSizer160;
-    bSizer160 = new wxBoxSizer( wxHORIZONTAL );
-
-
-    bSizer160->Add( 0, 0, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_bpButtonAltCompCfg = new wxBitmapButton( m_panelTopMiddle, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
-    bSizer160->Add( m_bpButtonAltCompCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_bpButtonLocalFilter = new wxBitmapButton( m_panelTopMiddle, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
-    bSizer160->Add( m_bpButtonLocalFilter, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 3 );
-
-    m_bpButtonAltSyncCfg = new wxBitmapButton( m_panelTopMiddle, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
-    bSizer160->Add( m_bpButtonAltSyncCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizer160->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    bSizer93->Add( bSizer160, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_panelTopMiddle->SetSizer( bSizer93 );
-    m_panelTopMiddle->Layout();
-    bSizer93->Fit( m_panelTopMiddle );
-    bSizer91->Add( m_panelTopMiddle, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-
-    m_panelTopRight = new wxPanel( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelTopRight->SetMinSize( wxSize( 1,1 ) );
-
-    sbSizerDirRight = new wxStaticBoxSizer( new wxStaticBox( m_panelTopRight, wxID_ANY, _("Drag && drop") ), wxHORIZONTAL );
-
-    m_directoryRight = new FolderHistoryBox( m_panelTopRight, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
-    sbSizerDirRight->Add( m_directoryRight, 1, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_dirPickerRight = new FfsDirPickerCtrl( m_panelTopRight, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_dirPickerRight->SetToolTip( _("Select a folder") );
-
-    sbSizerDirRight->Add( m_dirPickerRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_panelTopRight->SetSizer( sbSizerDirRight );
-    m_panelTopRight->Layout();
-    sbSizerDirRight->Fit( m_panelTopRight );
-    bSizer91->Add( m_panelTopRight, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-
-    bSizer1601->Add( bSizer91, 0, wxEXPAND, 5 );
-
-    m_scrolledWindowFolderPairs = new wxScrolledWindow( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxHSCROLL|wxVSCROLL );
-    m_scrolledWindowFolderPairs->SetScrollRate( 5, 5 );
-    m_scrolledWindowFolderPairs->SetMinSize( wxSize( -1,0 ) );
-
-    bSizerAddFolderPairs = new wxBoxSizer( wxVERTICAL );
-
-    m_scrolledWindowFolderPairs->SetSizer( bSizerAddFolderPairs );
-    m_scrolledWindowFolderPairs->Layout();
-    bSizerAddFolderPairs->Fit( m_scrolledWindowFolderPairs );
-    bSizer1601->Add( m_scrolledWindowFolderPairs, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-
-    m_panelDirectoryPairs->SetSizer( bSizer1601 );
-    m_panelDirectoryPairs->Layout();
-    bSizer1601->Fit( m_panelDirectoryPairs );
-    bSizerPanelHolder->Add( m_panelDirectoryPairs, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-
-    m_panelGrids = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    m_panelGrids->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_APPWORKSPACE ) );
-
-    bSizerGridHolder = new wxBoxSizer( wxHORIZONTAL );
-
-    m_panelLeft = new wxPanel( m_panelGrids, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    wxBoxSizer* bSizer7;
-    bSizer7 = new wxBoxSizer( wxVERTICAL );
-
-    m_gridLeft = new CustomGridLeft( m_panelLeft, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-
-    // Grid
-    m_gridLeft->CreateGrid( 15, 4 );
-    m_gridLeft->EnableEditing( false );
-    m_gridLeft->EnableGridLines( true );
-    m_gridLeft->EnableDragGridSize( true );
-    m_gridLeft->SetMargins( 0, 0 );
-
-    // Columns
-    m_gridLeft->EnableDragColMove( false );
-    m_gridLeft->EnableDragColSize( true );
-    m_gridLeft->SetColLabelSize( 20 );
-    m_gridLeft->SetColLabelAlignment( wxALIGN_LEFT, wxALIGN_CENTRE );
-
-    // Rows
-    m_gridLeft->EnableDragRowSize( false );
-    m_gridLeft->SetRowLabelSize( 38 );
-    m_gridLeft->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-
-    // Label Appearance
-
-    // Cell Defaults
-    m_gridLeft->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTRE );
-    m_gridLeft->SetMinSize( wxSize( 1,1 ) );
-
-    bSizer7->Add( m_gridLeft, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-
-    m_panelLeft->SetSizer( bSizer7 );
-    m_panelLeft->Layout();
-    bSizer7->Fit( m_panelLeft );
-    bSizerGridHolder->Add( m_panelLeft, 1, wxEXPAND, 5 );
-
-    m_panelMiddle = new wxPanel( m_panelGrids, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    wxBoxSizer* bSizer18;
-    bSizer18 = new wxBoxSizer( wxVERTICAL );
-
-    m_gridMiddle = new CustomGridMiddle( m_panelMiddle, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-
-    // Grid
-    m_gridMiddle->CreateGrid( 15, 1 );
-    m_gridMiddle->EnableEditing( false );
-    m_gridMiddle->EnableGridLines( true );
-    m_gridMiddle->EnableDragGridSize( false );
-    m_gridMiddle->SetMargins( 0, 0 );
-
-    // Columns
-    m_gridMiddle->SetColSize( 0, 60 );
-    m_gridMiddle->EnableDragColMove( false );
-    m_gridMiddle->EnableDragColSize( false );
-    m_gridMiddle->SetColLabelSize( 20 );
-    m_gridMiddle->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-
-    // Rows
-    m_gridMiddle->EnableDragRowSize( false );
-    m_gridMiddle->SetRowLabelSize( 0 );
-    m_gridMiddle->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-
-    // Label Appearance
-
-    // Cell Defaults
-    m_gridMiddle->SetDefaultCellFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxT("Arial") ) );
-    m_gridMiddle->SetDefaultCellAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-    bSizer18->Add( m_gridMiddle, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
-
-    m_panelMiddle->SetSizer( bSizer18 );
-    m_panelMiddle->Layout();
-    bSizer18->Fit( m_panelMiddle );
-    bSizerGridHolder->Add( m_panelMiddle, 0, wxEXPAND, 5 );
-
-    m_panelRight = new wxPanel( m_panelGrids, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    wxBoxSizer* bSizer10;
-    bSizer10 = new wxBoxSizer( wxVERTICAL );
-
-    m_gridRight = new CustomGridRight( m_panelRight, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-
-    // Grid
-    m_gridRight->CreateGrid( 15, 4 );
-    m_gridRight->EnableEditing( false );
-    m_gridRight->EnableGridLines( true );
-    m_gridRight->EnableDragGridSize( true );
-    m_gridRight->SetMargins( 0, 0 );
-
-    // Columns
-    m_gridRight->EnableDragColMove( false );
-    m_gridRight->EnableDragColSize( true );
-    m_gridRight->SetColLabelSize( 20 );
-    m_gridRight->SetColLabelAlignment( wxALIGN_LEFT, wxALIGN_CENTRE );
-
-    // Rows
-    m_gridRight->EnableDragRowSize( false );
-    m_gridRight->SetRowLabelSize( 38 );
-    m_gridRight->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-
-    // Label Appearance
-
-    // Cell Defaults
-    m_gridRight->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTRE );
-    m_gridRight->SetMinSize( wxSize( 1,1 ) );
-
-    bSizer10->Add( m_gridRight, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-
-    m_panelRight->SetSizer( bSizer10 );
-    m_panelRight->Layout();
-    bSizer10->Fit( m_panelRight );
-    bSizerGridHolder->Add( m_panelRight, 1, wxEXPAND, 5 );
-
-    m_panelGrids->SetSizer( bSizerGridHolder );
-    m_panelGrids->Layout();
-    bSizerGridHolder->Fit( m_panelGrids );
-    bSizerPanelHolder->Add( m_panelGrids, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-
-    m_panelConfig = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    bSizerConfig = new wxBoxSizer( wxHORIZONTAL );
-
-
-    bSizerConfig->Add( 10, 0, 0, 0, 5 );
-
-    wxBoxSizer* bSizer151;
-    bSizer151 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bpButtonSave = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-    m_bpButtonSave->SetToolTip( _("Save current configuration to file") );
-
-    bSizer151->Add( m_bpButtonSave, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_bpButtonLoad = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-    m_bpButtonLoad->SetToolTip( _("Load configuration from file") );
-
-    bSizer151->Add( m_bpButtonLoad, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizerConfig->Add( bSizer151, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_listBoxHistory = new wxListBox( m_panelConfig, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_EXTENDED|wxLB_NEEDED_SB|wxLB_SORT );
-    m_listBoxHistory->SetToolTip( _("Last used configurations (press DEL to remove from list)") );
-    m_listBoxHistory->SetMinSize( wxSize( -1,40 ) );
-
-    bSizerConfig->Add( m_listBoxHistory, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_panelConfig->SetSizer( bSizerConfig );
-    m_panelConfig->Layout();
-    bSizerConfig->Fit( m_panelConfig );
-    bSizerPanelHolder->Add( m_panelConfig, 0, 0, 5 );
-
-    m_panelFilter = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    wxBoxSizer* bSizer140;
-    bSizer140 = new wxBoxSizer( wxHORIZONTAL );
-
-
-    bSizer140->Add( 10, 0, 0, 0, 5 );
-
-    m_bpButtonFilter = new wxBitmapButton( m_panelFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW|wxFULL_REPAINT_ON_RESIZE );
-    bSizer140->Add( m_bpButtonFilter, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-
-    wxBoxSizer* bSizer23;
-    bSizer23 = new wxBoxSizer( wxVERTICAL );
-
-    m_checkBoxHideFilt = new wxCheckBox( m_panelFilter, wxID_ANY, _("Hide excluded items"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_checkBoxHideFilt->SetToolTip( _("Hide filtered or temporarily excluded files") );
-
-    bSizer23->Add( m_checkBoxHideFilt, 0, wxEXPAND, 5 );
-
-    bSizer140->Add( bSizer23, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_panelFilter->SetSizer( bSizer140 );
-    m_panelFilter->Layout();
-    bSizer140->Fit( m_panelFilter );
-    bSizerPanelHolder->Add( m_panelFilter, 0, 0, 5 );
-
-    m_panelStatistics = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    bSizerStatistics = new wxBoxSizer( wxHORIZONTAL );
-
-
-    bSizerStatistics->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    wxFlexGridSizer* fgSizer5;
-    fgSizer5 = new wxFlexGridSizer( 2, 2, 0, 5 );
-    fgSizer5->SetFlexibleDirection( wxHORIZONTAL );
-    fgSizer5->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-
-    m_bitmapCreate = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    m_bitmapCreate->SetToolTip( _("Number of files and directories that will be created") );
-
-    fgSizer5->Add( m_bitmapCreate, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_textCtrlCreate = new wxTextCtrl( m_panelStatistics, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY|wxTE_RIGHT );
-    m_textCtrlCreate->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
-    m_textCtrlCreate->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-    m_textCtrlCreate->SetToolTip( _("Number of files and directories that will be created") );
-
-    fgSizer5->Add( m_textCtrlCreate, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_bitmapUpdate = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    m_bitmapUpdate->SetToolTip( _("Number of files that will be overwritten") );
-
-    fgSizer5->Add( m_bitmapUpdate, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_textCtrlUpdate = new wxTextCtrl( m_panelStatistics, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY|wxTE_RIGHT );
-    m_textCtrlUpdate->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
-    m_textCtrlUpdate->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-    m_textCtrlUpdate->SetToolTip( _("Number of files that will be overwritten") );
-
-    fgSizer5->Add( m_textCtrlUpdate, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizerStatistics->Add( fgSizer5, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
-
-    wxFlexGridSizer* fgSizer6;
-    fgSizer6 = new wxFlexGridSizer( 2, 2, 0, 5 );
-    fgSizer6->SetFlexibleDirection( wxHORIZONTAL );
-    fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-
-    m_bitmapDelete = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    m_bitmapDelete->SetToolTip( _("Number of files and directories that will be deleted") );
-
-    fgSizer6->Add( m_bitmapDelete, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_textCtrlDelete = new wxTextCtrl( m_panelStatistics, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY|wxTE_RIGHT );
-    m_textCtrlDelete->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
-    m_textCtrlDelete->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-    m_textCtrlDelete->SetToolTip( _("Number of files and directories that will be deleted") );
-
-    fgSizer6->Add( m_textCtrlDelete, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_bitmapData = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    m_bitmapData->SetToolTip( _("Total amount of data that will be transferred") );
-
-    fgSizer6->Add( m_bitmapData, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_textCtrlData = new wxTextCtrl( m_panelStatistics, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY|wxTE_RIGHT );
-    m_textCtrlData->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
-    m_textCtrlData->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-    m_textCtrlData->SetToolTip( _("Total amount of data that will be transferred") );
-
-    fgSizer6->Add( m_textCtrlData, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizerStatistics->Add( fgSizer6, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
-
-
-    bSizerStatistics->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    m_panelStatistics->SetSizer( bSizerStatistics );
-    m_panelStatistics->Layout();
-    bSizerStatistics->Fit( m_panelStatistics );
-    bSizerPanelHolder->Add( m_panelStatistics, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_panelViewFilter = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    bSizerViewFilter = new wxBoxSizer( wxHORIZONTAL );
-
-
-    bSizerViewFilter->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    m_bpButtonSyncCreateLeft = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-    bSizerViewFilter->Add( m_bpButtonSyncCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_bpButtonSyncDirOverwLeft = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-    bSizerViewFilter->Add( m_bpButtonSyncDirOverwLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_bpButtonSyncDeleteLeft = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-    bSizerViewFilter->Add( m_bpButtonSyncDeleteLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_bpButtonLeftOnly = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-    bSizerViewFilter->Add( m_bpButtonLeftOnly, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_bpButtonLeftNewer = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-    bSizerViewFilter->Add( m_bpButtonLeftNewer, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_bpButtonEqual = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-    bSizerViewFilter->Add( m_bpButtonEqual, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_bpButtonDifferent = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-    bSizerViewFilter->Add( m_bpButtonDifferent, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_bpButtonSyncDirNone = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-    bSizerViewFilter->Add( m_bpButtonSyncDirNone, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_bpButtonRightNewer = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-    bSizerViewFilter->Add( m_bpButtonRightNewer, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_bpButtonRightOnly = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-    bSizerViewFilter->Add( m_bpButtonRightOnly, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_bpButtonSyncDeleteRight = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-    bSizerViewFilter->Add( m_bpButtonSyncDeleteRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_bpButtonSyncDirOverwRight = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-    bSizerViewFilter->Add( m_bpButtonSyncDirOverwRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_bpButtonSyncCreateRight = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-    bSizerViewFilter->Add( m_bpButtonSyncCreateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_bpButtonConflict = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-    bSizerViewFilter->Add( m_bpButtonConflict, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-
-    bSizerViewFilter->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    m_panelViewFilter->SetSizer( bSizerViewFilter );
-    m_panelViewFilter->Layout();
-    bSizerViewFilter->Fit( m_panelViewFilter );
-    bSizerPanelHolder->Add( m_panelViewFilter, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_panelStatusBar = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSTATIC_BORDER|wxTAB_TRAVERSAL );
-    wxBoxSizer* bSizer451;
-    bSizer451 = new wxBoxSizer( wxHORIZONTAL );
-
-    bSizer451->SetMinSize( wxSize( -1,22 ) );
-    wxBoxSizer* bSizer53;
-    bSizer53 = new wxBoxSizer( wxHORIZONTAL );
-
-
-    bSizer53->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_staticTextStatusLeft = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextStatusLeft->Wrap( -1 );
-    m_staticTextStatusLeft->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
-
-    bSizer53->Add( m_staticTextStatusLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-
-    bSizer53->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizer451->Add( bSizer53, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-
-    m_staticline9 = new wxStaticLine( m_panelStatusBar, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer451->Add( m_staticline9, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxEXPAND, 2 );
-
-
-    bSizer451->Add( 26, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_staticTextStatusMiddle = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextStatusMiddle->Wrap( -1 );
-    m_staticTextStatusMiddle->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
-
-    bSizer451->Add( m_staticTextStatusMiddle, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-
-    bSizer451->Add( 26, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_staticline10 = new wxStaticLine( m_panelStatusBar, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer451->Add( m_staticline10, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP, 2 );
-
-    wxBoxSizer* bSizer52;
-    bSizer52 = new wxBoxSizer( wxHORIZONTAL );
-
-
-    bSizer52->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_staticTextStatusRight = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextStatusRight->Wrap( -1 );
-    m_staticTextStatusRight->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
-
-    bSizer52->Add( m_staticTextStatusRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    wxBoxSizer* bSizer50;
-    bSizer50 = new wxBoxSizer( wxHORIZONTAL );
-
-
-    bSizer50->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_bitmap15 = new wxStaticBitmap( m_panelStatusBar, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 10,10 ), 0 );
-    bSizer50->Add( m_bitmap15, 0, wxALIGN_BOTTOM, 2 );
-
-    bSizer52->Add( bSizer50, 1, wxALIGN_BOTTOM|wxEXPAND, 5 );
-
-    bSizer451->Add( bSizer52, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_panelStatusBar->SetSizer( bSizer451 );
-    m_panelStatusBar->Layout();
-    bSizer451->Fit( m_panelStatusBar );
-    bSizerPanelHolder->Add( m_panelStatusBar, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-
-    this->SetSizer( bSizerPanelHolder );
-    this->Layout();
-    bSizerPanelHolder->Fit( this );
-
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainDialogGenerated::OnClose ) );
-    this->Connect( m_menuItem10->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnCompare ) );
-    this->Connect( m_menuItem11->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnStartSync ) );
-    this->Connect( m_menuItemSwitchView->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnSwitchView ) );
-    this->Connect( m_menuItemNew->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnNewConfig ) );
-    this->Connect( m_menuItemSave->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnSaveConfig ) );
-    this->Connect( m_menuItemLoad->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnLoadConfig ) );
-    this->Connect( m_menuItem4->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuQuit ) );
-    this->Connect( m_menuItemGlobSett->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuGlobalSettings ) );
-    this->Connect( m_menuItem7->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuBatchJob ) );
-    this->Connect( m_menuItem5->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuExportFileList ) );
-    this->Connect( m_menuItemReadme->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnShowHelp ) );
-    this->Connect( m_menuItemCheckVer->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuCheckVersion ) );
-    this->Connect( m_menuItemAbout->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuAbout ) );
-    m_buttonCompare->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnCompare ), NULL, this );
-    m_bpButtonCmpConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnCmpSettings ), NULL, this );
-    m_bpButtonSyncConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncSettings ), NULL, this );
-    m_buttonStartSync->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnStartSync ), NULL, this );
-    m_bpButtonAddPair->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnAddFolderPair ), NULL, this );
-    m_bpButtonRemovePair->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnRemoveTopFolderPair ), NULL, this );
-    m_dirPickerLeft->Connect( wxEVT_COMMAND_DIRPICKER_CHANGED, wxFileDirPickerEventHandler( MainDialogGenerated::OnDirSelected ), NULL, this );
-    m_bpButtonSwapSides->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSwapSides ), NULL, this );
-    m_dirPickerRight->Connect( wxEVT_COMMAND_DIRPICKER_CHANGED, wxFileDirPickerEventHandler( MainDialogGenerated::OnDirSelected ), NULL, this );
-    m_gridLeft->Connect( wxEVT_GRID_CELL_LEFT_DCLICK, wxGridEventHandler( MainDialogGenerated::OnLeftGridDoubleClick ), NULL, this );
-    m_gridLeft->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRim ), NULL, this );
-    m_gridLeft->Connect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( MainDialogGenerated::OnSortLeftGrid ), NULL, this );
-    m_gridLeft->Connect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRimLabelLeft ), NULL, this );
-    m_gridMiddle->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextMiddle ), NULL, this );
-    m_gridMiddle->Connect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( MainDialogGenerated::OnSortMiddleGrid ), NULL, this );
-    m_gridMiddle->Connect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextMiddleLabel ), NULL, this );
-    m_gridRight->Connect( wxEVT_GRID_CELL_LEFT_DCLICK, wxGridEventHandler( MainDialogGenerated::OnRightGridDoubleClick ), NULL, this );
-    m_gridRight->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRim ), NULL, this );
-    m_gridRight->Connect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( MainDialogGenerated::OnSortRightGrid ), NULL, this );
-    m_gridRight->Connect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRimLabelRight ), NULL, this );
-    m_bpButtonSave->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSaveConfig ), NULL, this );
-    m_bpButtonLoad->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnLoadConfig ), NULL, this );
-    m_listBoxHistory->Connect( wxEVT_CHAR, wxKeyEventHandler( MainDialogGenerated::OnCfgHistoryKeyEvent ), NULL, this );
-    m_listBoxHistory->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnLoadFromHistory ), NULL, this );
-    m_bpButtonFilter->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigureFilter ), NULL, this );
-    m_checkBoxHideFilt->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnHideFilteredButton ), NULL, this );
-    m_bpButtonSyncCreateLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncCreateLeft ), NULL, this );
-    m_bpButtonSyncDirOverwLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDirLeft ), NULL, this );
-    m_bpButtonSyncDeleteLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDeleteLeft ), NULL, this );
-    m_bpButtonLeftOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnLeftOnlyFiles ), NULL, this );
-    m_bpButtonLeftNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnLeftNewerFiles ), NULL, this );
-    m_bpButtonEqual->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnEqualFiles ), NULL, this );
-    m_bpButtonDifferent->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnDifferentFiles ), NULL, this );
-    m_bpButtonSyncDirNone->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDirNone ), NULL, this );
-    m_bpButtonRightNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnRightNewerFiles ), NULL, this );
-    m_bpButtonRightOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnRightOnlyFiles ), NULL, this );
-    m_bpButtonSyncDeleteRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDeleteRight ), NULL, this );
-    m_bpButtonSyncDirOverwRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDirRight ), NULL, this );
-    m_bpButtonSyncCreateRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncCreateRight ), NULL, this );
-    m_bpButtonConflict->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConflictFiles ), NULL, this );
+	this->SetSizeHints( wxSize( 640,400 ), wxDefaultSize );
+	
+	m_menubar1 = new wxMenuBar( 0 );
+	m_menuFile = new wxMenu();
+	m_menuItem10 = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("1. &Compare") ) + wxT('\t') + wxT("F5"), wxEmptyString, wxITEM_NORMAL );
+	m_menuFile->Append( m_menuItem10 );
+	
+	m_menuItem11 = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("2. &Synchronize...") ) + wxT('\t') + wxT("F6"), wxEmptyString, wxITEM_NORMAL );
+	m_menuFile->Append( m_menuItem11 );
+	
+	wxMenuItem* m_separator1;
+	m_separator1 = m_menuFile->AppendSeparator();
+	
+	m_menuItemSwitchView = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("S&witch view") ) + wxT('\t') + wxT("F8"), wxEmptyString, wxITEM_NORMAL );
+	m_menuFile->Append( m_menuItemSwitchView );
+	
+	wxMenuItem* m_separator2;
+	m_separator2 = m_menuFile->AppendSeparator();
+	
+	m_menuItemNew = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("&New") ) + wxT('\t') + wxT("Ctrl-N"), wxEmptyString, wxITEM_NORMAL );
+	m_menuFile->Append( m_menuItemNew );
+	
+	m_menuItemSave = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("S&ave configuration...") ) + wxT('\t') + wxT("Ctrl-S"), wxEmptyString, wxITEM_NORMAL );
+	m_menuFile->Append( m_menuItemSave );
+	
+	m_menuItemLoad = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("&Load configuration...") ) + wxT('\t') + wxT("Ctrl-O"), wxEmptyString, wxITEM_NORMAL );
+	m_menuFile->Append( m_menuItemLoad );
+	
+	wxMenuItem* m_separator3;
+	m_separator3 = m_menuFile->AppendSeparator();
+	
+	wxMenuItem* m_menuItem4;
+	m_menuItem4 = new wxMenuItem( m_menuFile, wxID_EXIT, wxString( _("&Quit") ) + wxT('\t') + wxT("Ctrl-Q"), wxEmptyString, wxITEM_NORMAL );
+	m_menuFile->Append( m_menuItem4 );
+	
+	m_menubar1->Append( m_menuFile, _("&Program") ); 
+	
+	m_menuAdvanced = new wxMenu();
+	m_menuLanguages = new wxMenu();
+	m_menuAdvanced->Append( -1, _("&Language"), m_menuLanguages );
+	
+	wxMenuItem* m_separator4;
+	m_separator4 = m_menuAdvanced->AppendSeparator();
+	
+	m_menuItemGlobSett = new wxMenuItem( m_menuAdvanced, wxID_ANY, wxString( _("&Global settings...") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuAdvanced->Append( m_menuItemGlobSett );
+	
+	m_menuItem7 = new wxMenuItem( m_menuAdvanced, wxID_ANY, wxString( _("&Create batch job...") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuAdvanced->Append( m_menuItem7 );
+	
+	wxMenuItem* m_menuItem5;
+	m_menuItem5 = new wxMenuItem( m_menuAdvanced, wxID_ANY, wxString( _("&Export file list...") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuAdvanced->Append( m_menuItem5 );
+	
+	m_menubar1->Append( m_menuAdvanced, _("&Advanced") ); 
+	
+	m_menuHelp = new wxMenu();
+	wxMenuItem* m_menuItemReadme;
+	m_menuItemReadme = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("&Content") ) + wxT('\t') + wxT("F1"), wxEmptyString, wxITEM_NORMAL );
+	m_menuHelp->Append( m_menuItemReadme );
+	
+	m_menuItemCheckVer = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("&Check for new version") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuHelp->Append( m_menuItemCheckVer );
+	
+	wxMenuItem* m_separator5;
+	m_separator5 = m_menuHelp->AppendSeparator();
+	
+	m_menuItemAbout = new wxMenuItem( m_menuHelp, wxID_ABOUT, wxString( _("&About...") ) + wxT('\t') + wxT("Shift-F1"), wxEmptyString, wxITEM_NORMAL );
+	m_menuHelp->Append( m_menuItemAbout );
+	
+	m_menubar1->Append( m_menuHelp, _("&Help") ); 
+	
+	this->SetMenuBar( m_menubar1 );
+	
+	bSizerPanelHolder = new wxBoxSizer( wxVERTICAL );
+	
+	m_panelTopButtons = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxRAISED_BORDER|wxTAB_TRAVERSAL );
+	bSizerTopButtons = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxBoxSizer* bSizer155;
+	bSizer155 = new wxBoxSizer( wxHORIZONTAL );
+	
+	
+	bSizer155->Add( 15, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	wxFlexGridSizer* fgSizer121;
+	fgSizer121 = new wxFlexGridSizer( 2, 2, 0, 0 );
+	fgSizer121->SetFlexibleDirection( wxBOTH );
+	fgSizer121->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	
+	m_staticTextCmpVariant = new wxStaticText( m_panelTopButtons, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextCmpVariant->Wrap( -1 );
+	m_staticTextCmpVariant->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
+	m_staticTextCmpVariant->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	
+	fgSizer121->Add( m_staticTextCmpVariant, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxTOP, 1 );
+	
+	
+	fgSizer121->Add( 0, 0, 1, 0, 5 );
+	
+	wxBoxSizer* bSizer30;
+	bSizer30 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_buttonCompare = new zen::BitmapButton( m_panelTopButtons, wxID_OK, _("Compare"), wxDefaultPosition, wxSize( 180,42 ), 0 );
+	m_buttonCompare->SetDefault(); 
+	m_buttonCompare->SetFont( wxFont( 14, 74, 90, 92, false, wxEmptyString ) );
+	m_buttonCompare->SetToolTip( _("Compare both sides") );
+	
+	bSizer30->Add( m_buttonCompare, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_buttonAbort = new wxButton( m_panelTopButtons, wxID_CANCEL, _("&Abort"), wxDefaultPosition, wxSize( 180,42 ), 0 );
+	m_buttonAbort->SetFont( wxFont( 14, 74, 90, 92, false, wxEmptyString ) );
+	m_buttonAbort->Enable( false );
+	m_buttonAbort->Hide();
+	
+	bSizer30->Add( m_buttonAbort, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	fgSizer121->Add( bSizer30, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_bpButtonCmpConfig = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,42 ), wxBU_AUTODRAW );
+	m_bpButtonCmpConfig->SetToolTip( _("Comparison settings") );
+	
+	fgSizer121->Add( m_bpButtonCmpConfig, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 3 );
+	
+	bSizer155->Add( fgSizer121, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 );
+	
+	bSizerTopButtons->Add( bSizer155, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizerTopButtons->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	wxBoxSizer* bSizer1551;
+	bSizer1551 = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxFlexGridSizer* fgSizer12;
+	fgSizer12 = new wxFlexGridSizer( 2, 2, 0, 0 );
+	fgSizer12->SetFlexibleDirection( wxBOTH );
+	fgSizer12->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	
+	
+	fgSizer12->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	m_staticTextSyncVariant = new wxStaticText( m_panelTopButtons, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextSyncVariant->Wrap( -1 );
+	m_staticTextSyncVariant->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
+	m_staticTextSyncVariant->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	
+	fgSizer12->Add( m_staticTextSyncVariant, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP, 1 );
+	
+	m_bpButtonSyncConfig = new wxBitmapButton( m_panelTopButtons, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,42 ), wxBU_AUTODRAW );
+	m_bpButtonSyncConfig->SetToolTip( _("Synchronization settings") );
+	
+	fgSizer12->Add( m_bpButtonSyncConfig, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 3 );
+	
+	m_buttonStartSync = new zen::BitmapButton( m_panelTopButtons, wxID_ANY, _("Synchronize..."), wxDefaultPosition, wxSize( 180,42 ), 0 );
+	m_buttonStartSync->SetFont( wxFont( 14, 74, 90, 92, false, wxEmptyString ) );
+	m_buttonStartSync->SetToolTip( _("Start synchronization") );
+	
+	fgSizer12->Add( m_buttonStartSync, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizer1551->Add( fgSizer12, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 );
+	
+	
+	bSizer1551->Add( 15, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizerTopButtons->Add( bSizer1551, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_panelTopButtons->SetSizer( bSizerTopButtons );
+	m_panelTopButtons->Layout();
+	bSizerTopButtons->Fit( m_panelTopButtons );
+	bSizerPanelHolder->Add( m_panelTopButtons, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+	
+	m_panelDirectoryPairs = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer1601;
+	bSizer1601 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer91;
+	bSizer91 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_panelTopLeft = new wxPanel( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelTopLeft->SetMinSize( wxSize( 1,1 ) );
+	
+	sbSizerDirLeft = new wxStaticBoxSizer( new wxStaticBox( m_panelTopLeft, wxID_ANY, _("Drag && drop") ), wxHORIZONTAL );
+	
+	m_bpButtonAddPair = new wxBitmapButton( m_panelTopLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
+	m_bpButtonAddPair->SetToolTip( _("Add folder pair") );
+	
+	sbSizerDirLeft->Add( m_bpButtonAddPair, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 3 );
+	
+	m_bpButtonRemovePair = new wxBitmapButton( m_panelTopLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
+	m_bpButtonRemovePair->SetToolTip( _("Remove folder pair") );
+	
+	sbSizerDirLeft->Add( m_bpButtonRemovePair, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_directoryLeft = new FolderHistoryBox( m_panelTopLeft, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
+	sbSizerDirLeft->Add( m_directoryLeft, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_dirPickerLeft = new zen::DirPickerCtrl( m_panelTopLeft, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_dirPickerLeft->SetToolTip( _("Select a folder") );
+	
+	sbSizerDirLeft->Add( m_dirPickerLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_panelTopLeft->SetSizer( sbSizerDirLeft );
+	m_panelTopLeft->Layout();
+	sbSizerDirLeft->Fit( m_panelTopLeft );
+	bSizer91->Add( m_panelTopLeft, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_panelTopMiddle = new wxPanel( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer93;
+	bSizer93 = new wxBoxSizer( wxVERTICAL );
+	
+	
+	bSizer93->Add( 0, 3, 0, 0, 5 );
+	
+	m_bpButtonSwapSides = new wxBitmapButton( m_panelTopMiddle, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+	m_bpButtonSwapSides->SetToolTip( _("Swap sides") );
+	
+	bSizer93->Add( m_bpButtonSwapSides, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer160;
+	bSizer160 = new wxBoxSizer( wxHORIZONTAL );
+	
+	
+	bSizer160->Add( 0, 0, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_bpButtonAltCompCfg = new wxBitmapButton( m_panelTopMiddle, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
+	bSizer160->Add( m_bpButtonAltCompCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_bpButtonLocalFilter = new wxBitmapButton( m_panelTopMiddle, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
+	bSizer160->Add( m_bpButtonLocalFilter, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 3 );
+	
+	m_bpButtonAltSyncCfg = new wxBitmapButton( m_panelTopMiddle, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
+	bSizer160->Add( m_bpButtonAltSyncCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizer160->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	bSizer93->Add( bSizer160, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_panelTopMiddle->SetSizer( bSizer93 );
+	m_panelTopMiddle->Layout();
+	bSizer93->Fit( m_panelTopMiddle );
+	bSizer91->Add( m_panelTopMiddle, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	
+	m_panelTopRight = new wxPanel( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelTopRight->SetMinSize( wxSize( 1,1 ) );
+	
+	sbSizerDirRight = new wxStaticBoxSizer( new wxStaticBox( m_panelTopRight, wxID_ANY, _("Drag && drop") ), wxHORIZONTAL );
+	
+	m_directoryRight = new FolderHistoryBox( m_panelTopRight, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
+	sbSizerDirRight->Add( m_directoryRight, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_dirPickerRight = new zen::DirPickerCtrl( m_panelTopRight, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_dirPickerRight->SetToolTip( _("Select a folder") );
+	
+	sbSizerDirRight->Add( m_dirPickerRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_panelTopRight->SetSizer( sbSizerDirRight );
+	m_panelTopRight->Layout();
+	sbSizerDirRight->Fit( m_panelTopRight );
+	bSizer91->Add( m_panelTopRight, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	
+	bSizer1601->Add( bSizer91, 0, wxEXPAND, 5 );
+	
+	m_scrolledWindowFolderPairs = new wxScrolledWindow( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxHSCROLL|wxVSCROLL );
+	m_scrolledWindowFolderPairs->SetScrollRate( 5, 5 );
+	m_scrolledWindowFolderPairs->SetMinSize( wxSize( -1,0 ) );
+	
+	bSizerAddFolderPairs = new wxBoxSizer( wxVERTICAL );
+	
+	m_scrolledWindowFolderPairs->SetSizer( bSizerAddFolderPairs );
+	m_scrolledWindowFolderPairs->Layout();
+	bSizerAddFolderPairs->Fit( m_scrolledWindowFolderPairs );
+	bSizer1601->Add( m_scrolledWindowFolderPairs, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	
+	m_panelDirectoryPairs->SetSizer( bSizer1601 );
+	m_panelDirectoryPairs->Layout();
+	bSizer1601->Fit( m_panelDirectoryPairs );
+	bSizerPanelHolder->Add( m_panelDirectoryPairs, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+	
+	m_panelGrids = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelGrids->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_APPWORKSPACE ) );
+	
+	bSizerGridHolder = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_panelLeft = new wxPanel( m_panelGrids, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer7;
+	bSizer7 = new wxBoxSizer( wxVERTICAL );
+	
+	m_gridLeft = new CustomGridLeft( m_panelLeft, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	
+	// Grid
+	m_gridLeft->CreateGrid( 15, 4 );
+	m_gridLeft->EnableEditing( false );
+	m_gridLeft->EnableGridLines( true );
+	m_gridLeft->EnableDragGridSize( true );
+	m_gridLeft->SetMargins( 0, 0 );
+	
+	// Columns
+	m_gridLeft->EnableDragColMove( false );
+	m_gridLeft->EnableDragColSize( true );
+	m_gridLeft->SetColLabelSize( 20 );
+	m_gridLeft->SetColLabelAlignment( wxALIGN_LEFT, wxALIGN_CENTRE );
+	
+	// Rows
+	m_gridLeft->EnableDragRowSize( false );
+	m_gridLeft->SetRowLabelSize( 38 );
+	m_gridLeft->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
+	
+	// Label Appearance
+	
+	// Cell Defaults
+	m_gridLeft->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTRE );
+	m_gridLeft->SetMinSize( wxSize( 1,1 ) );
+	
+	bSizer7->Add( m_gridLeft, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	
+	m_panelLeft->SetSizer( bSizer7 );
+	m_panelLeft->Layout();
+	bSizer7->Fit( m_panelLeft );
+	bSizerGridHolder->Add( m_panelLeft, 1, wxEXPAND, 5 );
+	
+	m_panelMiddle = new wxPanel( m_panelGrids, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer18;
+	bSizer18 = new wxBoxSizer( wxVERTICAL );
+	
+	m_gridMiddle = new CustomGridMiddle( m_panelMiddle, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	
+	// Grid
+	m_gridMiddle->CreateGrid( 15, 1 );
+	m_gridMiddle->EnableEditing( false );
+	m_gridMiddle->EnableGridLines( true );
+	m_gridMiddle->EnableDragGridSize( false );
+	m_gridMiddle->SetMargins( 0, 0 );
+	
+	// Columns
+	m_gridMiddle->SetColSize( 0, 60 );
+	m_gridMiddle->EnableDragColMove( false );
+	m_gridMiddle->EnableDragColSize( false );
+	m_gridMiddle->SetColLabelSize( 20 );
+	m_gridMiddle->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
+	
+	// Rows
+	m_gridMiddle->EnableDragRowSize( false );
+	m_gridMiddle->SetRowLabelSize( 0 );
+	m_gridMiddle->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
+	
+	// Label Appearance
+	
+	// Cell Defaults
+	m_gridMiddle->SetDefaultCellFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 90, false, wxT("Arial") ) );
+	m_gridMiddle->SetDefaultCellAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
+	bSizer18->Add( m_gridMiddle, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
+	
+	m_panelMiddle->SetSizer( bSizer18 );
+	m_panelMiddle->Layout();
+	bSizer18->Fit( m_panelMiddle );
+	bSizerGridHolder->Add( m_panelMiddle, 0, wxEXPAND, 5 );
+	
+	m_panelRight = new wxPanel( m_panelGrids, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer10;
+	bSizer10 = new wxBoxSizer( wxVERTICAL );
+	
+	m_gridRight = new CustomGridRight( m_panelRight, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	
+	// Grid
+	m_gridRight->CreateGrid( 15, 4 );
+	m_gridRight->EnableEditing( false );
+	m_gridRight->EnableGridLines( true );
+	m_gridRight->EnableDragGridSize( true );
+	m_gridRight->SetMargins( 0, 0 );
+	
+	// Columns
+	m_gridRight->EnableDragColMove( false );
+	m_gridRight->EnableDragColSize( true );
+	m_gridRight->SetColLabelSize( 20 );
+	m_gridRight->SetColLabelAlignment( wxALIGN_LEFT, wxALIGN_CENTRE );
+	
+	// Rows
+	m_gridRight->EnableDragRowSize( false );
+	m_gridRight->SetRowLabelSize( 38 );
+	m_gridRight->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
+	
+	// Label Appearance
+	
+	// Cell Defaults
+	m_gridRight->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTRE );
+	m_gridRight->SetMinSize( wxSize( 1,1 ) );
+	
+	bSizer10->Add( m_gridRight, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	
+	m_panelRight->SetSizer( bSizer10 );
+	m_panelRight->Layout();
+	bSizer10->Fit( m_panelRight );
+	bSizerGridHolder->Add( m_panelRight, 1, wxEXPAND, 5 );
+	
+	m_panelGrids->SetSizer( bSizerGridHolder );
+	m_panelGrids->Layout();
+	bSizerGridHolder->Fit( m_panelGrids );
+	bSizerPanelHolder->Add( m_panelGrids, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+	
+	m_panelConfig = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	bSizerConfig = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxBoxSizer* bSizer151;
+	bSizer151 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bpButtonSave = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+	m_bpButtonSave->SetToolTip( _("Save current configuration to file") );
+	
+	bSizer151->Add( m_bpButtonSave, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_bpButtonLoad = new wxBitmapButton( m_panelConfig, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+	m_bpButtonLoad->SetToolTip( _("Load configuration from file") );
+	
+	bSizer151->Add( m_bpButtonLoad, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizerConfig->Add( bSizer151, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_listBoxHistory = new wxListBox( m_panelConfig, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_EXTENDED|wxLB_NEEDED_SB|wxLB_SORT ); 
+	m_listBoxHistory->SetToolTip( _("Last used configurations (press DEL to remove from list)") );
+	m_listBoxHistory->SetMinSize( wxSize( -1,40 ) );
+	
+	bSizerConfig->Add( m_listBoxHistory, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_panelConfig->SetSizer( bSizerConfig );
+	m_panelConfig->Layout();
+	bSizerConfig->Fit( m_panelConfig );
+	bSizerPanelHolder->Add( m_panelConfig, 0, 0, 5 );
+	
+	m_panelFilter = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer171;
+	bSizer171 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bpButtonFilter = new wxBitmapButton( m_panelFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW|wxFULL_REPAINT_ON_RESIZE );
+	bSizer171->Add( m_bpButtonFilter, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	
+	m_checkBoxHideFilt = new wxCheckBox( m_panelFilter, wxID_ANY, _("Hide excluded items"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_checkBoxHideFilt->SetToolTip( _("Hide filtered or temporarily excluded files") );
+	
+	bSizer171->Add( m_checkBoxHideFilt, 0, wxALIGN_CENTER_VERTICAL, 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 );
+	bSizerStatistics = new wxBoxSizer( wxHORIZONTAL );
+	
+	
+	bSizerStatistics->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	wxFlexGridSizer* fgSizer5;
+	fgSizer5 = new wxFlexGridSizer( 2, 2, 0, 5 );
+	fgSizer5->SetFlexibleDirection( wxHORIZONTAL );
+	fgSizer5->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	
+	m_bitmapCreate = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	m_bitmapCreate->SetToolTip( _("Number of files and directories that will be created") );
+	
+	fgSizer5->Add( m_bitmapCreate, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_textCtrlCreate = new wxTextCtrl( m_panelStatistics, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY|wxTE_RIGHT );
+	m_textCtrlCreate->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
+	m_textCtrlCreate->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+	m_textCtrlCreate->SetToolTip( _("Number of files and directories that will be created") );
+	
+	fgSizer5->Add( m_textCtrlCreate, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_bitmapUpdate = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	m_bitmapUpdate->SetToolTip( _("Number of files that will be overwritten") );
+	
+	fgSizer5->Add( m_bitmapUpdate, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_textCtrlUpdate = new wxTextCtrl( m_panelStatistics, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY|wxTE_RIGHT );
+	m_textCtrlUpdate->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
+	m_textCtrlUpdate->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+	m_textCtrlUpdate->SetToolTip( _("Number of files that will be overwritten") );
+	
+	fgSizer5->Add( m_textCtrlUpdate, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizerStatistics->Add( fgSizer5, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
+	
+	wxFlexGridSizer* fgSizer6;
+	fgSizer6 = new wxFlexGridSizer( 2, 2, 0, 5 );
+	fgSizer6->SetFlexibleDirection( wxHORIZONTAL );
+	fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	
+	m_bitmapDelete = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	m_bitmapDelete->SetToolTip( _("Number of files and directories that will be deleted") );
+	
+	fgSizer6->Add( m_bitmapDelete, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_textCtrlDelete = new wxTextCtrl( m_panelStatistics, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY|wxTE_RIGHT );
+	m_textCtrlDelete->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
+	m_textCtrlDelete->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+	m_textCtrlDelete->SetToolTip( _("Number of files and directories that will be deleted") );
+	
+	fgSizer6->Add( m_textCtrlDelete, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_bitmapData = new wxStaticBitmap( m_panelStatistics, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	m_bitmapData->SetToolTip( _("Total amount of data that will be transferred") );
+	
+	fgSizer6->Add( m_bitmapData, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_textCtrlData = new wxTextCtrl( m_panelStatistics, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY|wxTE_RIGHT );
+	m_textCtrlData->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
+	m_textCtrlData->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+	m_textCtrlData->SetToolTip( _("Total amount of data that will be transferred") );
+	
+	fgSizer6->Add( m_textCtrlData, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizerStatistics->Add( fgSizer6, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
+	
+	
+	bSizerStatistics->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	m_panelStatistics->SetSizer( bSizerStatistics );
+	m_panelStatistics->Layout();
+	bSizerStatistics->Fit( m_panelStatistics );
+	bSizerPanelHolder->Add( m_panelStatistics, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_panelViewFilter = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	bSizerViewFilter = new wxBoxSizer( wxHORIZONTAL );
+	
+	
+	bSizerViewFilter->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	m_bpButtonSyncCreateLeft = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+	bSizerViewFilter->Add( m_bpButtonSyncCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_bpButtonSyncDirOverwLeft = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+	bSizerViewFilter->Add( m_bpButtonSyncDirOverwLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_bpButtonSyncDeleteLeft = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+	bSizerViewFilter->Add( m_bpButtonSyncDeleteLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_bpButtonLeftOnly = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+	bSizerViewFilter->Add( m_bpButtonLeftOnly, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_bpButtonLeftNewer = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+	bSizerViewFilter->Add( m_bpButtonLeftNewer, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_bpButtonEqual = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+	bSizerViewFilter->Add( m_bpButtonEqual, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_bpButtonDifferent = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+	bSizerViewFilter->Add( m_bpButtonDifferent, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_bpButtonSyncDirNone = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+	bSizerViewFilter->Add( m_bpButtonSyncDirNone, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_bpButtonRightNewer = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+	bSizerViewFilter->Add( m_bpButtonRightNewer, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_bpButtonRightOnly = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+	bSizerViewFilter->Add( m_bpButtonRightOnly, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_bpButtonSyncDeleteRight = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+	bSizerViewFilter->Add( m_bpButtonSyncDeleteRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_bpButtonSyncDirOverwRight = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+	bSizerViewFilter->Add( m_bpButtonSyncDirOverwRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_bpButtonSyncCreateRight = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+	bSizerViewFilter->Add( m_bpButtonSyncCreateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_bpButtonConflict = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+	bSizerViewFilter->Add( m_bpButtonConflict, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	
+	bSizerViewFilter->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	m_panelViewFilter->SetSizer( bSizerViewFilter );
+	m_panelViewFilter->Layout();
+	bSizerViewFilter->Fit( m_panelViewFilter );
+	bSizerPanelHolder->Add( m_panelViewFilter, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_panelStatusBar = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSTATIC_BORDER|wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer451;
+	bSizer451 = new wxBoxSizer( wxHORIZONTAL );
+	
+	bSizer451->SetMinSize( wxSize( -1,22 ) ); 
+	wxBoxSizer* bSizer53;
+	bSizer53 = new wxBoxSizer( wxHORIZONTAL );
+	
+	
+	bSizer53->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_staticTextStatusLeft = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextStatusLeft->Wrap( -1 );
+	m_staticTextStatusLeft->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
+	
+	bSizer53->Add( m_staticTextStatusLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	
+	bSizer53->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizer451->Add( bSizer53, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	
+	m_staticline9 = new wxStaticLine( m_panelStatusBar, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer451->Add( m_staticline9, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxEXPAND, 2 );
+	
+	
+	bSizer451->Add( 26, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_staticTextStatusMiddle = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextStatusMiddle->Wrap( -1 );
+	m_staticTextStatusMiddle->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
+	
+	bSizer451->Add( m_staticTextStatusMiddle, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	
+	bSizer451->Add( 26, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_staticline10 = new wxStaticLine( m_panelStatusBar, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer451->Add( m_staticline10, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP, 2 );
+	
+	wxBoxSizer* bSizer52;
+	bSizer52 = new wxBoxSizer( wxHORIZONTAL );
+	
+	
+	bSizer52->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_staticTextStatusRight = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextStatusRight->Wrap( -1 );
+	m_staticTextStatusRight->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
+	
+	bSizer52->Add( m_staticTextStatusRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	wxBoxSizer* bSizer50;
+	bSizer50 = new wxBoxSizer( wxHORIZONTAL );
+	
+	
+	bSizer50->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_bitmap15 = new wxStaticBitmap( m_panelStatusBar, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 10,10 ), 0 );
+	bSizer50->Add( m_bitmap15, 0, wxALIGN_BOTTOM, 2 );
+	
+	bSizer52->Add( bSizer50, 1, wxALIGN_BOTTOM|wxEXPAND, 5 );
+	
+	bSizer451->Add( bSizer52, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_panelStatusBar->SetSizer( bSizer451 );
+	m_panelStatusBar->Layout();
+	bSizer451->Fit( m_panelStatusBar );
+	bSizerPanelHolder->Add( m_panelStatusBar, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+	
+	this->SetSizer( bSizerPanelHolder );
+	this->Layout();
+	bSizerPanelHolder->Fit( this );
+	
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainDialogGenerated::OnClose ) );
+	this->Connect( m_menuItem10->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnCompare ) );
+	this->Connect( m_menuItem11->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnStartSync ) );
+	this->Connect( m_menuItemSwitchView->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnSwitchView ) );
+	this->Connect( m_menuItemNew->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnNewConfig ) );
+	this->Connect( m_menuItemSave->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnSaveConfig ) );
+	this->Connect( m_menuItemLoad->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnLoadConfig ) );
+	this->Connect( m_menuItem4->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuQuit ) );
+	this->Connect( m_menuItemGlobSett->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuGlobalSettings ) );
+	this->Connect( m_menuItem7->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuBatchJob ) );
+	this->Connect( m_menuItem5->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuExportFileList ) );
+	this->Connect( m_menuItemReadme->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnShowHelp ) );
+	this->Connect( m_menuItemCheckVer->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuCheckVersion ) );
+	this->Connect( m_menuItemAbout->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuAbout ) );
+	m_buttonCompare->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnCompare ), NULL, this );
+	m_bpButtonCmpConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnCmpSettings ), NULL, this );
+	m_bpButtonSyncConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncSettings ), NULL, this );
+	m_buttonStartSync->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnStartSync ), NULL, this );
+	m_bpButtonAddPair->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnAddFolderPair ), NULL, this );
+	m_bpButtonRemovePair->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnRemoveTopFolderPair ), NULL, this );
+	m_dirPickerLeft->Connect( wxEVT_COMMAND_DIRPICKER_CHANGED, wxFileDirPickerEventHandler( MainDialogGenerated::OnDirSelected ), NULL, this );
+	m_bpButtonSwapSides->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSwapSides ), NULL, this );
+	m_dirPickerRight->Connect( wxEVT_COMMAND_DIRPICKER_CHANGED, wxFileDirPickerEventHandler( MainDialogGenerated::OnDirSelected ), NULL, this );
+	m_gridLeft->Connect( wxEVT_GRID_CELL_LEFT_DCLICK, wxGridEventHandler( MainDialogGenerated::OnLeftGridDoubleClick ), NULL, this );
+	m_gridLeft->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRim ), NULL, this );
+	m_gridLeft->Connect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( MainDialogGenerated::OnSortLeftGrid ), NULL, this );
+	m_gridLeft->Connect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRimLabelLeft ), NULL, this );
+	m_gridMiddle->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextMiddle ), NULL, this );
+	m_gridMiddle->Connect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( MainDialogGenerated::OnSortMiddleGrid ), NULL, this );
+	m_gridMiddle->Connect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextMiddleLabel ), NULL, this );
+	m_gridRight->Connect( wxEVT_GRID_CELL_LEFT_DCLICK, wxGridEventHandler( MainDialogGenerated::OnRightGridDoubleClick ), NULL, this );
+	m_gridRight->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRim ), NULL, this );
+	m_gridRight->Connect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( MainDialogGenerated::OnSortRightGrid ), NULL, this );
+	m_gridRight->Connect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRimLabelRight ), NULL, this );
+	m_bpButtonSave->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSaveConfig ), NULL, this );
+	m_bpButtonLoad->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnLoadConfig ), NULL, this );
+	m_listBoxHistory->Connect( wxEVT_CHAR, wxKeyEventHandler( MainDialogGenerated::OnCfgHistoryKeyEvent ), NULL, this );
+	m_listBoxHistory->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnLoadFromHistory ), NULL, this );
+	m_bpButtonFilter->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigureFilter ), NULL, this );
+	m_checkBoxHideFilt->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnHideFilteredButton ), NULL, this );
+	m_bpButtonSyncCreateLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncCreateLeft ), NULL, this );
+	m_bpButtonSyncDirOverwLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDirLeft ), NULL, this );
+	m_bpButtonSyncDeleteLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDeleteLeft ), NULL, this );
+	m_bpButtonLeftOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnLeftOnlyFiles ), NULL, this );
+	m_bpButtonLeftNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnLeftNewerFiles ), NULL, this );
+	m_bpButtonEqual->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnEqualFiles ), NULL, this );
+	m_bpButtonDifferent->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnDifferentFiles ), NULL, this );
+	m_bpButtonSyncDirNone->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDirNone ), NULL, this );
+	m_bpButtonRightNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnRightNewerFiles ), NULL, this );
+	m_bpButtonRightOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnRightOnlyFiles ), NULL, this );
+	m_bpButtonSyncDeleteRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDeleteRight ), NULL, this );
+	m_bpButtonSyncDirOverwRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDirRight ), NULL, this );
+	m_bpButtonSyncCreateRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncCreateRight ), NULL, this );
+	m_bpButtonConflict->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConflictFiles ), NULL, this );
 }
 
 MainDialogGenerated::~MainDialogGenerated()
 {
-    // Disconnect Events
-    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainDialogGenerated::OnClose ) );
-    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnCompare ) );
-    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnStartSync ) );
-    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnSwitchView ) );
-    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnNewConfig ) );
-    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnSaveConfig ) );
-    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnLoadConfig ) );
-    this->Disconnect( wxID_EXIT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuQuit ) );
-    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuGlobalSettings ) );
-    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuBatchJob ) );
-    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuExportFileList ) );
-    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnShowHelp ) );
-    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuCheckVersion ) );
-    this->Disconnect( wxID_ABOUT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuAbout ) );
-    m_buttonCompare->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnCompare ), NULL, this );
-    m_bpButtonCmpConfig->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnCmpSettings ), NULL, this );
-    m_bpButtonSyncConfig->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncSettings ), NULL, this );
-    m_buttonStartSync->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnStartSync ), NULL, this );
-    m_bpButtonAddPair->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnAddFolderPair ), NULL, this );
-    m_bpButtonRemovePair->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnRemoveTopFolderPair ), NULL, this );
-    m_dirPickerLeft->Disconnect( wxEVT_COMMAND_DIRPICKER_CHANGED, wxFileDirPickerEventHandler( MainDialogGenerated::OnDirSelected ), NULL, this );
-    m_bpButtonSwapSides->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSwapSides ), NULL, this );
-    m_dirPickerRight->Disconnect( wxEVT_COMMAND_DIRPICKER_CHANGED, wxFileDirPickerEventHandler( MainDialogGenerated::OnDirSelected ), NULL, this );
-    m_gridLeft->Disconnect( wxEVT_GRID_CELL_LEFT_DCLICK, wxGridEventHandler( MainDialogGenerated::OnLeftGridDoubleClick ), NULL, this );
-    m_gridLeft->Disconnect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRim ), NULL, this );
-    m_gridLeft->Disconnect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( MainDialogGenerated::OnSortLeftGrid ), NULL, this );
-    m_gridLeft->Disconnect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRimLabelLeft ), NULL, this );
-    m_gridMiddle->Disconnect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextMiddle ), NULL, this );
-    m_gridMiddle->Disconnect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( MainDialogGenerated::OnSortMiddleGrid ), NULL, this );
-    m_gridMiddle->Disconnect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextMiddleLabel ), NULL, this );
-    m_gridRight->Disconnect( wxEVT_GRID_CELL_LEFT_DCLICK, wxGridEventHandler( MainDialogGenerated::OnRightGridDoubleClick ), NULL, this );
-    m_gridRight->Disconnect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRim ), NULL, this );
-    m_gridRight->Disconnect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( MainDialogGenerated::OnSortRightGrid ), NULL, this );
-    m_gridRight->Disconnect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRimLabelRight ), NULL, this );
-    m_bpButtonSave->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSaveConfig ), NULL, this );
-    m_bpButtonLoad->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnLoadConfig ), NULL, this );
-    m_listBoxHistory->Disconnect( wxEVT_CHAR, wxKeyEventHandler( MainDialogGenerated::OnCfgHistoryKeyEvent ), NULL, this );
-    m_listBoxHistory->Disconnect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnLoadFromHistory ), NULL, this );
-    m_bpButtonFilter->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigureFilter ), NULL, this );
-    m_checkBoxHideFilt->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnHideFilteredButton ), NULL, this );
-    m_bpButtonSyncCreateLeft->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncCreateLeft ), NULL, this );
-    m_bpButtonSyncDirOverwLeft->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDirLeft ), NULL, this );
-    m_bpButtonSyncDeleteLeft->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDeleteLeft ), NULL, this );
-    m_bpButtonLeftOnly->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnLeftOnlyFiles ), NULL, this );
-    m_bpButtonLeftNewer->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnLeftNewerFiles ), NULL, this );
-    m_bpButtonEqual->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnEqualFiles ), NULL, this );
-    m_bpButtonDifferent->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnDifferentFiles ), NULL, this );
-    m_bpButtonSyncDirNone->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDirNone ), NULL, this );
-    m_bpButtonRightNewer->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnRightNewerFiles ), NULL, this );
-    m_bpButtonRightOnly->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnRightOnlyFiles ), NULL, this );
-    m_bpButtonSyncDeleteRight->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDeleteRight ), NULL, this );
-    m_bpButtonSyncDirOverwRight->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDirRight ), NULL, this );
-    m_bpButtonSyncCreateRight->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncCreateRight ), NULL, this );
-    m_bpButtonConflict->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConflictFiles ), NULL, this );
-
+	// Disconnect Events
+	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainDialogGenerated::OnClose ) );
+	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnCompare ) );
+	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnStartSync ) );
+	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnSwitchView ) );
+	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnNewConfig ) );
+	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnSaveConfig ) );
+	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnLoadConfig ) );
+	this->Disconnect( wxID_EXIT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuQuit ) );
+	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuGlobalSettings ) );
+	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuBatchJob ) );
+	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuExportFileList ) );
+	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnShowHelp ) );
+	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuCheckVersion ) );
+	this->Disconnect( wxID_ABOUT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuAbout ) );
+	m_buttonCompare->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnCompare ), NULL, this );
+	m_bpButtonCmpConfig->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnCmpSettings ), NULL, this );
+	m_bpButtonSyncConfig->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncSettings ), NULL, this );
+	m_buttonStartSync->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnStartSync ), NULL, this );
+	m_bpButtonAddPair->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnAddFolderPair ), NULL, this );
+	m_bpButtonRemovePair->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnRemoveTopFolderPair ), NULL, this );
+	m_dirPickerLeft->Disconnect( wxEVT_COMMAND_DIRPICKER_CHANGED, wxFileDirPickerEventHandler( MainDialogGenerated::OnDirSelected ), NULL, this );
+	m_bpButtonSwapSides->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSwapSides ), NULL, this );
+	m_dirPickerRight->Disconnect( wxEVT_COMMAND_DIRPICKER_CHANGED, wxFileDirPickerEventHandler( MainDialogGenerated::OnDirSelected ), NULL, this );
+	m_gridLeft->Disconnect( wxEVT_GRID_CELL_LEFT_DCLICK, wxGridEventHandler( MainDialogGenerated::OnLeftGridDoubleClick ), NULL, this );
+	m_gridLeft->Disconnect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRim ), NULL, this );
+	m_gridLeft->Disconnect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( MainDialogGenerated::OnSortLeftGrid ), NULL, this );
+	m_gridLeft->Disconnect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRimLabelLeft ), NULL, this );
+	m_gridMiddle->Disconnect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextMiddle ), NULL, this );
+	m_gridMiddle->Disconnect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( MainDialogGenerated::OnSortMiddleGrid ), NULL, this );
+	m_gridMiddle->Disconnect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextMiddleLabel ), NULL, this );
+	m_gridRight->Disconnect( wxEVT_GRID_CELL_LEFT_DCLICK, wxGridEventHandler( MainDialogGenerated::OnRightGridDoubleClick ), NULL, this );
+	m_gridRight->Disconnect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRim ), NULL, this );
+	m_gridRight->Disconnect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( MainDialogGenerated::OnSortRightGrid ), NULL, this );
+	m_gridRight->Disconnect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRimLabelRight ), NULL, this );
+	m_bpButtonSave->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSaveConfig ), NULL, this );
+	m_bpButtonLoad->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnLoadConfig ), NULL, this );
+	m_listBoxHistory->Disconnect( wxEVT_CHAR, wxKeyEventHandler( MainDialogGenerated::OnCfgHistoryKeyEvent ), NULL, this );
+	m_listBoxHistory->Disconnect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnLoadFromHistory ), NULL, this );
+	m_bpButtonFilter->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigureFilter ), NULL, this );
+	m_checkBoxHideFilt->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnHideFilteredButton ), NULL, this );
+	m_bpButtonSyncCreateLeft->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncCreateLeft ), NULL, this );
+	m_bpButtonSyncDirOverwLeft->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDirLeft ), NULL, this );
+	m_bpButtonSyncDeleteLeft->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDeleteLeft ), NULL, this );
+	m_bpButtonLeftOnly->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnLeftOnlyFiles ), NULL, this );
+	m_bpButtonLeftNewer->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnLeftNewerFiles ), NULL, this );
+	m_bpButtonEqual->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnEqualFiles ), NULL, this );
+	m_bpButtonDifferent->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnDifferentFiles ), NULL, this );
+	m_bpButtonSyncDirNone->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDirNone ), NULL, this );
+	m_bpButtonRightNewer->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnRightNewerFiles ), NULL, this );
+	m_bpButtonRightOnly->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnRightOnlyFiles ), NULL, this );
+	m_bpButtonSyncDeleteRight->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDeleteRight ), NULL, this );
+	m_bpButtonSyncDirOverwRight->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDirRight ), NULL, this );
+	m_bpButtonSyncCreateRight->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncCreateRight ), NULL, this );
+	m_bpButtonConflict->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConflictFiles ), NULL, this );
+	
 }
 
 FolderPairGenerated::FolderPairGenerated( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
 {
-    wxBoxSizer* bSizer74;
-    bSizer74 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_panelLeft = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    wxBoxSizer* bSizer134;
-    bSizer134 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bpButtonRemovePair = new wxBitmapButton( m_panelLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
-    m_bpButtonRemovePair->SetToolTip( _("Remove folder pair") );
-
-    bSizer134->Add( m_bpButtonRemovePair, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-
-    m_directoryLeft = new FolderHistoryBox( m_panelLeft, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
-    bSizer134->Add( m_directoryLeft, 1, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_dirPickerLeft = new FfsDirPickerCtrl( m_panelLeft, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_dirPickerLeft->SetToolTip( _("Select a folder") );
-
-    bSizer134->Add( m_dirPickerLeft, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-
-    m_panelLeft->SetSizer( bSizer134 );
-    m_panelLeft->Layout();
-    bSizer134->Fit( m_panelLeft );
-    bSizer74->Add( m_panelLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_panel20 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    wxBoxSizer* bSizer95;
-    bSizer95 = new wxBoxSizer( wxHORIZONTAL );
-
-
-    bSizer95->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    m_bpButtonAltCompCfg = new wxBitmapButton( m_panel20, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
-    bSizer95->Add( m_bpButtonAltCompCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_bpButtonLocalFilter = new wxBitmapButton( m_panel20, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
-    bSizer95->Add( m_bpButtonLocalFilter, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 3 );
-
-    m_bpButtonAltSyncCfg = new wxBitmapButton( m_panel20, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
-    bSizer95->Add( m_bpButtonAltSyncCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizer95->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    m_panel20->SetSizer( bSizer95 );
-    m_panel20->Layout();
-    bSizer95->Fit( m_panel20 );
-    bSizer74->Add( m_panel20, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-
-    m_panelRight = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    wxBoxSizer* bSizer135;
-    bSizer135 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_directoryRight = new FolderHistoryBox( m_panelRight, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
-    bSizer135->Add( m_directoryRight, 1, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-
-    m_dirPickerRight = new FfsDirPickerCtrl( m_panelRight, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_dirPickerRight->SetToolTip( _("Select a folder") );
-
-    bSizer135->Add( m_dirPickerRight, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-
-    m_panelRight->SetSizer( bSizer135 );
-    m_panelRight->Layout();
-    bSizer135->Fit( m_panelRight );
-    bSizer74->Add( m_panelRight, 1, wxALIGN_CENTER_VERTICAL, 5 );
-
-    this->SetSizer( bSizer74 );
-    this->Layout();
-    bSizer74->Fit( this );
+	wxBoxSizer* bSizer74;
+	bSizer74 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_panelLeft = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer134;
+	bSizer134 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bpButtonRemovePair = new wxBitmapButton( m_panelLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
+	m_bpButtonRemovePair->SetToolTip( _("Remove folder pair") );
+	
+	bSizer134->Add( m_bpButtonRemovePair, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+	
+	m_directoryLeft = new FolderHistoryBox( m_panelLeft, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
+	bSizer134->Add( m_directoryLeft, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_dirPickerLeft = new zen::DirPickerCtrl( m_panelLeft, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_dirPickerLeft->SetToolTip( _("Select a folder") );
+	
+	bSizer134->Add( m_dirPickerLeft, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	
+	m_panelLeft->SetSizer( bSizer134 );
+	m_panelLeft->Layout();
+	bSizer134->Fit( m_panelLeft );
+	bSizer74->Add( m_panelLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_panel20 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer95;
+	bSizer95 = new wxBoxSizer( wxHORIZONTAL );
+	
+	
+	bSizer95->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	m_bpButtonAltCompCfg = new wxBitmapButton( m_panel20, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
+	bSizer95->Add( m_bpButtonAltCompCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_bpButtonLocalFilter = new wxBitmapButton( m_panel20, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
+	bSizer95->Add( m_bpButtonLocalFilter, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 3 );
+	
+	m_bpButtonAltSyncCfg = new wxBitmapButton( m_panel20, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
+	bSizer95->Add( m_bpButtonAltSyncCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizer95->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	m_panel20->SetSizer( bSizer95 );
+	m_panel20->Layout();
+	bSizer95->Fit( m_panel20 );
+	bSizer74->Add( m_panel20, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+	
+	m_panelRight = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer135;
+	bSizer135 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_directoryRight = new FolderHistoryBox( m_panelRight, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
+	bSizer135->Add( m_directoryRight, 1, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+	
+	m_dirPickerRight = new zen::DirPickerCtrl( m_panelRight, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_dirPickerRight->SetToolTip( _("Select a folder") );
+	
+	bSizer135->Add( m_dirPickerRight, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	
+	m_panelRight->SetSizer( bSizer135 );
+	m_panelRight->Layout();
+	bSizer135->Fit( m_panelRight );
+	bSizer74->Add( m_panelRight, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	this->SetSizer( bSizer74 );
+	this->Layout();
+	bSizer74->Fit( this );
 }
 
 FolderPairGenerated::~FolderPairGenerated()
@@ -877,518 +868,520 @@ FolderPairGenerated::~FolderPairGenerated()
 
 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( 560,320 ), wxDefaultSize );
-
-    wxBoxSizer* bSizer54;
-    bSizer54 = new wxBoxSizer( wxVERTICAL );
-
-    bSizer69 = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer87;
-    bSizer87 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bitmap27 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), 0 );
-    bSizer87->Add( m_bitmap27, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-
-    m_panel8 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER|wxTAB_TRAVERSAL );
-    m_panel8->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DLIGHT ) );
-
-    wxBoxSizer* bSizer72;
-    bSizer72 = new wxBoxSizer( wxVERTICAL );
-
-    m_staticText56 = new wxStaticText( m_panel8, wxID_ANY, _("Batch job"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText56->Wrap( -1 );
-    m_staticText56->SetFont( wxFont( 16, 70, 90, 92, false, wxEmptyString ) );
-
-    bSizer72->Add( m_staticText56, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_panel8->SetSizer( bSizer72 );
-    m_panel8->Layout();
-    bSizer72->Fit( m_panel8 );
-    bSizer87->Add( m_panel8, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-
-    bSizer87->Add( 5, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    wxBoxSizer* bSizer70;
-    bSizer70 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_staticText44 = new wxStaticText( this, wxID_ANY, _("Create a batch file for automated synchronization. To start in batch mode simply double-click the file or execute via command line: FreeFileSync.exe <ffs_batch file>. This can also be scheduled in your operating system's task planner."), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText44->Wrap( 460 );
-    bSizer70->Add( m_staticText44, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-    m_bpButtonHelp = new wxBitmapButton( this, wxID_HELP, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-    m_bpButtonHelp->SetToolTip( _("Help") );
-
-    bSizer70->Add( m_bpButtonHelp, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-
-    bSizer87->Add( bSizer70, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    bSizer69->Add( bSizer87, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_notebookSettings = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-    m_panelOverview = new wxPanel( m_notebookSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    wxBoxSizer* bSizer67;
-    bSizer67 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxBoxSizer* bSizer120;
-    bSizer120 = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer175;
-    bSizer175 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxStaticBoxSizer* sbSizer241;
-    sbSizer241 = new wxStaticBoxSizer( new wxStaticBox( m_panelOverview, wxID_ANY, _("Compare") ), wxHORIZONTAL );
-
-    m_bpButtonCmpConfig = new wxBitmapButton( m_panelOverview, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,42 ), wxBU_AUTODRAW );
-    m_bpButtonCmpConfig->SetToolTip( _("Comparison settings") );
-
-    sbSizer241->Add( m_bpButtonCmpConfig, 0, wxALIGN_CENTER_VERTICAL, 3 );
-
-
-    sbSizer241->Add( 10, 0, 0, 0, 5 );
-
-    m_staticTextCmpVariant = new wxStaticText( m_panelOverview, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextCmpVariant->Wrap( -1 );
-    m_staticTextCmpVariant->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
-    m_staticTextCmpVariant->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
-
-    sbSizer241->Add( m_staticTextCmpVariant, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizer175->Add( sbSizer241, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizer175->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    wxStaticBoxSizer* sbSizer26;
-    sbSizer26 = new wxStaticBoxSizer( new wxStaticBox( m_panelOverview, wxID_ANY, _("Filter files") ), wxVERTICAL );
-
-    m_bpButtonFilter = new wxBitmapButton( m_panelOverview, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW|wxFULL_REPAINT_ON_RESIZE );
-    sbSizer26->Add( m_bpButtonFilter, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 15 );
-
-    bSizer175->Add( sbSizer26, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizer175->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    wxStaticBoxSizer* sbSizer252;
-    sbSizer252 = new wxStaticBoxSizer( new wxStaticBox( m_panelOverview, wxID_ANY, _("Synchronize...") ), wxHORIZONTAL );
-
-    m_staticTextSyncVariant = new wxStaticText( m_panelOverview, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextSyncVariant->Wrap( -1 );
-    m_staticTextSyncVariant->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
-    m_staticTextSyncVariant->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
-
-    sbSizer252->Add( m_staticTextSyncVariant, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    sbSizer252->Add( 10, 0, 0, 0, 5 );
-
-    m_bpButtonSyncConfig = new wxBitmapButton( m_panelOverview, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,42 ), wxBU_AUTODRAW );
-    m_bpButtonSyncConfig->SetToolTip( _("Synchronization settings") );
-
-    sbSizer252->Add( m_bpButtonSyncConfig, 0, wxALIGN_CENTER_VERTICAL, 3 );
-
-    bSizer175->Add( sbSizer252, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizer175->Add( 15, 0, 0, 0, 5 );
-
-    wxStaticBoxSizer* sbSizer25;
-    sbSizer25 = new wxStaticBoxSizer( new wxStaticBox( m_panelOverview, wxID_ANY, _("Error handling") ), wxHORIZONTAL );
-
-    wxArrayString m_choiceHandleErrorChoices;
-    m_choiceHandleError = new wxChoice( m_panelOverview, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceHandleErrorChoices, 0 );
-    m_choiceHandleError->SetSelection( 0 );
-    sbSizer25->Add( m_choiceHandleError, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizer175->Add( sbSizer25, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-
-    bSizer120->Add( bSizer175, 0, wxEXPAND, 5 );
-
-
-    bSizer120->Add( 0, 5, 0, 0, 5 );
-
-    m_scrolledWindow6 = new wxScrolledWindow( m_panelOverview, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
-    m_scrolledWindow6->SetScrollRate( 5, 5 );
-    wxBoxSizer* bSizer141;
-    bSizer141 = new wxBoxSizer( wxVERTICAL );
-
-    sbSizerMainPair = new wxBoxSizer( wxHORIZONTAL );
-
-    m_panelMainPair = new wxPanel( m_scrolledWindow6, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxDOUBLE_BORDER );
-    wxBoxSizer* bSizer147;
-    bSizer147 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxBoxSizer* bSizer1361;
-    bSizer1361 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bpButtonAddPair = new wxBitmapButton( m_panelMainPair, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
-    m_bpButtonAddPair->SetToolTip( _("Add folder pair") );
-
-    bSizer1361->Add( m_bpButtonAddPair, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 3 );
-
-    m_bpButtonRemovePair = new wxBitmapButton( m_panelMainPair, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
-    m_bpButtonRemovePair->SetToolTip( _("Remove folder pair") );
-
-    bSizer1361->Add( m_bpButtonRemovePair, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    bSizer147->Add( bSizer1361, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    wxBoxSizer* bSizer143;
-    bSizer143 = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer145;
-    bSizer145 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_staticText532 = new wxStaticText( m_panelMainPair, wxID_ANY, _("Left"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText532->Wrap( -1 );
-    m_staticText532->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
-
-    bSizer145->Add( m_staticText532, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizer143->Add( bSizer145, 1, 0, 5 );
-
-    wxBoxSizer* bSizer146;
-    bSizer146 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_staticText5411 = new wxStaticText( m_panelMainPair, wxID_ANY, _("Right"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText5411->Wrap( -1 );
-    m_staticText5411->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
-
-    bSizer146->Add( m_staticText5411, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizer143->Add( bSizer146, 1, 0, 5 );
-
-    bSizer147->Add( bSizer143, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-
-    m_panelMainPair->SetSizer( bSizer147 );
-    m_panelMainPair->Layout();
-    bSizer147->Fit( m_panelMainPair );
-    sbSizerMainPair->Add( m_panelMainPair, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM, 5 );
-
-    wxBoxSizer* bSizer158;
-    bSizer158 = new wxBoxSizer( wxVERTICAL );
-
-    m_panelLeft = new wxPanel( m_scrolledWindow6, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    wxBoxSizer* bSizer1141;
-    bSizer1141 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_directoryLeft = new FolderHistoryBox( m_panelLeft, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
-    bSizer1141->Add( m_directoryLeft, 1, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_dirPickerLeft = new FfsDirPickerCtrl( m_panelLeft, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_dirPickerLeft->SetToolTip( _("Select a folder") );
-
-    bSizer1141->Add( m_dirPickerLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_panelLeft->SetSizer( bSizer1141 );
-    m_panelLeft->Layout();
-    bSizer1141->Fit( m_panelLeft );
-    bSizer158->Add( m_panelLeft, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-
-    m_panelRight = new wxPanel( m_scrolledWindow6, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    wxBoxSizer* bSizer115;
-    bSizer115 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_directoryRight = new FolderHistoryBox( m_panelRight, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
-    bSizer115->Add( m_directoryRight, 1, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_dirPickerRight = new FfsDirPickerCtrl( m_panelRight, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_dirPickerRight->SetToolTip( _("Select a folder") );
-
-    bSizer115->Add( m_dirPickerRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_panelRight->SetSizer( bSizer115 );
-    m_panelRight->Layout();
-    bSizer115->Fit( m_panelRight );
-    bSizer158->Add( m_panelRight, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
-
-    sbSizerMainPair->Add( bSizer158, 1, wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 );
-
-    wxBoxSizer* bSizer177;
-    bSizer177 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bpButtonAltCompCfg = new wxBitmapButton( m_scrolledWindow6, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
-    bSizer177->Add( m_bpButtonAltCompCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_bpButtonLocalFilter = new wxBitmapButton( m_scrolledWindow6, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
-    bSizer177->Add( m_bpButtonLocalFilter, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 3 );
-
-    m_bpButtonAltSyncCfg = new wxBitmapButton( m_scrolledWindow6, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
-    bSizer177->Add( m_bpButtonAltSyncCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    sbSizerMainPair->Add( bSizer177, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-
-    bSizer141->Add( sbSizerMainPair, 0, wxEXPAND, 5 );
-
-    bSizerAddFolderPairs = new wxBoxSizer( wxVERTICAL );
-
-    bSizer141->Add( bSizerAddFolderPairs, 1, wxEXPAND, 5 );
-
-    m_scrolledWindow6->SetSizer( bSizer141 );
-    m_scrolledWindow6->Layout();
-    bSizer141->Fit( m_scrolledWindow6 );
-    bSizer120->Add( m_scrolledWindow6, 1, wxEXPAND, 5 );
-
-
-    bSizer120->Add( 0, 5, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    bSizer67->Add( bSizer120, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 10 );
-
-    m_panelOverview->SetSizer( bSizer67 );
-    m_panelOverview->Layout();
-    bSizer67->Fit( m_panelOverview );
-    m_notebookSettings->AddPage( m_panelOverview, _("Overview"), true );
-    m_panelBatchSettings = new wxPanel( m_notebookSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    wxBoxSizer* bSizer117;
-    bSizer117 = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer172;
-    bSizer172 = new wxBoxSizer( wxVERTICAL );
-
-    wxStaticBoxSizer* sbSizer24;
-    sbSizer24 = new wxStaticBoxSizer( new wxStaticBox( m_panelBatchSettings, wxID_ANY, _("Status feedback") ), wxVERTICAL );
-
-    m_checkBoxSilent = new wxCheckBox( m_panelBatchSettings, wxID_ANY, _("Run minimized"), wxDefaultPosition, wxDefaultSize, 0 );
-    sbSizer24->Add( m_checkBoxSilent, 0, wxALL|wxEXPAND, 5 );
-
-    bSizer172->Add( sbSizer24, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-
-
-    bSizer172->Add( 0, 5, 0, 0, 5 );
-
-    sbSizerLogfileDir = new wxStaticBoxSizer( new wxStaticBox( m_panelBatchSettings, wxID_ANY, _("Logging") ), wxVERTICAL );
-
-    wxBoxSizer* bSizer152;
-    bSizer152 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_staticText96 = new wxStaticText( m_panelBatchSettings, wxID_ANY, _("Maximum number of logfiles:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText96->Wrap( -1 );
-    bSizer152->Add( m_staticText96, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-
-
-    bSizer152->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    m_spinCtrlLogCountMax = new wxSpinCtrl( m_panelBatchSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
-    bSizer152->Add( m_spinCtrlLogCountMax, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    sbSizerLogfileDir->Add( bSizer152, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
-
-    m_panelLogfile = new wxPanel( m_panelBatchSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    wxBoxSizer* bSizer1721;
-    bSizer1721 = new wxBoxSizer( wxVERTICAL );
-
-    m_staticText94 = new wxStaticText( m_panelLogfile, wxID_ANY, _("Select logfile directory:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText94->Wrap( -1 );
-    bSizer1721->Add( m_staticText94, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
-
-    wxBoxSizer* bSizer170;
-    bSizer170 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_textCtrlLogfileDir = new wxTextCtrl( m_panelLogfile, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer170->Add( m_textCtrlLogfileDir, 1, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_dirPickerLogfileDir = new FfsDirPickerCtrl( m_panelLogfile, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_dirPickerLogfileDir->SetToolTip( _("Select a folder") );
-
-    bSizer170->Add( m_dirPickerLogfileDir, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizer1721->Add( bSizer170, 0, wxEXPAND, 5 );
-
-    m_panelLogfile->SetSizer( bSizer1721 );
-    m_panelLogfile->Layout();
-    bSizer1721->Fit( m_panelLogfile );
-    sbSizerLogfileDir->Add( m_panelLogfile, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
-    bSizer172->Add( sbSizerLogfileDir, 0, wxEXPAND, 5 );
-
-    bSizer117->Add( bSizer172, 1, wxEXPAND|wxALL, 10 );
-
-    m_panelBatchSettings->SetSizer( bSizer117 );
-    m_panelBatchSettings->Layout();
-    bSizer117->Fit( m_panelBatchSettings );
-    m_notebookSettings->AddPage( m_panelBatchSettings, _("Batch settings"), false );
-
-    bSizer69->Add( m_notebookSettings, 1, wxEXPAND, 5 );
-
-    wxBoxSizer* bSizer68;
-    bSizer68 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_buttonSave = new wxButton( this, wxID_SAVE, _("&Save"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-    m_buttonSave->SetDefault();
-    m_buttonSave->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
-
-    bSizer68->Add( m_buttonSave, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
-
-    m_buttonLoad = new wxButton( this, wxID_OPEN, _("&Load"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-    m_buttonLoad->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-
-    bSizer68->Add( m_buttonLoad, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-    m_button6 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-    m_button6->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-
-    bSizer68->Add( m_button6, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizer69->Add( bSizer68, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    bSizer54->Add( bSizer69, 1, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 5 );
-
-    this->SetSizer( bSizer54 );
-    this->Layout();
-    bSizer54->Fit( this );
-
-    this->Centre( wxBOTH );
-
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( BatchDlgGenerated::OnClose ) );
-    m_bpButtonHelp->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnHelp ), NULL, this );
-    m_bpButtonCmpConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnCmpSettings ), NULL, this );
-    m_bpButtonFilter->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnConfigureFilter ), NULL, this );
-    m_bpButtonSyncConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnSyncSettings ), NULL, this );
-    m_choiceHandleError->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( BatchDlgGenerated::OnChangeErrorHandling ), NULL, this );
-    m_bpButtonAddPair->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnAddFolderPair ), NULL, this );
-    m_bpButtonRemovePair->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnRemoveTopFolderPair ), NULL, this );
-    m_spinCtrlLogCountMax->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( BatchDlgGenerated::OnChangeMaxLogCountTxt ), NULL, this );
-    m_buttonSave->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnSaveBatchJob ), NULL, this );
-    m_buttonLoad->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnLoadBatchJob ), NULL, this );
-    m_button6->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnCancel ), NULL, this );
+	this->SetSizeHints( wxSize( 560,320 ), wxDefaultSize );
+	
+	wxBoxSizer* bSizer54;
+	bSizer54 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer87;
+	bSizer87 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmap27 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), 0 );
+	bSizer87->Add( m_bitmap27, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	
+	m_panel8 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER|wxTAB_TRAVERSAL );
+	m_panel8->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DLIGHT ) );
+	
+	wxBoxSizer* bSizer72;
+	bSizer72 = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticText56 = new wxStaticText( m_panel8, wxID_ANY, _("Batch job"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText56->Wrap( -1 );
+	m_staticText56->SetFont( wxFont( 16, 70, 90, 92, false, wxEmptyString ) );
+	
+	bSizer72->Add( m_staticText56, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_panel8->SetSizer( bSizer72 );
+	m_panel8->Layout();
+	bSizer72->Fit( m_panel8 );
+	bSizer87->Add( m_panel8, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	
+	bSizer87->Add( 5, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	wxBoxSizer* bSizer70;
+	bSizer70 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_staticText44 = new wxStaticText( this, wxID_ANY, _("Create a batch file for automated synchronization. To start in batch mode simply double-click the file or execute via command line: FreeFileSync.exe <ffs_batch file>. This can also be scheduled in your operating system's task planner."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText44->Wrap( 460 );
+	bSizer70->Add( m_staticText44, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_bpButtonHelp = new wxBitmapButton( this, wxID_HELP, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+	m_bpButtonHelp->SetToolTip( _("Help") );
+	
+	bSizer70->Add( m_bpButtonHelp, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+	
+	bSizer87->Add( bSizer70, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	bSizer54->Add( bSizer87, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 5 );
+	
+	m_listbook1 = new wxListbook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLB_DEFAULT );
+	m_panelOverview = new wxPanel( m_listbook1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer67;
+	bSizer67 = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxBoxSizer* bSizer120;
+	bSizer120 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer175;
+	bSizer175 = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxStaticBoxSizer* sbSizer241;
+	sbSizer241 = new wxStaticBoxSizer( new wxStaticBox( m_panelOverview, wxID_ANY, _("Compare") ), wxHORIZONTAL );
+	
+	m_bpButtonCmpConfig = new wxBitmapButton( m_panelOverview, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,42 ), wxBU_AUTODRAW );
+	m_bpButtonCmpConfig->SetToolTip( _("Comparison settings") );
+	
+	sbSizer241->Add( m_bpButtonCmpConfig, 0, wxALIGN_CENTER_VERTICAL, 3 );
+	
+	
+	sbSizer241->Add( 10, 0, 0, 0, 5 );
+	
+	m_staticTextCmpVariant = new wxStaticText( m_panelOverview, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextCmpVariant->Wrap( -1 );
+	m_staticTextCmpVariant->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
+	m_staticTextCmpVariant->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	
+	sbSizer241->Add( m_staticTextCmpVariant, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizer175->Add( sbSizer241, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizer175->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	wxStaticBoxSizer* sbSizer26;
+	sbSizer26 = new wxStaticBoxSizer( new wxStaticBox( m_panelOverview, wxID_ANY, _("Filter files") ), wxVERTICAL );
+	
+	m_bpButtonFilter = new wxBitmapButton( m_panelOverview, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW|wxFULL_REPAINT_ON_RESIZE );
+	sbSizer26->Add( m_bpButtonFilter, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 15 );
+	
+	bSizer175->Add( sbSizer26, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizer175->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	wxStaticBoxSizer* sbSizer252;
+	sbSizer252 = new wxStaticBoxSizer( new wxStaticBox( m_panelOverview, wxID_ANY, _("Synchronize...") ), wxHORIZONTAL );
+	
+	m_staticTextSyncVariant = new wxStaticText( m_panelOverview, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextSyncVariant->Wrap( -1 );
+	m_staticTextSyncVariant->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
+	m_staticTextSyncVariant->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+	
+	sbSizer252->Add( m_staticTextSyncVariant, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	sbSizer252->Add( 10, 0, 0, 0, 5 );
+	
+	m_bpButtonSyncConfig = new wxBitmapButton( m_panelOverview, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,42 ), wxBU_AUTODRAW );
+	m_bpButtonSyncConfig->SetToolTip( _("Synchronization settings") );
+	
+	sbSizer252->Add( m_bpButtonSyncConfig, 0, wxALIGN_CENTER_VERTICAL, 3 );
+	
+	bSizer175->Add( sbSizer252, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizer175->Add( 15, 0, 0, 0, 5 );
+	
+	wxStaticBoxSizer* sbSizer25;
+	sbSizer25 = new wxStaticBoxSizer( new wxStaticBox( m_panelOverview, wxID_ANY, _("Error handling") ), wxHORIZONTAL );
+	
+	wxArrayString m_choiceHandleErrorChoices;
+	m_choiceHandleError = new wxChoice( m_panelOverview, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceHandleErrorChoices, 0 );
+	m_choiceHandleError->SetSelection( 0 );
+	sbSizer25->Add( m_choiceHandleError, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizer175->Add( sbSizer25, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	
+	bSizer120->Add( bSizer175, 0, wxEXPAND, 5 );
+	
+	
+	bSizer120->Add( 0, 5, 0, 0, 5 );
+	
+	m_scrolledWindow6 = new wxScrolledWindow( m_panelOverview, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
+	m_scrolledWindow6->SetScrollRate( 5, 5 );
+	wxBoxSizer* bSizer141;
+	bSizer141 = new wxBoxSizer( wxVERTICAL );
+	
+	sbSizerMainPair = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_panelMainPair = new wxPanel( m_scrolledWindow6, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxDOUBLE_BORDER );
+	wxBoxSizer* bSizer147;
+	bSizer147 = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxBoxSizer* bSizer1361;
+	bSizer1361 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bpButtonAddPair = new wxBitmapButton( m_panelMainPair, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
+	m_bpButtonAddPair->SetToolTip( _("Add folder pair") );
+	
+	bSizer1361->Add( m_bpButtonAddPair, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 3 );
+	
+	m_bpButtonRemovePair = new wxBitmapButton( m_panelMainPair, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
+	m_bpButtonRemovePair->SetToolTip( _("Remove folder pair") );
+	
+	bSizer1361->Add( m_bpButtonRemovePair, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	bSizer147->Add( bSizer1361, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	wxBoxSizer* bSizer143;
+	bSizer143 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer145;
+	bSizer145 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_staticText532 = new wxStaticText( m_panelMainPair, wxID_ANY, _("Left"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText532->Wrap( -1 );
+	m_staticText532->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
+	
+	bSizer145->Add( m_staticText532, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizer143->Add( bSizer145, 1, 0, 5 );
+	
+	wxBoxSizer* bSizer146;
+	bSizer146 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_staticText5411 = new wxStaticText( m_panelMainPair, wxID_ANY, _("Right"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText5411->Wrap( -1 );
+	m_staticText5411->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
+	
+	bSizer146->Add( m_staticText5411, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizer143->Add( bSizer146, 1, 0, 5 );
+	
+	bSizer147->Add( bSizer143, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+	
+	m_panelMainPair->SetSizer( bSizer147 );
+	m_panelMainPair->Layout();
+	bSizer147->Fit( m_panelMainPair );
+	sbSizerMainPair->Add( m_panelMainPair, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM, 5 );
+	
+	wxBoxSizer* bSizer158;
+	bSizer158 = new wxBoxSizer( wxVERTICAL );
+	
+	m_panelLeft = new wxPanel( m_scrolledWindow6, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer1141;
+	bSizer1141 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_directoryLeft = new FolderHistoryBox( m_panelLeft, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
+	bSizer1141->Add( m_directoryLeft, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_dirPickerLeft = new zen::DirPickerCtrl( m_panelLeft, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_dirPickerLeft->SetToolTip( _("Select a folder") );
+	
+	bSizer1141->Add( m_dirPickerLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_panelLeft->SetSizer( bSizer1141 );
+	m_panelLeft->Layout();
+	bSizer1141->Fit( m_panelLeft );
+	bSizer158->Add( m_panelLeft, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	
+	m_panelRight = new wxPanel( m_scrolledWindow6, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer115;
+	bSizer115 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_directoryRight = new FolderHistoryBox( m_panelRight, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
+	bSizer115->Add( m_directoryRight, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_dirPickerRight = new zen::DirPickerCtrl( m_panelRight, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_dirPickerRight->SetToolTip( _("Select a folder") );
+	
+	bSizer115->Add( m_dirPickerRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_panelRight->SetSizer( bSizer115 );
+	m_panelRight->Layout();
+	bSizer115->Fit( m_panelRight );
+	bSizer158->Add( m_panelRight, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	sbSizerMainPair->Add( bSizer158, 1, wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 );
+	
+	wxBoxSizer* bSizer177;
+	bSizer177 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bpButtonAltCompCfg = new wxBitmapButton( m_scrolledWindow6, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
+	bSizer177->Add( m_bpButtonAltCompCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_bpButtonLocalFilter = new wxBitmapButton( m_scrolledWindow6, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
+	bSizer177->Add( m_bpButtonLocalFilter, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 3 );
+	
+	m_bpButtonAltSyncCfg = new wxBitmapButton( m_scrolledWindow6, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
+	bSizer177->Add( m_bpButtonAltSyncCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	sbSizerMainPair->Add( bSizer177, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+	
+	bSizer141->Add( sbSizerMainPair, 0, wxEXPAND, 5 );
+	
+	bSizerAddFolderPairs = new wxBoxSizer( wxVERTICAL );
+	
+	bSizer141->Add( bSizerAddFolderPairs, 1, wxEXPAND, 5 );
+	
+	m_scrolledWindow6->SetSizer( bSizer141 );
+	m_scrolledWindow6->Layout();
+	bSizer141->Fit( m_scrolledWindow6 );
+	bSizer120->Add( m_scrolledWindow6, 1, wxEXPAND, 5 );
+	
+	
+	bSizer120->Add( 0, 5, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	bSizer67->Add( bSizer120, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 10 );
+	
+	m_panelOverview->SetSizer( bSizer67 );
+	m_panelOverview->Layout();
+	bSizer67->Fit( m_panelOverview );
+	m_listbook1->AddPage( m_panelOverview, _("Overview"), true );
+	m_panelBatchSettings = new wxPanel( m_listbook1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer117;
+	bSizer117 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer172;
+	bSizer172 = new wxBoxSizer( wxVERTICAL );
+	
+	wxStaticBoxSizer* sbSizer24;
+	sbSizer24 = new wxStaticBoxSizer( new wxStaticBox( m_panelBatchSettings, wxID_ANY, _("Status feedback") ), wxVERTICAL );
+	
+	m_checkBoxSilent = new wxCheckBox( m_panelBatchSettings, wxID_ANY, _("Run minimized"), wxDefaultPosition, wxDefaultSize, 0 );
+	sbSizer24->Add( m_checkBoxSilent, 0, wxALL|wxEXPAND, 5 );
+	
+	bSizer172->Add( sbSizer24, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	
+	
+	bSizer172->Add( 0, 5, 0, 0, 5 );
+	
+	sbSizerLogfileDir = new wxStaticBoxSizer( new wxStaticBox( m_panelBatchSettings, wxID_ANY, _("Logging") ), wxVERTICAL );
+	
+	wxBoxSizer* bSizer152;
+	bSizer152 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_staticText96 = new wxStaticText( m_panelBatchSettings, wxID_ANY, _("Maximum number of logfiles:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText96->Wrap( -1 );
+	bSizer152->Add( m_staticText96, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+	
+	
+	bSizer152->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	m_spinCtrlLogCountMax = new wxSpinCtrl( m_panelBatchSettings, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
+	bSizer152->Add( m_spinCtrlLogCountMax, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	sbSizerLogfileDir->Add( bSizer152, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	m_panelLogfile = new wxPanel( m_panelBatchSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer1721;
+	bSizer1721 = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticText94 = new wxStaticText( m_panelLogfile, wxID_ANY, _("Select logfile directory:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText94->Wrap( -1 );
+	bSizer1721->Add( m_staticText94, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
+	
+	wxBoxSizer* bSizer170;
+	bSizer170 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_comboBoxLogfileDir = new FolderHistoryBox( m_panelLogfile, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
+	bSizer170->Add( m_comboBoxLogfileDir, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_dirPickerLogfileDir = new zen::DirPickerCtrl( m_panelLogfile, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_dirPickerLogfileDir->SetToolTip( _("Select a folder") );
+	
+	bSizer170->Add( m_dirPickerLogfileDir, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizer1721->Add( bSizer170, 0, wxEXPAND, 5 );
+	
+	m_panelLogfile->SetSizer( bSizer1721 );
+	m_panelLogfile->Layout();
+	bSizer1721->Fit( m_panelLogfile );
+	sbSizerLogfileDir->Add( m_panelLogfile, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	
+	bSizer172->Add( sbSizerLogfileDir, 0, wxEXPAND, 5 );
+	
+	bSizer117->Add( bSizer172, 1, wxEXPAND|wxALL, 10 );
+	
+	m_panelBatchSettings->SetSizer( bSizer117 );
+	m_panelBatchSettings->Layout();
+	bSizer117->Fit( m_panelBatchSettings );
+	m_listbook1->AddPage( m_panelBatchSettings, _("Batch settings"), false );
+	#ifndef __WXGTK__ // Small icon style not supported in GTK
+	wxListView* m_listbook1ListView = m_listbook1->GetListView();
+	long m_listbook1Flags = m_listbook1ListView->GetWindowStyleFlag();
+	m_listbook1Flags = ( m_listbook1Flags & ~wxLC_ICON ) | wxLC_SMALL_ICON;
+	m_listbook1ListView->SetWindowStyleFlag( m_listbook1Flags );
+	#endif
+	
+	bSizer54->Add( m_listbook1, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 );
+	
+	wxBoxSizer* bSizer68;
+	bSizer68 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_buttonSave = new wxButton( this, wxID_SAVE, _("&Save"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+	m_buttonSave->SetDefault(); 
+	m_buttonSave->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
+	
+	bSizer68->Add( m_buttonSave, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+	
+	m_buttonLoad = new wxButton( this, wxID_OPEN, _("&Load"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+	m_buttonLoad->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+	
+	bSizer68->Add( m_buttonLoad, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_button6 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+	m_button6->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+	
+	bSizer68->Add( m_button6, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizer54->Add( bSizer68, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 5 );
+	
+	this->SetSizer( bSizer54 );
+	this->Layout();
+	bSizer54->Fit( this );
+	
+	this->Centre( wxBOTH );
+	
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( BatchDlgGenerated::OnClose ) );
+	m_bpButtonHelp->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnHelp ), NULL, this );
+	m_bpButtonCmpConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnCmpSettings ), NULL, this );
+	m_bpButtonFilter->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnConfigureFilter ), NULL, this );
+	m_bpButtonSyncConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnSyncSettings ), NULL, this );
+	m_choiceHandleError->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( BatchDlgGenerated::OnChangeErrorHandling ), NULL, this );
+	m_bpButtonAddPair->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnAddFolderPair ), NULL, this );
+	m_bpButtonRemovePair->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnRemoveTopFolderPair ), NULL, this );
+	m_spinCtrlLogCountMax->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( BatchDlgGenerated::OnChangeMaxLogCountTxt ), NULL, this );
+	m_buttonSave->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnSaveBatchJob ), NULL, this );
+	m_buttonLoad->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnLoadBatchJob ), NULL, this );
+	m_button6->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnCancel ), NULL, this );
 }
 
 BatchDlgGenerated::~BatchDlgGenerated()
 {
-    // Disconnect Events
-    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( BatchDlgGenerated::OnClose ) );
-    m_bpButtonHelp->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnHelp ), NULL, this );
-    m_bpButtonCmpConfig->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnCmpSettings ), NULL, this );
-    m_bpButtonFilter->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnConfigureFilter ), NULL, this );
-    m_bpButtonSyncConfig->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnSyncSettings ), NULL, this );
-    m_choiceHandleError->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( BatchDlgGenerated::OnChangeErrorHandling ), NULL, this );
-    m_bpButtonAddPair->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnAddFolderPair ), NULL, this );
-    m_bpButtonRemovePair->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnRemoveTopFolderPair ), NULL, this );
-    m_spinCtrlLogCountMax->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( BatchDlgGenerated::OnChangeMaxLogCountTxt ), NULL, this );
-    m_buttonSave->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnSaveBatchJob ), NULL, this );
-    m_buttonLoad->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnLoadBatchJob ), NULL, this );
-    m_button6->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnCancel ), NULL, this );
-
+	// Disconnect Events
+	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( BatchDlgGenerated::OnClose ) );
+	m_bpButtonHelp->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnHelp ), NULL, this );
+	m_bpButtonCmpConfig->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnCmpSettings ), NULL, this );
+	m_bpButtonFilter->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnConfigureFilter ), NULL, this );
+	m_bpButtonSyncConfig->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnSyncSettings ), NULL, this );
+	m_choiceHandleError->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( BatchDlgGenerated::OnChangeErrorHandling ), NULL, this );
+	m_bpButtonAddPair->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnAddFolderPair ), NULL, this );
+	m_bpButtonRemovePair->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnRemoveTopFolderPair ), NULL, this );
+	m_spinCtrlLogCountMax->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( BatchDlgGenerated::OnChangeMaxLogCountTxt ), NULL, this );
+	m_buttonSave->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnSaveBatchJob ), NULL, this );
+	m_buttonLoad->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnLoadBatchJob ), NULL, this );
+	m_button6->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnCancel ), NULL, this );
+	
 }
 
 BatchFolderPairGenerated::BatchFolderPairGenerated( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
 {
-    wxBoxSizer* bSizer142;
-    bSizer142 = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer140;
-    bSizer140 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_panel32 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxDOUBLE_BORDER );
-    wxBoxSizer* bSizer147;
-    bSizer147 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxBoxSizer* bSizer136;
-    bSizer136 = new wxBoxSizer( wxVERTICAL );
-
-    m_bpButtonRemovePair = new wxBitmapButton( m_panel32, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
-    m_bpButtonRemovePair->SetToolTip( _("Remove folder pair") );
-
-    bSizer136->Add( m_bpButtonRemovePair, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizer147->Add( bSizer136, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    wxBoxSizer* bSizer143;
-    bSizer143 = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer145;
-    bSizer145 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_staticText53 = new wxStaticText( m_panel32, wxID_ANY, _("Left"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText53->Wrap( -1 );
-    m_staticText53->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
-
-    bSizer145->Add( m_staticText53, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizer143->Add( bSizer145, 1, 0, 5 );
-
-    wxBoxSizer* bSizer146;
-    bSizer146 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_staticText541 = new wxStaticText( m_panel32, wxID_ANY, _("Right"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText541->Wrap( -1 );
-    m_staticText541->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
-
-    bSizer146->Add( m_staticText541, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizer143->Add( bSizer146, 1, 0, 5 );
-
-    bSizer147->Add( bSizer143, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
-
-    m_panel32->SetSizer( bSizer147 );
-    m_panel32->Layout();
-    bSizer147->Fit( m_panel32 );
-    bSizer140->Add( m_panel32, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-
-    wxBoxSizer* bSizer144;
-    bSizer144 = new wxBoxSizer( wxVERTICAL );
-
-    m_panelLeft = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    wxBoxSizer* bSizer114;
-    bSizer114 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_directoryLeft = new FolderHistoryBox( m_panelLeft, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
-    bSizer114->Add( m_directoryLeft, 1, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_dirPickerLeft = new FfsDirPickerCtrl( m_panelLeft, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_dirPickerLeft->SetToolTip( _("Select a folder") );
-
-    bSizer114->Add( m_dirPickerLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_panelLeft->SetSizer( bSizer114 );
-    m_panelLeft->Layout();
-    bSizer114->Fit( m_panelLeft );
-    bSizer144->Add( m_panelLeft, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-
-    m_panelRight = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    wxBoxSizer* bSizer115;
-    bSizer115 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_directoryRight = new FolderHistoryBox( m_panelRight, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
-    bSizer115->Add( m_directoryRight, 1, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_dirPickerRight = new FfsDirPickerCtrl( m_panelRight, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_dirPickerRight->SetToolTip( _("Select a folder") );
-
-    bSizer115->Add( m_dirPickerRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_panelRight->SetSizer( bSizer115 );
-    m_panelRight->Layout();
-    bSizer115->Fit( m_panelRight );
-    bSizer144->Add( m_panelRight, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizer140->Add( bSizer144, 1, wxALIGN_CENTER_VERTICAL, 5 );
-
-    wxBoxSizer* bSizer176;
-    bSizer176 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bpButtonAltCompCfg = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
-    bSizer176->Add( m_bpButtonAltCompCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_bpButtonLocalFilter = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
-    bSizer176->Add( m_bpButtonLocalFilter, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 3 );
-
-    m_bpButtonAltSyncCfg = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
-    bSizer176->Add( m_bpButtonAltSyncCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizer140->Add( bSizer176, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-
-    bSizer142->Add( bSizer140, 0, wxEXPAND, 5 );
-
-
-    bSizer142->Add( 0, 5, 0, 0, 5 );
-
-    this->SetSizer( bSizer142 );
-    this->Layout();
-    bSizer142->Fit( this );
+	wxBoxSizer* bSizer142;
+	bSizer142 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer140;
+	bSizer140 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_panel32 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxDOUBLE_BORDER );
+	wxBoxSizer* bSizer147;
+	bSizer147 = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxBoxSizer* bSizer136;
+	bSizer136 = new wxBoxSizer( wxVERTICAL );
+	
+	m_bpButtonRemovePair = new wxBitmapButton( m_panel32, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
+	m_bpButtonRemovePair->SetToolTip( _("Remove folder pair") );
+	
+	bSizer136->Add( m_bpButtonRemovePair, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizer147->Add( bSizer136, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	wxBoxSizer* bSizer143;
+	bSizer143 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer145;
+	bSizer145 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_staticText53 = new wxStaticText( m_panel32, wxID_ANY, _("Left"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText53->Wrap( -1 );
+	m_staticText53->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
+	
+	bSizer145->Add( m_staticText53, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizer143->Add( bSizer145, 1, 0, 5 );
+	
+	wxBoxSizer* bSizer146;
+	bSizer146 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_staticText541 = new wxStaticText( m_panel32, wxID_ANY, _("Right"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText541->Wrap( -1 );
+	m_staticText541->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
+	
+	bSizer146->Add( m_staticText541, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizer143->Add( bSizer146, 1, 0, 5 );
+	
+	bSizer147->Add( bSizer143, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
+	
+	m_panel32->SetSizer( bSizer147 );
+	m_panel32->Layout();
+	bSizer147->Fit( m_panel32 );
+	bSizer140->Add( m_panel32, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer144;
+	bSizer144 = new wxBoxSizer( wxVERTICAL );
+	
+	m_panelLeft = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer114;
+	bSizer114 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_directoryLeft = new FolderHistoryBox( m_panelLeft, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
+	bSizer114->Add( m_directoryLeft, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_dirPickerLeft = new zen::DirPickerCtrl( m_panelLeft, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_dirPickerLeft->SetToolTip( _("Select a folder") );
+	
+	bSizer114->Add( m_dirPickerLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_panelLeft->SetSizer( bSizer114 );
+	m_panelLeft->Layout();
+	bSizer114->Fit( m_panelLeft );
+	bSizer144->Add( m_panelLeft, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	
+	m_panelRight = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer115;
+	bSizer115 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_directoryRight = new FolderHistoryBox( m_panelRight, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
+	bSizer115->Add( m_directoryRight, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_dirPickerRight = new zen::DirPickerCtrl( m_panelRight, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_dirPickerRight->SetToolTip( _("Select a folder") );
+	
+	bSizer115->Add( m_dirPickerRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_panelRight->SetSizer( bSizer115 );
+	m_panelRight->Layout();
+	bSizer115->Fit( m_panelRight );
+	bSizer144->Add( m_panelRight, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizer140->Add( bSizer144, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	wxBoxSizer* bSizer176;
+	bSizer176 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bpButtonAltCompCfg = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
+	bSizer176->Add( m_bpButtonAltCompCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_bpButtonLocalFilter = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
+	bSizer176->Add( m_bpButtonLocalFilter, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 3 );
+	
+	m_bpButtonAltSyncCfg = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
+	bSizer176->Add( m_bpButtonAltSyncCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizer140->Add( bSizer176, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+	
+	bSizer142->Add( bSizer140, 0, wxEXPAND, 5 );
+	
+	
+	bSizer142->Add( 0, 5, 0, 0, 5 );
+	
+	this->SetSizer( bSizer142 );
+	this->Layout();
+	bSizer142->Fit( this );
 }
 
 BatchFolderPairGenerated::~BatchFolderPairGenerated()
@@ -1397,159 +1390,159 @@ BatchFolderPairGenerated::~BatchFolderPairGenerated()
 
 CompareStatusGenerated::CompareStatusGenerated( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
 {
-    wxBoxSizer* bSizer40;
-    bSizer40 = new wxBoxSizer( wxVERTICAL );
-
-
-    bSizer40->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    bSizer42 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxBoxSizer* bSizer157;
-    bSizer157 = new wxBoxSizer( wxVERTICAL );
-
-    bSizerFilesFound = new wxBoxSizer( wxHORIZONTAL );
-
-    m_staticText321 = new wxStaticText( this, wxID_ANY, _("Elements found:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText321->Wrap( -1 );
-    m_staticText321->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-
-    bSizerFilesFound->Add( m_staticText321, 0, wxALIGN_BOTTOM, 5 );
-
-    m_staticTextScanned = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextScanned->Wrap( -1 );
-    m_staticTextScanned->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
-
-    bSizerFilesFound->Add( m_staticTextScanned, 0, wxALIGN_BOTTOM|wxLEFT, 5 );
-
-    bSizer157->Add( bSizerFilesFound, 0, 0, 5 );
-
-    bSizerFilesRemaining = new wxBoxSizer( wxHORIZONTAL );
-
-    m_staticText46 = new wxStaticText( this, wxID_ANY, _("Elements remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText46->Wrap( -1 );
-    m_staticText46->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-
-    bSizerFilesRemaining->Add( m_staticText46, 0, wxALIGN_BOTTOM, 5 );
-
-    wxBoxSizer* bSizer154;
-    bSizer154 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_staticTextFilesRemaining = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextFilesRemaining->Wrap( -1 );
-    m_staticTextFilesRemaining->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
-
-    bSizer154->Add( m_staticTextFilesRemaining, 0, wxALIGN_BOTTOM, 5 );
-
-    m_staticText117 = new wxStaticText( this, wxID_ANY, _("("), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText117->Wrap( -1 );
-    m_staticText117->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
-
-    bSizer154->Add( m_staticText117, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
-
-    m_staticTextDataRemaining = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextDataRemaining->Wrap( -1 );
-    m_staticTextDataRemaining->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
-
-    bSizer154->Add( m_staticTextDataRemaining, 0, wxALIGN_BOTTOM, 5 );
-
-    m_staticText118 = new wxStaticText( this, wxID_ANY, _(")"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText118->Wrap( -1 );
-    m_staticText118->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
-
-    bSizer154->Add( m_staticText118, 0, wxALIGN_BOTTOM, 5 );
-
-    bSizerFilesRemaining->Add( bSizer154, 0, wxALIGN_BOTTOM|wxLEFT, 5 );
-
-    bSizer157->Add( bSizerFilesRemaining, 0, 0, 5 );
-
-    bSizer42->Add( bSizer157, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizer42->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    sSizerSpeed = new wxBoxSizer( wxHORIZONTAL );
-
-    m_staticText104 = new wxStaticText( this, wxID_ANY, _("Speed:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText104->Wrap( -1 );
-    m_staticText104->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-
-    sSizerSpeed->Add( m_staticText104, 0, wxALIGN_BOTTOM, 5 );
-
-    m_staticTextSpeed = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextSpeed->Wrap( -1 );
-    m_staticTextSpeed->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
-
-    sSizerSpeed->Add( m_staticTextSpeed, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
-
-    bSizer42->Add( sSizerSpeed, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizer42->Add( 10, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    sSizerTimeRemaining = new wxBoxSizer( wxHORIZONTAL );
-
-    m_staticTextTimeRemFixed = new wxStaticText( this, wxID_ANY, _("Time remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextTimeRemFixed->Wrap( -1 );
-    m_staticTextTimeRemFixed->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-
-    sSizerTimeRemaining->Add( m_staticTextTimeRemFixed, 0, wxALIGN_BOTTOM, 5 );
-
-    m_staticTextTimeRemaining = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextTimeRemaining->Wrap( -1 );
-    m_staticTextTimeRemaining->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
-
-    sSizerTimeRemaining->Add( m_staticTextTimeRemaining, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
-
-    bSizer42->Add( sSizerTimeRemaining, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizer42->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    sSizerTimeElapsed = new wxBoxSizer( wxHORIZONTAL );
-
-    wxStaticText* m_staticText37;
-    m_staticText37 = new wxStaticText( this, wxID_ANY, _("Time elapsed:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText37->Wrap( -1 );
-    m_staticText37->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-
-    sSizerTimeElapsed->Add( m_staticText37, 0, wxALIGN_BOTTOM, 5 );
-
-    m_staticTextTimeElapsed = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextTimeElapsed->Wrap( -1 );
-    m_staticTextTimeElapsed->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
-
-    sSizerTimeElapsed->Add( m_staticTextTimeElapsed, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
-
-    bSizer42->Add( sSizerTimeElapsed, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizer40->Add( bSizer42, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
-    wxBoxSizer* bSizer48;
-    bSizer48 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_staticText30 = new wxStaticText( this, wxID_ANY, _("Operation:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText30->Wrap( -1 );
-    m_staticText30->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
-
-    bSizer48->Add( m_staticText30, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_textCtrlStatus = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
-    m_textCtrlStatus->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-
-    bSizer48->Add( m_textCtrlStatus, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizer40->Add( bSizer48, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
-    m_gauge2 = new wxGauge( this, wxID_ANY, 100, wxDefaultPosition, wxSize( -1,14 ), wxGA_HORIZONTAL|wxGA_SMOOTH );
-    bSizer40->Add( m_gauge2, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
-
-
-    bSizer40->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    this->SetSizer( bSizer40 );
-    this->Layout();
-    bSizer40->Fit( this );
+	wxBoxSizer* bSizer40;
+	bSizer40 = new wxBoxSizer( wxVERTICAL );
+	
+	
+	bSizer40->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer48;
+	bSizer48 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_staticText30 = new wxStaticText( this, wxID_ANY, _("Operation:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText30->Wrap( -1 );
+	m_staticText30->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
+	
+	bSizer48->Add( m_staticText30, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_textCtrlStatus = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
+	m_textCtrlStatus->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+	
+	bSizer48->Add( m_textCtrlStatus, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizer40->Add( bSizer48, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	
+	m_gauge2 = new wxGauge( this, wxID_ANY, 100, wxDefaultPosition, wxSize( -1,14 ), wxGA_HORIZONTAL|wxGA_SMOOTH );
+	bSizer40->Add( m_gauge2, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
+	
+	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( 10, 70, 90, 90, false, wxEmptyString ) );
+	
+	bSizerFilesFound->Add( m_staticText321, 0, wxALIGN_BOTTOM, 5 );
+	
+	m_staticTextScanned = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextScanned->Wrap( -1 );
+	m_staticTextScanned->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
+	
+	bSizerFilesFound->Add( m_staticTextScanned, 0, wxALIGN_BOTTOM|wxLEFT, 5 );
+	
+	bSizer157->Add( bSizerFilesFound, 0, 0, 5 );
+	
+	bSizerFilesRemaining = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_staticText46 = new wxStaticText( this, wxID_ANY, _("Items remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText46->Wrap( -1 );
+	m_staticText46->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+	
+	bSizerFilesRemaining->Add( m_staticText46, 0, wxALIGN_BOTTOM, 5 );
+	
+	wxBoxSizer* bSizer154;
+	bSizer154 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_staticTextFilesRemaining = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextFilesRemaining->Wrap( -1 );
+	m_staticTextFilesRemaining->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
+	
+	bSizer154->Add( m_staticTextFilesRemaining, 0, wxALIGN_BOTTOM, 5 );
+	
+	m_staticText117 = new wxStaticText( this, wxID_ANY, _("("), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText117->Wrap( -1 );
+	m_staticText117->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
+	
+	bSizer154->Add( m_staticText117, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
+	
+	m_staticTextDataRemaining = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextDataRemaining->Wrap( -1 );
+	m_staticTextDataRemaining->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
+	
+	bSizer154->Add( m_staticTextDataRemaining, 0, wxALIGN_BOTTOM, 5 );
+	
+	m_staticText118 = new wxStaticText( this, wxID_ANY, _(")"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText118->Wrap( -1 );
+	m_staticText118->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
+	
+	bSizer154->Add( m_staticText118, 0, wxALIGN_BOTTOM, 5 );
+	
+	bSizerFilesRemaining->Add( bSizer154, 0, wxALIGN_BOTTOM|wxLEFT, 5 );
+	
+	bSizer157->Add( bSizerFilesRemaining, 0, 0, 5 );
+	
+	bSizer42->Add( bSizer157, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizer42->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	sSizerSpeed = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_staticText104 = new wxStaticText( this, wxID_ANY, _("Speed:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText104->Wrap( -1 );
+	m_staticText104->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+	
+	sSizerSpeed->Add( m_staticText104, 0, wxALIGN_BOTTOM, 5 );
+	
+	m_staticTextSpeed = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextSpeed->Wrap( -1 );
+	m_staticTextSpeed->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
+	
+	sSizerSpeed->Add( m_staticTextSpeed, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
+	
+	bSizer42->Add( sSizerSpeed, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizer42->Add( 10, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	sSizerTimeRemaining = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_staticTextTimeRemFixed = new wxStaticText( this, wxID_ANY, _("Time remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextTimeRemFixed->Wrap( -1 );
+	m_staticTextTimeRemFixed->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+	
+	sSizerTimeRemaining->Add( m_staticTextTimeRemFixed, 0, wxALIGN_BOTTOM, 5 );
+	
+	m_staticTextRemTime = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextRemTime->Wrap( -1 );
+	m_staticTextRemTime->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
+	
+	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( 10, 70, 90, 90, false, wxEmptyString ) );
+	
+	sSizerTimeElapsed->Add( m_staticText37, 0, wxALIGN_BOTTOM, 5 );
+	
+	m_staticTextTimeElapsed = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextTimeElapsed->Wrap( -1 );
+	m_staticTextTimeElapsed->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
+	
+	sSizerTimeElapsed->Add( m_staticTextTimeElapsed, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
+	
+	bSizer42->Add( sSizerTimeElapsed, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizer40->Add( bSizer42, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	
+	bSizer40->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	this->SetSizer( bSizer40 );
+	this->Layout();
+	bSizer40->Fit( this );
 }
 
 CompareStatusGenerated::~CompareStatusGenerated()
@@ -1558,2138 +1551,2178 @@ CompareStatusGenerated::~CompareStatusGenerated()
 
 SyncCfgDlgGenerated::SyncCfgDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-
-    wxBoxSizer* bSizer7;
-    bSizer7 = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer181;
-    bSizer181 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxBoxSizer* bSizer29;
-    bSizer29 = new wxBoxSizer( wxVERTICAL );
-
-    wxStaticBoxSizer* sbSizer7;
-    sbSizer7 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxEmptyString ), wxVERTICAL );
-
-    m_staticText1 = new wxStaticText( this, wxID_ANY, _("Select variant:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText1->Wrap( -1 );
-    m_staticText1->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
-
-    sbSizer7->Add( m_staticText1, 0, wxALL, 5 );
-
-    wxFlexGridSizer* fgSizer1;
-    fgSizer1 = new wxFlexGridSizer( 4, 3, 8, 5 );
-    fgSizer1->SetFlexibleDirection( wxHORIZONTAL );
-    fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-
-    m_radioBtnAutomatic = new wxRadioButton( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-    m_radioBtnAutomatic->SetValue( true );
-    m_radioBtnAutomatic->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
-
-    fgSizer1->Add( m_radioBtnAutomatic, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_buttonAutomatic = new wxButton( this, wxID_ANY, _("<Automatic>"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-    m_buttonAutomatic->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
-
-    fgSizer1->Add( m_buttonAutomatic, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-
-    m_staticText81 = new wxStaticText( this, wxID_ANY, _("Identify and propagate changes on both sides using a database. Deletions and conflicts are detected automatically."), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText81->Wrap( 400 );
-    fgSizer1->Add( m_staticText81, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-
-    m_radioBtnMirror = new wxRadioButton( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-    m_radioBtnMirror->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
-
-    fgSizer1->Add( m_radioBtnMirror, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_buttonOneWay = new wxButton( this, wxID_ANY, _("Mirror ->>"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-    m_buttonOneWay->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
-
-    fgSizer1->Add( m_buttonOneWay, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-
-    m_staticText8 = new wxStaticText( this, wxID_ANY, _("Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization."), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText8->Wrap( 400 );
-    fgSizer1->Add( m_staticText8, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_radioBtnUpdate = new wxRadioButton( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-    m_radioBtnUpdate->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
-
-    fgSizer1->Add( m_radioBtnUpdate, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_buttonUpdate = new wxButton( this, wxID_ANY, _("Update ->"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-    m_buttonUpdate->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
-
-    fgSizer1->Add( m_buttonUpdate, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-
-    m_staticText101 = new wxStaticText( this, wxID_ANY, _("Copy new or updated files to right folder."), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText101->Wrap( 400 );
-    fgSizer1->Add( m_staticText101, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-
-    m_radioBtnCustom = new wxRadioButton( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-    m_radioBtnCustom->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
-
-    fgSizer1->Add( m_radioBtnCustom, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_buttonUpdate1 = new wxButton( this, wxID_ANY, _("Custom"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-    m_buttonUpdate1->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
-
-    fgSizer1->Add( m_buttonUpdate1, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-
-    m_staticText9 = new wxStaticText( this, wxID_ANY, _("Configure your own synchronization rules."), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText9->Wrap( 400 );
-    fgSizer1->Add( m_staticText9, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-
-    sbSizer7->Add( fgSizer1, 0, 0, 5 );
-
-    bSizer29->Add( sbSizer7, 0, wxEXPAND, 5 );
-
-
-    bSizer29->Add( 0, 5, 1, 0, 5 );
-
-    bSizer201 = new wxBoxSizer( wxHORIZONTAL );
-
-    sbSizerErrorHandling = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Error handling") ), wxHORIZONTAL );
-
-    wxArrayString m_choiceHandleErrorChoices;
-    m_choiceHandleError = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceHandleErrorChoices, 0 );
-    m_choiceHandleError->SetSelection( 0 );
-    sbSizerErrorHandling->Add( m_choiceHandleError, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizer201->Add( sbSizerErrorHandling, 0, wxEXPAND|wxRIGHT, 10 );
-
-    sbSizerCustDelDir = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Deletion handling") ), wxVERTICAL );
-
-    wxArrayString m_choiceHandleDeletionChoices;
-    m_choiceHandleDeletion = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceHandleDeletionChoices, 0 );
-    m_choiceHandleDeletion->SetSelection( 0 );
-    sbSizerCustDelDir->Add( m_choiceHandleDeletion, 0, wxBOTTOM, 5 );
-
-    m_panelCustomDeletionDir = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    wxBoxSizer* bSizer1151;
-    bSizer1151 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_customDelFolder = new FolderHistoryBox( m_panelCustomDeletionDir, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
-    bSizer1151->Add( m_customDelFolder, 1, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_dirPickerCustomDelFolder = new FfsDirPickerCtrl( m_panelCustomDeletionDir, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer1151->Add( m_dirPickerCustomDelFolder, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_panelCustomDeletionDir->SetSizer( bSizer1151 );
-    m_panelCustomDeletionDir->Layout();
-    bSizer1151->Fit( m_panelCustomDeletionDir );
-    sbSizerCustDelDir->Add( m_panelCustomDeletionDir, 0, wxEXPAND, 5 );
-
-    bSizer201->Add( sbSizerCustDelDir, 1, wxEXPAND, 5 );
-
-    bSizer29->Add( bSizer201, 0, wxTOP|wxBOTTOM|wxEXPAND, 5 );
-
-    wxBoxSizer* bSizer291;
-    bSizer291 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_buttonOK = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-    m_buttonOK->SetDefault();
-    m_buttonOK->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
-
-    bSizer291->Add( m_buttonOK, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
-
-    m_button16 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-    m_button16->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-
-    bSizer291->Add( m_button16, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizer291->Add( 20, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizer29->Add( bSizer291, 0, wxEXPAND, 5 );
-
-    bSizer181->Add( bSizer29, 0, wxEXPAND, 5 );
-
-
-    bSizer181->Add( 10, 0, 0, 0, 5 );
-
-    wxStaticBoxSizer* sbSizer2453245;
-    sbSizer2453245 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Configuration") ), wxVERTICAL );
-
-
-    sbSizer2453245->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    m_bitmapDatabase = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 70,70 ), 0 );
-    sbSizer2453245->Add( m_bitmapDatabase, 1, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 10 );
-
-    sbSizerSyncDirections = new wxBoxSizer( wxVERTICAL );
-
-    wxGridSizer* gSizer3;
-    gSizer3 = new wxGridSizer( 1, 2, 0, 5 );
-
-    m_staticText21 = new wxStaticText( this, wxID_ANY, _("Category"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText21->Wrap( -1 );
-    m_staticText21->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
-
-    gSizer3->Add( m_staticText21, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_staticText31 = new wxStaticText( this, wxID_ANY, _("Action"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText31->Wrap( -1 );
-    m_staticText31->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
-
-    gSizer3->Add( m_staticText31, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    sbSizerSyncDirections->Add( gSizer3, 0, wxEXPAND, 5 );
-
-    m_staticline3 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    sbSizerSyncDirections->Add( m_staticline3, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP|wxBOTTOM, 5 );
-
-    wxBoxSizer* bSizer121;
-    bSizer121 = new wxBoxSizer( wxVERTICAL );
-
-    bSizerLeftOnly = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bitmapLeftOnly = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
-    m_bitmapLeftOnly->SetToolTip( _("File/folder exists on left side only") );
-
-    bSizerLeftOnly->Add( m_bitmapLeftOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizerLeftOnly->Add( 5, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_bpButtonLeftOnly = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-    bSizerLeftOnly->Add( m_bpButtonLeftOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizer121->Add( bSizerLeftOnly, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    bSizerRightOnly = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bitmapRightOnly = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
-    m_bitmapRightOnly->SetToolTip( _("File/folder exists on right side only") );
-
-    bSizerRightOnly->Add( m_bitmapRightOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizerRightOnly->Add( 5, 0, 0, 0, 5 );
-
-    m_bpButtonRightOnly = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-    bSizerRightOnly->Add( m_bpButtonRightOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizer121->Add( bSizerRightOnly, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    bSizerLeftNewer = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bitmapLeftNewer = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
-    m_bitmapLeftNewer->SetToolTip( _("Left file is newer") );
-
-    bSizerLeftNewer->Add( m_bitmapLeftNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizerLeftNewer->Add( 5, 0, 0, 0, 5 );
-
-    m_bpButtonLeftNewer = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-    bSizerLeftNewer->Add( m_bpButtonLeftNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizer121->Add( bSizerLeftNewer, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    bSizerRightNewer = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bitmapRightNewer = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
-    m_bitmapRightNewer->SetToolTip( _("Right file is newer") );
-
-    bSizerRightNewer->Add( m_bitmapRightNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizerRightNewer->Add( 5, 0, 0, 0, 5 );
-
-    m_bpButtonRightNewer = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-    bSizerRightNewer->Add( m_bpButtonRightNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizer121->Add( bSizerRightNewer, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    bSizerDifferent = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bitmapDifferent = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
-    m_bitmapDifferent->SetToolTip( _("Files have different content") );
-
-    bSizerDifferent->Add( m_bitmapDifferent, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizerDifferent->Add( 5, 0, 0, 0, 5 );
-
-    m_bpButtonDifferent = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-    bSizerDifferent->Add( m_bpButtonDifferent, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizer121->Add( bSizerDifferent, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    bSizerConflict = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bitmapConflict = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
-    m_bitmapConflict->SetToolTip( _("Conflict/file cannot be categorized") );
-
-    bSizerConflict->Add( m_bitmapConflict, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizerConflict->Add( 5, 0, 0, 0, 5 );
-
-    m_bpButtonConflict = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-    bSizerConflict->Add( m_bpButtonConflict, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizer121->Add( bSizerConflict, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    sbSizerSyncDirections->Add( bSizer121, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    sbSizer2453245->Add( sbSizerSyncDirections, 0, wxEXPAND, 5 );
-
-
-    sbSizer2453245->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    bSizer181->Add( sbSizer2453245, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    bSizer7->Add( bSizer181, 0, wxALL, 5 );
-
-    this->SetSizer( bSizer7 );
-    this->Layout();
-    bSizer7->Fit( this );
-
-    this->Centre( wxBOTH );
-
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SyncCfgDlgGenerated::OnClose ) );
-    m_radioBtnAutomatic->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncAutomatic ), NULL, this );
-    m_buttonAutomatic->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncAutomatic ), NULL, this );
-    m_buttonAutomatic->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncAutomaticDouble ), NULL, this );
-    m_radioBtnMirror->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncMirror ), NULL, this );
-    m_buttonOneWay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncMirror ), NULL, this );
-    m_buttonOneWay->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncMirrorDouble ), NULL, this );
-    m_radioBtnUpdate->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncUpdate ), NULL, this );
-    m_buttonUpdate->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncUpdate ), NULL, this );
-    m_buttonUpdate->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncUpdateDouble ), NULL, this );
-    m_radioBtnCustom->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncCustom ), NULL, this );
-    m_buttonUpdate1->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncCustom ), NULL, this );
-    m_buttonUpdate1->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncCustomDouble ), NULL, this );
-    m_choiceHandleError->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnChangeErrorHandling ), NULL, this );
-    m_choiceHandleDeletion->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnChangeDeletionHandling ), NULL, this );
-    m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnApply ), NULL, this );
-    m_button16->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnCancel ), NULL, this );
-    m_bpButtonLeftOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnExLeftSideOnly ), NULL, this );
-    m_bpButtonRightOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnExRightSideOnly ), NULL, this );
-    m_bpButtonLeftNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnLeftNewer ), NULL, this );
-    m_bpButtonRightNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnRightNewer ), NULL, this );
-    m_bpButtonDifferent->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnDifferent ), NULL, this );
-    m_bpButtonConflict->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnConflict ), NULL, this );
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	
+	wxBoxSizer* bSizer7;
+	bSizer7 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer181;
+	bSizer181 = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxBoxSizer* bSizer29;
+	bSizer29 = new wxBoxSizer( wxVERTICAL );
+	
+	wxStaticBoxSizer* sbSizer7;
+	sbSizer7 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxEmptyString ), wxVERTICAL );
+	
+	m_staticText1 = new wxStaticText( this, wxID_ANY, _("Select variant:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText1->Wrap( -1 );
+	m_staticText1->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
+	
+	sbSizer7->Add( m_staticText1, 0, wxALL, 5 );
+	
+	wxFlexGridSizer* fgSizer1;
+	fgSizer1 = new wxFlexGridSizer( 4, 3, 8, 5 );
+	fgSizer1->SetFlexibleDirection( wxHORIZONTAL );
+	fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	
+	m_radioBtnAutomatic = new wxRadioButton( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_radioBtnAutomatic->SetValue( true ); 
+	m_radioBtnAutomatic->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
+	
+	fgSizer1->Add( m_radioBtnAutomatic, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_buttonAutomatic = new wxButton( this, wxID_ANY, _("<Automatic>"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_buttonAutomatic->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
+	
+	fgSizer1->Add( m_buttonAutomatic, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	
+	m_staticText81 = new wxStaticText( this, wxID_ANY, _("Identify and propagate changes on both sides using a database. Deletions and conflicts are detected automatically."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText81->Wrap( 400 );
+	fgSizer1->Add( m_staticText81, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+	
+	m_radioBtnMirror = new wxRadioButton( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_radioBtnMirror->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
+	
+	fgSizer1->Add( m_radioBtnMirror, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_buttonOneWay = new wxButton( this, wxID_ANY, _("Mirror ->>"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_buttonOneWay->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
+	
+	fgSizer1->Add( m_buttonOneWay, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	
+	m_staticText8 = new wxStaticText( this, wxID_ANY, _("Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText8->Wrap( 400 );
+	fgSizer1->Add( m_staticText8, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_radioBtnUpdate = new wxRadioButton( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_radioBtnUpdate->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
+	
+	fgSizer1->Add( m_radioBtnUpdate, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_buttonUpdate = new wxButton( this, wxID_ANY, _("Update ->"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_buttonUpdate->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
+	
+	fgSizer1->Add( m_buttonUpdate, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	
+	m_staticText101 = new wxStaticText( this, wxID_ANY, _("Copy new or updated files to right folder."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText101->Wrap( 400 );
+	fgSizer1->Add( m_staticText101, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+	
+	m_radioBtnCustom = new wxRadioButton( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_radioBtnCustom->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
+	
+	fgSizer1->Add( m_radioBtnCustom, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_buttonUpdate1 = new wxButton( this, wxID_ANY, _("Custom"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_buttonUpdate1->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
+	
+	fgSizer1->Add( m_buttonUpdate1, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	
+	m_staticText9 = new wxStaticText( this, wxID_ANY, _("Configure your own synchronization rules."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText9->Wrap( 400 );
+	fgSizer1->Add( m_staticText9, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+	
+	sbSizer7->Add( fgSizer1, 0, 0, 5 );
+	
+	bSizer29->Add( sbSizer7, 0, wxEXPAND, 5 );
+	
+	
+	bSizer29->Add( 0, 5, 1, 0, 5 );
+	
+	bSizer201 = new wxBoxSizer( wxHORIZONTAL );
+	
+	sbSizerErrorHandling = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Error handling") ), wxHORIZONTAL );
+	
+	wxArrayString m_choiceHandleErrorChoices;
+	m_choiceHandleError = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceHandleErrorChoices, 0 );
+	m_choiceHandleError->SetSelection( 0 );
+	sbSizerErrorHandling->Add( m_choiceHandleError, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizer201->Add( sbSizerErrorHandling, 0, wxEXPAND|wxRIGHT, 10 );
+	
+	sbSizerCustDelDir = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Deletion handling") ), wxVERTICAL );
+	
+	wxArrayString m_choiceHandleDeletionChoices;
+	m_choiceHandleDeletion = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceHandleDeletionChoices, 0 );
+	m_choiceHandleDeletion->SetSelection( 0 );
+	sbSizerCustDelDir->Add( m_choiceHandleDeletion, 0, wxBOTTOM, 5 );
+	
+	m_panelCustomDeletionDir = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer1151;
+	bSizer1151 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_customDelFolder = new FolderHistoryBox( m_panelCustomDeletionDir, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
+	bSizer1151->Add( m_customDelFolder, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_dirPickerCustomDelFolder = new zen::DirPickerCtrl( m_panelCustomDeletionDir, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer1151->Add( m_dirPickerCustomDelFolder, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_panelCustomDeletionDir->SetSizer( bSizer1151 );
+	m_panelCustomDeletionDir->Layout();
+	bSizer1151->Fit( m_panelCustomDeletionDir );
+	sbSizerCustDelDir->Add( m_panelCustomDeletionDir, 0, wxEXPAND, 5 );
+	
+	bSizer201->Add( sbSizerCustDelDir, 1, wxEXPAND, 5 );
+	
+	bSizer29->Add( bSizer201, 0, wxTOP|wxBOTTOM|wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer291;
+	bSizer291 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_buttonOK = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+	m_buttonOK->SetDefault(); 
+	m_buttonOK->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
+	
+	bSizer291->Add( m_buttonOK, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+	
+	m_button16 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+	m_button16->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+	
+	bSizer291->Add( m_button16, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizer291->Add( 20, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizer29->Add( bSizer291, 0, wxEXPAND, 5 );
+	
+	bSizer181->Add( bSizer29, 0, wxEXPAND, 5 );
+	
+	
+	bSizer181->Add( 10, 0, 0, 0, 5 );
+	
+	wxStaticBoxSizer* sbSizer2453245;
+	sbSizer2453245 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Configuration") ), wxVERTICAL );
+	
+	
+	sbSizer2453245->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	m_bitmapDatabase = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 70,70 ), 0 );
+	sbSizer2453245->Add( m_bitmapDatabase, 1, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 10 );
+	
+	sbSizerSyncDirections = new wxBoxSizer( wxVERTICAL );
+	
+	wxGridSizer* gSizer3;
+	gSizer3 = new wxGridSizer( 1, 2, 0, 5 );
+	
+	m_staticText21 = new wxStaticText( this, wxID_ANY, _("Category"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText21->Wrap( -1 );
+	m_staticText21->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
+	
+	gSizer3->Add( m_staticText21, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_staticText31 = new wxStaticText( this, wxID_ANY, _("Action"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText31->Wrap( -1 );
+	m_staticText31->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
+	
+	gSizer3->Add( m_staticText31, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	sbSizerSyncDirections->Add( gSizer3, 0, wxEXPAND, 5 );
+	
+	m_staticline3 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	sbSizerSyncDirections->Add( m_staticline3, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP|wxBOTTOM, 5 );
+	
+	wxBoxSizer* bSizer121;
+	bSizer121 = new wxBoxSizer( wxVERTICAL );
+	
+	bSizerLeftOnly = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmapLeftOnly = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
+	m_bitmapLeftOnly->SetToolTip( _("File/folder exists on left side only") );
+	
+	bSizerLeftOnly->Add( m_bitmapLeftOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizerLeftOnly->Add( 5, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_bpButtonLeftOnly = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
+	bSizerLeftOnly->Add( m_bpButtonLeftOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizer121->Add( bSizerLeftOnly, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	bSizerRightOnly = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmapRightOnly = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
+	m_bitmapRightOnly->SetToolTip( _("File/folder exists on right side only") );
+	
+	bSizerRightOnly->Add( m_bitmapRightOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizerRightOnly->Add( 5, 0, 0, 0, 5 );
+	
+	m_bpButtonRightOnly = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
+	bSizerRightOnly->Add( m_bpButtonRightOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizer121->Add( bSizerRightOnly, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	bSizerLeftNewer = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmapLeftNewer = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
+	m_bitmapLeftNewer->SetToolTip( _("Left file is newer") );
+	
+	bSizerLeftNewer->Add( m_bitmapLeftNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizerLeftNewer->Add( 5, 0, 0, 0, 5 );
+	
+	m_bpButtonLeftNewer = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
+	bSizerLeftNewer->Add( m_bpButtonLeftNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizer121->Add( bSizerLeftNewer, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	bSizerRightNewer = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmapRightNewer = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
+	m_bitmapRightNewer->SetToolTip( _("Right file is newer") );
+	
+	bSizerRightNewer->Add( m_bitmapRightNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizerRightNewer->Add( 5, 0, 0, 0, 5 );
+	
+	m_bpButtonRightNewer = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
+	bSizerRightNewer->Add( m_bpButtonRightNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizer121->Add( bSizerRightNewer, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	bSizerDifferent = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmapDifferent = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
+	m_bitmapDifferent->SetToolTip( _("Files have different content") );
+	
+	bSizerDifferent->Add( m_bitmapDifferent, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizerDifferent->Add( 5, 0, 0, 0, 5 );
+	
+	m_bpButtonDifferent = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
+	bSizerDifferent->Add( m_bpButtonDifferent, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizer121->Add( bSizerDifferent, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	bSizerConflict = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmapConflict = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
+	m_bitmapConflict->SetToolTip( _("Conflict/file cannot be categorized") );
+	
+	bSizerConflict->Add( m_bitmapConflict, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizerConflict->Add( 5, 0, 0, 0, 5 );
+	
+	m_bpButtonConflict = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
+	bSizerConflict->Add( m_bpButtonConflict, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizer121->Add( bSizerConflict, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	sbSizerSyncDirections->Add( bSizer121, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	sbSizer2453245->Add( sbSizerSyncDirections, 0, wxEXPAND, 5 );
+	
+	
+	sbSizer2453245->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	bSizer181->Add( sbSizer2453245, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	bSizer7->Add( bSizer181, 0, wxALL, 5 );
+	
+	this->SetSizer( bSizer7 );
+	this->Layout();
+	bSizer7->Fit( this );
+	
+	this->Centre( wxBOTH );
+	
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SyncCfgDlgGenerated::OnClose ) );
+	m_radioBtnAutomatic->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncAutomatic ), NULL, this );
+	m_buttonAutomatic->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncAutomatic ), NULL, this );
+	m_buttonAutomatic->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncAutomaticDouble ), NULL, this );
+	m_radioBtnMirror->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncMirror ), NULL, this );
+	m_buttonOneWay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncMirror ), NULL, this );
+	m_buttonOneWay->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncMirrorDouble ), NULL, this );
+	m_radioBtnUpdate->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncUpdate ), NULL, this );
+	m_buttonUpdate->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncUpdate ), NULL, this );
+	m_buttonUpdate->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncUpdateDouble ), NULL, this );
+	m_radioBtnCustom->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncCustom ), NULL, this );
+	m_buttonUpdate1->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncCustom ), NULL, this );
+	m_buttonUpdate1->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncCustomDouble ), NULL, this );
+	m_choiceHandleError->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnChangeErrorHandling ), NULL, this );
+	m_choiceHandleDeletion->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnChangeDeletionHandling ), NULL, this );
+	m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnApply ), NULL, this );
+	m_button16->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnCancel ), NULL, this );
+	m_bpButtonLeftOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnExLeftSideOnly ), NULL, this );
+	m_bpButtonRightOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnExRightSideOnly ), NULL, this );
+	m_bpButtonLeftNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnLeftNewer ), NULL, this );
+	m_bpButtonRightNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnRightNewer ), NULL, this );
+	m_bpButtonDifferent->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnDifferent ), NULL, this );
+	m_bpButtonConflict->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnConflict ), NULL, this );
 }
 
 SyncCfgDlgGenerated::~SyncCfgDlgGenerated()
 {
-    // Disconnect Events
-    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SyncCfgDlgGenerated::OnClose ) );
-    m_radioBtnAutomatic->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncAutomatic ), NULL, this );
-    m_buttonAutomatic->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncAutomatic ), NULL, this );
-    m_buttonAutomatic->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncAutomaticDouble ), NULL, this );
-    m_radioBtnMirror->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncMirror ), NULL, this );
-    m_buttonOneWay->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncMirror ), NULL, this );
-    m_buttonOneWay->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncMirrorDouble ), NULL, this );
-    m_radioBtnUpdate->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncUpdate ), NULL, this );
-    m_buttonUpdate->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncUpdate ), NULL, this );
-    m_buttonUpdate->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncUpdateDouble ), NULL, this );
-    m_radioBtnCustom->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncCustom ), NULL, this );
-    m_buttonUpdate1->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncCustom ), NULL, this );
-    m_buttonUpdate1->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncCustomDouble ), NULL, this );
-    m_choiceHandleError->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnChangeErrorHandling ), NULL, this );
-    m_choiceHandleDeletion->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnChangeDeletionHandling ), NULL, this );
-    m_buttonOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnApply ), NULL, this );
-    m_button16->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnCancel ), NULL, this );
-    m_bpButtonLeftOnly->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnExLeftSideOnly ), NULL, this );
-    m_bpButtonRightOnly->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnExRightSideOnly ), NULL, this );
-    m_bpButtonLeftNewer->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnLeftNewer ), NULL, this );
-    m_bpButtonRightNewer->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnRightNewer ), NULL, this );
-    m_bpButtonDifferent->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnDifferent ), NULL, this );
-    m_bpButtonConflict->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnConflict ), NULL, this );
-
+	// Disconnect Events
+	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SyncCfgDlgGenerated::OnClose ) );
+	m_radioBtnAutomatic->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncAutomatic ), NULL, this );
+	m_buttonAutomatic->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncAutomatic ), NULL, this );
+	m_buttonAutomatic->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncAutomaticDouble ), NULL, this );
+	m_radioBtnMirror->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncMirror ), NULL, this );
+	m_buttonOneWay->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncMirror ), NULL, this );
+	m_buttonOneWay->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncMirrorDouble ), NULL, this );
+	m_radioBtnUpdate->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncUpdate ), NULL, this );
+	m_buttonUpdate->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncUpdate ), NULL, this );
+	m_buttonUpdate->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncUpdateDouble ), NULL, this );
+	m_radioBtnCustom->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncCustom ), NULL, this );
+	m_buttonUpdate1->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncCustom ), NULL, this );
+	m_buttonUpdate1->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( SyncCfgDlgGenerated::OnSyncCustomDouble ), NULL, this );
+	m_choiceHandleError->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnChangeErrorHandling ), NULL, this );
+	m_choiceHandleDeletion->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnChangeDeletionHandling ), NULL, this );
+	m_buttonOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnApply ), NULL, this );
+	m_button16->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnCancel ), NULL, this );
+	m_bpButtonLeftOnly->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnExLeftSideOnly ), NULL, this );
+	m_bpButtonRightOnly->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnExRightSideOnly ), NULL, this );
+	m_bpButtonLeftNewer->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnLeftNewer ), NULL, this );
+	m_bpButtonRightNewer->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnRightNewer ), NULL, this );
+	m_bpButtonDifferent->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnDifferent ), NULL, this );
+	m_bpButtonConflict->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnConflict ), NULL, this );
+	
 }
 
 CmpCfgDlgGenerated::CmpCfgDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-
-    wxBoxSizer* bSizer136;
-    bSizer136 = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer55;
-    bSizer55 = new wxBoxSizer( wxVERTICAL );
-
-    wxStaticBoxSizer* sbSizer6;
-    sbSizer6 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Compare by...") ), wxHORIZONTAL );
-
-    wxFlexGridSizer* fgSizer16;
-    fgSizer16 = new wxFlexGridSizer( 2, 3, 0, 0 );
-    fgSizer16->SetFlexibleDirection( wxBOTH );
-    fgSizer16->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-
-    m_radioBtnSizeDate = new wxRadioButton( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
-    m_radioBtnSizeDate->SetValue( true );
-    m_radioBtnSizeDate->SetToolTip( _("Files are found equal if\n     - last write time and date\n     - file size\nare the same") );
-
-    fgSizer16->Add( m_radioBtnSizeDate, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_bitmapByTime = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    m_bitmapByTime->SetToolTip( _("Files are found equal if\n     - last write time and date\n     - file size\nare the same") );
-
-    fgSizer16->Add( m_bitmapByTime, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_buttonTimeSize = new wxButton( this, wxID_ANY, _("File time and size"), wxDefaultPosition, wxSize( -1,42 ), 0 );
-    m_buttonTimeSize->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
-    m_buttonTimeSize->SetToolTip( _("Files are found equal if\n     - last write time and date\n     - file size\nare the same") );
-
-    fgSizer16->Add( m_buttonTimeSize, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALL, 5 );
-
-    m_radioBtnContent = new wxRadioButton( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-    m_radioBtnContent->SetToolTip( _("Files are found equal if\n     - file content\nis the same") );
-
-    fgSizer16->Add( m_radioBtnContent, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_bitmapByContent = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    m_bitmapByContent->SetToolTip( _("Files are found equal if\n     - file content\nis the same") );
-
-    fgSizer16->Add( m_bitmapByContent, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_buttonContent = new wxButton( this, wxID_ANY, _("File content"), wxDefaultPosition, wxSize( -1,42 ), 0 );
-    m_buttonContent->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
-    m_buttonContent->SetToolTip( _("Files are found equal if\n     - file content\nis the same") );
-
-    fgSizer16->Add( m_buttonContent, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
-    sbSizer6->Add( fgSizer16, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-
-    bSizer55->Add( sbSizer6, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 2 );
-
-
-    bSizer55->Add( 0, 4, 0, 0, 5 );
-
-    wxBoxSizer* bSizer177;
-    bSizer177 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxStaticBoxSizer* sbSizer25;
-    sbSizer25 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Symbolic Link handling") ), wxVERTICAL );
-
-    wxArrayString m_choiceHandleSymlinksChoices;
-    m_choiceHandleSymlinks = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceHandleSymlinksChoices, 0 );
-    m_choiceHandleSymlinks->SetSelection( -1 );
-    sbSizer25->Add( m_choiceHandleSymlinks, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    bSizer177->Add( sbSizer25, 1, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_bpButtonHelp = new wxBitmapButton( this, wxID_HELP, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-    m_bpButtonHelp->SetToolTip( _("Help") );
-
-    bSizer177->Add( m_bpButtonHelp, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-
-    bSizer55->Add( bSizer177, 0, wxEXPAND, 5 );
-
-    wxBoxSizer* bSizer22;
-    bSizer22 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_button10 = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-    m_button10->SetDefault();
-    m_button10->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
-
-    bSizer22->Add( m_button10, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
-
-    m_button6 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-    m_button6->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-
-    bSizer22->Add( m_button6, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizer55->Add( bSizer22, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    bSizer136->Add( bSizer55, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-    this->SetSizer( bSizer136 );
-    this->Layout();
-    bSizer136->Fit( this );
-
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CmpCfgDlgGenerated::OnClose ) );
-    m_radioBtnSizeDate->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( CmpCfgDlgGenerated::OnTimeSize ), NULL, this );
-    m_buttonTimeSize->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnTimeSize ), NULL, this );
-    m_buttonTimeSize->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( CmpCfgDlgGenerated::OnTimeSizeDouble ), NULL, this );
-    m_radioBtnContent->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( CmpCfgDlgGenerated::OnContent ), NULL, this );
-    m_buttonContent->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnContent ), NULL, this );
-    m_buttonContent->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( CmpCfgDlgGenerated::OnContentDouble ), NULL, this );
-    m_choiceHandleSymlinks->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( CmpCfgDlgGenerated::OnChangeErrorHandling ), NULL, this );
-    m_bpButtonHelp->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnShowHelp ), NULL, this );
-    m_button10->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnOkay ), NULL, this );
-    m_button6->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnCancel ), NULL, this );
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	
+	wxBoxSizer* bSizer136;
+	bSizer136 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer55;
+	bSizer55 = new wxBoxSizer( wxVERTICAL );
+	
+	wxStaticBoxSizer* sbSizer6;
+	sbSizer6 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Compare by...") ), wxHORIZONTAL );
+	
+	wxFlexGridSizer* fgSizer16;
+	fgSizer16 = new wxFlexGridSizer( 2, 3, 0, 0 );
+	fgSizer16->SetFlexibleDirection( wxBOTH );
+	fgSizer16->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	
+	m_radioBtnSizeDate = new wxRadioButton( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
+	m_radioBtnSizeDate->SetValue( true ); 
+	m_radioBtnSizeDate->SetToolTip( _("Files are found equal if\n     - last write time and date\n     - file size\nare the same") );
+	
+	fgSizer16->Add( m_radioBtnSizeDate, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_bitmapByTime = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	m_bitmapByTime->SetToolTip( _("Files are found equal if\n     - last write time and date\n     - file size\nare the same") );
+	
+	fgSizer16->Add( m_bitmapByTime, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_buttonTimeSize = new wxButton( this, wxID_ANY, _("File time and size"), wxDefaultPosition, wxSize( -1,42 ), 0 );
+	m_buttonTimeSize->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
+	m_buttonTimeSize->SetToolTip( _("Files are found equal if\n     - last write time and date\n     - file size\nare the same") );
+	
+	fgSizer16->Add( m_buttonTimeSize, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALL, 5 );
+	
+	m_radioBtnContent = new wxRadioButton( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_radioBtnContent->SetToolTip( _("Files are found equal if\n     - file content\nis the same") );
+	
+	fgSizer16->Add( m_radioBtnContent, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_bitmapByContent = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	m_bitmapByContent->SetToolTip( _("Files are found equal if\n     - file content\nis the same") );
+	
+	fgSizer16->Add( m_bitmapByContent, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_buttonContent = new wxButton( this, wxID_ANY, _("File content"), wxDefaultPosition, wxSize( -1,42 ), 0 );
+	m_buttonContent->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
+	m_buttonContent->SetToolTip( _("Files are found equal if\n     - file content\nis the same") );
+	
+	fgSizer16->Add( m_buttonContent, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	
+	sbSizer6->Add( fgSizer16, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	
+	bSizer55->Add( sbSizer6, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 2 );
+	
+	
+	bSizer55->Add( 0, 4, 0, 0, 5 );
+	
+	wxBoxSizer* bSizer177;
+	bSizer177 = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxStaticBoxSizer* sbSizer25;
+	sbSizer25 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Symbolic Link handling") ), wxVERTICAL );
+	
+	wxArrayString m_choiceHandleSymlinksChoices;
+	m_choiceHandleSymlinks = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceHandleSymlinksChoices, 0 );
+	m_choiceHandleSymlinks->SetSelection( -1 );
+	sbSizer25->Add( m_choiceHandleSymlinks, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	bSizer177->Add( sbSizer25, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_bpButtonHelp = new wxBitmapButton( this, wxID_HELP, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+	m_bpButtonHelp->SetToolTip( _("Help") );
+	
+	bSizer177->Add( m_bpButtonHelp, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+	
+	bSizer55->Add( bSizer177, 0, wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer22;
+	bSizer22 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_button10 = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+	m_button10->SetDefault(); 
+	m_button10->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
+	
+	bSizer22->Add( m_button10, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+	
+	m_button6 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+	m_button6->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+	
+	bSizer22->Add( m_button6, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizer55->Add( bSizer22, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	bSizer136->Add( bSizer55, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	this->SetSizer( bSizer136 );
+	this->Layout();
+	bSizer136->Fit( this );
+	
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CmpCfgDlgGenerated::OnClose ) );
+	m_radioBtnSizeDate->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( CmpCfgDlgGenerated::OnTimeSize ), NULL, this );
+	m_buttonTimeSize->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnTimeSize ), NULL, this );
+	m_buttonTimeSize->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( CmpCfgDlgGenerated::OnTimeSizeDouble ), NULL, this );
+	m_radioBtnContent->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( CmpCfgDlgGenerated::OnContent ), NULL, this );
+	m_buttonContent->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnContent ), NULL, this );
+	m_buttonContent->Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( CmpCfgDlgGenerated::OnContentDouble ), NULL, this );
+	m_choiceHandleSymlinks->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( CmpCfgDlgGenerated::OnChangeErrorHandling ), NULL, this );
+	m_bpButtonHelp->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnShowHelp ), NULL, this );
+	m_button10->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnOkay ), NULL, this );
+	m_button6->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnCancel ), NULL, this );
 }
 
 CmpCfgDlgGenerated::~CmpCfgDlgGenerated()
 {
-    // Disconnect Events
-    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CmpCfgDlgGenerated::OnClose ) );
-    m_radioBtnSizeDate->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( CmpCfgDlgGenerated::OnTimeSize ), NULL, this );
-    m_buttonTimeSize->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnTimeSize ), NULL, this );
-    m_buttonTimeSize->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( CmpCfgDlgGenerated::OnTimeSizeDouble ), NULL, this );
-    m_radioBtnContent->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( CmpCfgDlgGenerated::OnContent ), NULL, this );
-    m_buttonContent->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnContent ), NULL, this );
-    m_buttonContent->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( CmpCfgDlgGenerated::OnContentDouble ), NULL, this );
-    m_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_radioBtnSizeDate->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( CmpCfgDlgGenerated::OnTimeSize ), NULL, this );
+	m_buttonTimeSize->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnTimeSize ), NULL, this );
+	m_buttonTimeSize->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( CmpCfgDlgGenerated::OnTimeSizeDouble ), NULL, this );
+	m_radioBtnContent->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( CmpCfgDlgGenerated::OnContent ), NULL, this );
+	m_buttonContent->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnContent ), NULL, this );
+	m_buttonContent->Disconnect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( CmpCfgDlgGenerated::OnContentDouble ), NULL, this );
+	m_choiceHandleSymlinks->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( CmpCfgDlgGenerated::OnChangeErrorHandling ), NULL, this );
+	m_bpButtonHelp->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnShowHelp ), NULL, this );
+	m_button10->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnOkay ), NULL, this );
+	m_button6->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnCancel ), NULL, this );
+	
 }
 
 SyncStatusDlgGenerated::SyncStatusDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxFrame( parent, id, title, pos, size, style )
 {
-    this->SetSizeHints( wxSize( 470,300 ), wxDefaultSize );
-    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-
-    wxBoxSizer* bSizer27;
-    bSizer27 = new wxBoxSizer( wxVERTICAL );
-
-
-    bSizer27->Add( 0, 15, 0, wxEXPAND, 5 );
-
-    wxBoxSizer* bSizer37;
-    bSizer37 = new wxBoxSizer( wxHORIZONTAL );
-
-    bSizer27->Add( bSizer37, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    wxBoxSizer* bSizer42;
-    bSizer42 = new wxBoxSizer( wxHORIZONTAL );
-
-
-    bSizer42->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    m_bitmapStatus = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 28,28 ), 0 );
-    bSizer42->Add( m_bitmapStatus, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_staticTextStatus = new wxStaticText( this, wxID_ANY, _("Synchronizing..."), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextStatus->Wrap( -1 );
-    m_staticTextStatus->SetFont( wxFont( 14, 70, 90, 92, false, wxEmptyString ) );
-
-    bSizer42->Add( m_staticTextStatus, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-
-    m_animationControl1 = new wxAnimationCtrl( this, wxID_ANY, wxNullAnimation, wxDefaultPosition, wxDefaultSize, wxAC_DEFAULT_STYLE );
-    m_animationControl1->SetMinSize( wxSize( 45,45 ) );
-
-    bSizer42->Add( m_animationControl1, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-
-
-    bSizer42->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    bSizer27->Add( bSizer42, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    bSizer31 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxBoxSizer* bSizer111;
-    bSizer111 = new wxBoxSizer( wxVERTICAL );
-
-    bSizerObjectsRemaining = new wxBoxSizer( wxHORIZONTAL );
-
-    m_staticText25 = new wxStaticText( this, wxID_ANY, _("Elements remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText25->Wrap( -1 );
-    m_staticText25->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-
-    bSizerObjectsRemaining->Add( m_staticText25, 0, wxALIGN_BOTTOM, 5 );
-
-    m_staticTextRemainingObj = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-    m_staticTextRemainingObj->Wrap( -1 );
-    m_staticTextRemainingObj->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
-
-    bSizerObjectsRemaining->Add( m_staticTextRemainingObj, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
-
-    m_staticText96 = new wxStaticText( this, wxID_ANY, _("("), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText96->Wrap( -1 );
-    m_staticText96->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
-
-    bSizerObjectsRemaining->Add( m_staticText96, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
-
-    m_staticTextDataRemaining = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextDataRemaining->Wrap( -1 );
-    m_staticTextDataRemaining->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
-
-    bSizerObjectsRemaining->Add( m_staticTextDataRemaining, 0, wxALIGN_BOTTOM, 5 );
-
-    m_staticText97 = new wxStaticText( this, wxID_ANY, _(")"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText97->Wrap( -1 );
-    m_staticText97->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
-
-    bSizerObjectsRemaining->Add( m_staticText97, 0, wxALIGN_BOTTOM, 5 );
-
-    bSizer111->Add( bSizerObjectsRemaining, 0, 0, 5 );
-
-    bSizerObjectsProcessed = new wxBoxSizer( wxHORIZONTAL );
-
-    m_staticText251 = new wxStaticText( this, wxID_ANY, _("Elements processed:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText251->Wrap( -1 );
-    m_staticText251->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-
-    bSizerObjectsProcessed->Add( m_staticText251, 0, wxALIGN_BOTTOM, 5 );
-
-    m_staticTextProcessedObj = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-    m_staticTextProcessedObj->Wrap( -1 );
-    m_staticTextProcessedObj->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
-
-    bSizerObjectsProcessed->Add( m_staticTextProcessedObj, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
-
-    m_staticText98 = new wxStaticText( this, wxID_ANY, _("("), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText98->Wrap( -1 );
-    m_staticText98->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
-
-    bSizerObjectsProcessed->Add( m_staticText98, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
-
-    m_staticTextDataProcessed = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextDataProcessed->Wrap( -1 );
-    m_staticTextDataProcessed->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
-
-    bSizerObjectsProcessed->Add( m_staticTextDataProcessed, 0, wxALIGN_BOTTOM, 5 );
-
-    m_staticText99 = new wxStaticText( this, wxID_ANY, _(")"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText99->Wrap( -1 );
-    m_staticText99->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
-
-    bSizerObjectsProcessed->Add( m_staticText99, 0, wxALIGN_BOTTOM, 5 );
-
-    bSizer111->Add( bSizerObjectsProcessed, 0, 0, 5 );
-
-    bSizer31->Add( bSizer111, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizer31->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    wxBoxSizer* bSizer114;
-    bSizer114 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_staticText55 = new wxStaticText( this, wxID_ANY, _("Time elapsed:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText55->Wrap( -1 );
-    m_staticText55->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-
-    bSizer114->Add( m_staticText55, 0, wxALIGN_BOTTOM, 5 );
-
-    m_staticTextTimeElapsed = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextTimeElapsed->Wrap( -1 );
-    m_staticTextTimeElapsed->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
-
-    bSizer114->Add( m_staticTextTimeElapsed, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
-
-    bSizer31->Add( bSizer114, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizer27->Add( bSizer31, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
-    bSizerProgressText = new wxBoxSizer( wxVERTICAL );
-
-    m_textCtrlInfo = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY );
-    m_textCtrlInfo->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-
-    bSizerProgressText->Add( m_textCtrlInfo, 3, wxEXPAND|wxALL, 5 );
-
-    bSizer27->Add( bSizerProgressText, 1, wxEXPAND, 5 );
-
-    m_gauge1 = new wxGauge( this, wxID_ANY, 100, wxDefaultPosition, wxSize( -1,14 ), wxGA_HORIZONTAL );
-    bSizer27->Add( m_gauge1, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
-    bSizer28 = new wxBoxSizer( wxHORIZONTAL );
-
-    bSizerSpeed = new wxBoxSizer( wxHORIZONTAL );
-
-    m_staticText108 = new wxStaticText( this, wxID_ANY, _("Speed:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText108->Wrap( -1 );
-    m_staticText108->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-
-    bSizerSpeed->Add( m_staticText108, 0, wxALIGN_BOTTOM, 5 );
-
-    m_staticTextSpeed = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextSpeed->Wrap( -1 );
-    m_staticTextSpeed->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
-
-    bSizerSpeed->Add( m_staticTextSpeed, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
-
-
-    bSizerSpeed->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizer28->Add( bSizerSpeed, 1, wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizer28->Add( 0, 0, 1, 0, 5 );
-
-    m_buttonOK = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( 100,32 ), 0 );
-    m_buttonOK->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-    m_buttonOK->Enable( false );
-    m_buttonOK->Hide();
-
-    bSizer28->Add( m_buttonOK, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-
-    m_buttonPause = new wxButton( this, wxID_ANY, _("&Pause"), wxDefaultPosition, wxSize( 100,32 ), 0 );
-    m_buttonPause->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-
-    bSizer28->Add( m_buttonPause, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-
-    m_buttonAbort = new wxButton( this, wxID_CANCEL, _("&Abort"), wxDefaultPosition, wxSize( 100,32 ), 0 );
-    m_buttonAbort->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-
-    bSizer28->Add( m_buttonAbort, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-
-
-    bSizer28->Add( 0, 0, 1, 0, 5 );
-
-    bSizerRemTime = new wxBoxSizer( wxHORIZONTAL );
-
-
-    bSizerRemTime->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_staticText21 = new wxStaticText( this, wxID_ANY, _("Time remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText21->Wrap( -1 );
-    m_staticText21->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-
-    bSizerRemTime->Add( m_staticText21, 0, wxALIGN_BOTTOM, 5 );
-
-    m_staticTextTimeRemaining = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextTimeRemaining->Wrap( -1 );
-    m_staticTextTimeRemaining->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
-
-    bSizerRemTime->Add( m_staticTextTimeRemaining, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
-
-    bSizer28->Add( bSizerRemTime, 1, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizer27->Add( bSizer28, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxALL, 5 );
-
-
-    bSizer27->Add( 0, 5, 0, wxEXPAND, 5 );
-
-    this->SetSizer( bSizer27 );
-    this->Layout();
-
-    this->Centre( wxBOTH );
-
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SyncStatusDlgGenerated::OnClose ) );
-    this->Connect( wxEVT_ICONIZE, wxIconizeEventHandler( SyncStatusDlgGenerated::OnIconize ) );
-    m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncStatusDlgGenerated::OnOkay ), NULL, this );
-    m_buttonPause->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncStatusDlgGenerated::OnPause ), NULL, this );
-    m_buttonAbort->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncStatusDlgGenerated::OnAbort ), NULL, this );
+	this->SetSizeHints( wxSize( 470,200 ), wxDefaultSize );
+	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+	
+	bSizer27 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer42;
+	bSizer42 = new wxBoxSizer( wxHORIZONTAL );
+	
+	
+	bSizer42->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	m_bitmapStatus = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 28,28 ), 0 );
+	bSizer42->Add( m_bitmapStatus, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
+	
+	m_staticTextStatus = new wxStaticText( this, wxID_ANY, _("Synchronizing..."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextStatus->Wrap( -1 );
+	m_staticTextStatus->SetFont( wxFont( 14, 70, 90, 92, false, wxEmptyString ) );
+	
+	bSizer42->Add( m_staticTextStatus, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_animationControl1 = new wxAnimationCtrl( this, wxID_ANY, wxNullAnimation, wxDefaultPosition, wxDefaultSize, wxAC_DEFAULT_STYLE ); 
+	m_animationControl1->SetMinSize( wxSize( 45,45 ) );
+	
+	bSizer42->Add( m_animationControl1, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+	
+	
+	bSizer42->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	bSizer27->Add( bSizer42, 0, wxEXPAND, 5 );
+	
+	bSizerCurrentOperation = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_staticText2511 = new wxStaticText( this, wxID_ANY, _("Operation:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText2511->Wrap( -1 );
+	m_staticText2511->SetFont( wxFont( 10, 74, 90, 92, false, wxT("Tahoma") ) );
+	
+	bSizerCurrentOperation->Add( m_staticText2511, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_textCtrlInfo = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
+	m_textCtrlInfo->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+	
+	bSizerCurrentOperation->Add( m_textCtrlInfo, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizer27->Add( bSizerCurrentOperation, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
+	
+	bSizerHoldStretch = new wxBoxSizer( wxVERTICAL );
+	
+	bSizer27->Add( bSizerHoldStretch, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 );
+	
+	bSizerProgressMain = new wxBoxSizer( wxHORIZONTAL );
+	
+	bSizerProgressStat = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxEmptyString ), wxHORIZONTAL );
+	
+	wxFlexGridSizer* fgSizer10;
+	fgSizer10 = new wxFlexGridSizer( 0, 2, 0, 10 );
+	fgSizer10->SetFlexibleDirection( wxBOTH );
+	fgSizer10->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	
+	m_staticTextItemsRem = new wxStaticText( this, wxID_ANY, _("Items remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextItemsRem->Wrap( -1 );
+	m_staticTextItemsRem->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+	
+	fgSizer10->Add( m_staticTextItemsRem, 0, wxALIGN_BOTTOM, 5 );
+	
+	bSizerItemsRem = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_staticTextRemainingObj = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_staticTextRemainingObj->Wrap( -1 );
+	m_staticTextRemainingObj->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
+	
+	bSizerItemsRem->Add( m_staticTextRemainingObj, 0, wxALIGN_BOTTOM, 5 );
+	
+	m_staticText96 = new wxStaticText( this, wxID_ANY, _("("), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText96->Wrap( -1 );
+	m_staticText96->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
+	
+	bSizerItemsRem->Add( m_staticText96, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
+	
+	m_staticTextDataRemaining = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextDataRemaining->Wrap( -1 );
+	m_staticTextDataRemaining->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
+	
+	bSizerItemsRem->Add( m_staticTextDataRemaining, 0, wxALIGN_BOTTOM, 5 );
+	
+	m_staticText97 = new wxStaticText( this, wxID_ANY, _(")"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText97->Wrap( -1 );
+	m_staticText97->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
+	
+	bSizerItemsRem->Add( m_staticText97, 0, wxALIGN_BOTTOM, 5 );
+	
+	fgSizer10->Add( bSizerItemsRem, 0, wxALIGN_BOTTOM, 5 );
+	
+	m_staticTextSpeedDescr = new wxStaticText( this, wxID_ANY, _("Speed:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextSpeedDescr->Wrap( -1 );
+	m_staticTextSpeedDescr->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+	
+	fgSizer10->Add( m_staticTextSpeedDescr, 0, wxALIGN_BOTTOM, 5 );
+	
+	m_staticTextSpeed = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextSpeed->Wrap( -1 );
+	m_staticTextSpeed->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
+	
+	fgSizer10->Add( m_staticTextSpeed, 0, wxALIGN_BOTTOM, 5 );
+	
+	m_staticText55 = new wxStaticText( this, wxID_ANY, _("Time elapsed:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText55->Wrap( -1 );
+	m_staticText55->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+	
+	fgSizer10->Add( m_staticText55, 0, wxALIGN_BOTTOM, 5 );
+	
+	m_staticTextTimeElapsed = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextTimeElapsed->Wrap( -1 );
+	m_staticTextTimeElapsed->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
+	
+	fgSizer10->Add( m_staticTextTimeElapsed, 0, wxALIGN_BOTTOM, 5 );
+	
+	m_staticTextRemTimeDescr = new wxStaticText( this, wxID_ANY, _("Time remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextRemTimeDescr->Wrap( -1 );
+	m_staticTextRemTimeDescr->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+	
+	fgSizer10->Add( m_staticTextRemTimeDescr, 0, wxALIGN_BOTTOM, 5 );
+	
+	m_staticTextRemTime = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextRemTime->Wrap( -1 );
+	m_staticTextRemTime->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
+	
+	fgSizer10->Add( m_staticTextRemTime, 0, wxALIGN_BOTTOM, 5 );
+	
+	bSizerProgressStat->Add( fgSizer10, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	bSizerProgressMain->Add( bSizerProgressStat, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
+	
+	
+	bSizerProgressMain->Add( 10, 0, 0, 0, 5 );
+	
+	m_panelGraph = new zen::Graph2D( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	m_panelGraph->SetBackgroundColour( wxColour( 255, 255, 255 ) );
+	
+	bSizerProgressMain->Add( m_panelGraph, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP, 5 );
+	
+	bSizer27->Add( bSizerProgressMain, 1, wxEXPAND|wxRIGHT|wxLEFT, 5 );
+	
+	bSizerFinalStat = new wxBoxSizer( wxVERTICAL );
+	
+	m_listbookResult = new wxListbook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLB_TOP );
+	#ifndef __WXGTK__ // Small icon style not supported in GTK
+	wxListView* m_listbookResultListView = m_listbookResult->GetListView();
+	long m_listbookResultFlags = m_listbookResultListView->GetWindowStyleFlag();
+	m_listbookResultFlags = ( m_listbookResultFlags & ~wxLC_ICON ) | wxLC_SMALL_ICON;
+	m_listbookResultListView->SetWindowStyleFlag( m_listbookResultFlags );
+	#endif
+	
+	bSizerFinalStat->Add( m_listbookResult, 1, wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer182;
+	bSizer182 = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxBoxSizer* bSizer180;
+	bSizer180 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_staticTextItemsProc = new wxStaticText( this, wxID_ANY, _("Items processed:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextItemsProc->Wrap( -1 );
+	m_staticTextItemsProc->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+	
+	bSizer180->Add( m_staticTextItemsProc, 0, wxALIGN_BOTTOM, 5 );
+	
+	
+	bSizer180->Add( 10, 0, 0, 0, 5 );
+	
+	bSizerItemsProc = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_staticTextProcessedObj = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+	m_staticTextProcessedObj->Wrap( -1 );
+	m_staticTextProcessedObj->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
+	
+	bSizerItemsProc->Add( m_staticTextProcessedObj, 0, wxALIGN_BOTTOM, 5 );
+	
+	m_staticText98 = new wxStaticText( this, wxID_ANY, _("("), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText98->Wrap( -1 );
+	m_staticText98->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
+	
+	bSizerItemsProc->Add( m_staticText98, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
+	
+	m_staticTextDataProcessed = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextDataProcessed->Wrap( -1 );
+	m_staticTextDataProcessed->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
+	
+	bSizerItemsProc->Add( m_staticTextDataProcessed, 0, wxALIGN_BOTTOM, 5 );
+	
+	m_staticText99 = new wxStaticText( this, wxID_ANY, _(")"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText99->Wrap( -1 );
+	m_staticText99->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
+	
+	bSizerItemsProc->Add( m_staticText99, 0, wxALIGN_BOTTOM, 5 );
+	
+	bSizer180->Add( bSizerItemsProc, 0, wxALIGN_BOTTOM, 5 );
+	
+	bSizer182->Add( bSizer180, 0, wxALIGN_BOTTOM, 5 );
+	
+	
+	bSizer182->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer181;
+	bSizer181 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_staticText551 = new wxStaticText( this, wxID_ANY, _("Time elapsed:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText551->Wrap( -1 );
+	m_staticText551->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+	
+	bSizer181->Add( m_staticText551, 0, wxALIGN_BOTTOM, 5 );
+	
+	
+	bSizer181->Add( 10, 0, 0, 0, 5 );
+	
+	m_staticTextTimeTotal = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextTimeTotal->Wrap( -1 );
+	m_staticTextTimeTotal->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
+	
+	bSizer181->Add( m_staticTextTimeTotal, 0, wxALIGN_BOTTOM, 5 );
+	
+	bSizer182->Add( bSizer181, 0, wxALIGN_BOTTOM, 5 );
+	
+	bSizerFinalStat->Add( bSizer182, 0, wxEXPAND, 5 );
+	
+	bSizer27->Add( bSizerFinalStat, 1, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+	
+	m_gauge1 = new wxGauge( this, wxID_ANY, 100, wxDefaultPosition, wxSize( -1,14 ), wxGA_HORIZONTAL );
+	bSizer27->Add( m_gauge1, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
+	
+	bSizer28 = new wxBoxSizer( wxHORIZONTAL );
+	
+	
+	bSizer28->Add( 0, 0, 1, 0, 5 );
+	
+	m_buttonOK = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( 100,32 ), 0 );
+	m_buttonOK->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+	m_buttonOK->Enable( false );
+	m_buttonOK->Hide();
+	
+	bSizer28->Add( m_buttonOK, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	m_buttonPause = new wxButton( this, wxID_ANY, _("&Pause"), wxDefaultPosition, wxSize( 100,32 ), 0 );
+	m_buttonPause->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+	
+	bSizer28->Add( m_buttonPause, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_buttonAbort = new wxButton( this, wxID_CANCEL, _("&Abort"), wxDefaultPosition, wxSize( 100,32 ), 0 );
+	m_buttonAbort->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+	
+	bSizer28->Add( m_buttonAbort, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizer28->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	bSizer27->Add( bSizer28, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 5 );
+	
+	this->SetSizer( bSizer27 );
+	this->Layout();
+	
+	this->Centre( wxBOTH );
+	
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SyncStatusDlgGenerated::OnClose ) );
+	this->Connect( wxEVT_ICONIZE, wxIconizeEventHandler( SyncStatusDlgGenerated::OnIconize ) );
+	m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncStatusDlgGenerated::OnOkay ), NULL, this );
+	m_buttonPause->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncStatusDlgGenerated::OnPause ), NULL, this );
+	m_buttonAbort->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncStatusDlgGenerated::OnAbort ), NULL, this );
 }
 
 SyncStatusDlgGenerated::~SyncStatusDlgGenerated()
 {
-    // Disconnect Events
-    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SyncStatusDlgGenerated::OnClose ) );
-    this->Disconnect( wxEVT_ICONIZE, wxIconizeEventHandler( SyncStatusDlgGenerated::OnIconize ) );
-    m_buttonOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncStatusDlgGenerated::OnOkay ), NULL, this );
-    m_buttonPause->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncStatusDlgGenerated::OnPause ), NULL, this );
-    m_buttonAbort->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncStatusDlgGenerated::OnAbort ), NULL, this );
-
+	// Disconnect Events
+	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SyncStatusDlgGenerated::OnClose ) );
+	this->Disconnect( wxEVT_ICONIZE, wxIconizeEventHandler( SyncStatusDlgGenerated::OnIconize ) );
+	m_buttonOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncStatusDlgGenerated::OnOkay ), NULL, this );
+	m_buttonPause->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncStatusDlgGenerated::OnPause ), NULL, this );
+	m_buttonAbort->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncStatusDlgGenerated::OnAbort ), NULL, this );
+	
 }
 
 LogControlGenerated::LogControlGenerated( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
 {
-    wxBoxSizer* bSizer153;
-    bSizer153 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxBoxSizer* bSizer154;
-    bSizer154 = new wxBoxSizer( wxVERTICAL );
-
-    m_bpButtonErrors = new ToggleButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), wxBU_AUTODRAW );
-    bSizer154->Add( m_bpButtonErrors, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_bpButtonWarnings = new ToggleButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), wxBU_AUTODRAW );
-    bSizer154->Add( m_bpButtonWarnings, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_bpButtonInfo = new ToggleButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), wxBU_AUTODRAW );
-    bSizer154->Add( m_bpButtonInfo, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    bSizer153->Add( bSizer154, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_textCtrlInfo = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_DONTWRAP|wxTE_MULTILINE|wxTE_READONLY );
-    m_textCtrlInfo->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-
-    bSizer153->Add( m_textCtrlInfo, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-    this->SetSizer( bSizer153 );
-    this->Layout();
-    bSizer153->Fit( this );
-
-    // Connect Events
-    m_bpButtonErrors->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogControlGenerated::OnErrors ), NULL, this );
-    m_bpButtonWarnings->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogControlGenerated::OnWarnings ), NULL, this );
-    m_bpButtonInfo->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogControlGenerated::OnInfo ), NULL, this );
+	wxBoxSizer* bSizer153;
+	bSizer153 = new wxBoxSizer( wxHORIZONTAL );
+	
+	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, 5 );
+	
+	m_textCtrlInfo = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_DONTWRAP|wxTE_MULTILINE|wxTE_READONLY );
+	m_textCtrlInfo->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+	
+	bSizer153->Add( m_textCtrlInfo, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	this->SetSizer( bSizer153 );
+	this->Layout();
+	bSizer153->Fit( this );
+	
+	// Connect Events
+	m_bpButtonErrors->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogControlGenerated::OnErrors ), NULL, this );
+	m_bpButtonWarnings->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogControlGenerated::OnWarnings ), NULL, this );
+	m_bpButtonInfo->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( LogControlGenerated::OnInfo ), NULL, this );
 }
 
 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 );
-
-    wxBoxSizer* bSizer31;
-    bSizer31 = new wxBoxSizer( wxVERTICAL );
-
-
-    bSizer31->Add( 0, 5, 0, 0, 5 );
-
-    m_panel5 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxSIMPLE_BORDER|wxTAB_TRAVERSAL );
-    m_panel5->SetBackgroundColour( wxColour( 255, 255, 255 ) );
-
-    wxBoxSizer* bSizer36;
-    bSizer36 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bitmap11 = new wxStaticBitmap( m_panel5, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 404,55 ), 0 );
-    bSizer36->Add( m_bitmap11, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_panel5->SetSizer( bSizer36 );
-    m_panel5->Layout();
-    bSizer36->Fit( m_panel5 );
-    bSizer31->Add( m_panel5, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_build = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_build->Wrap( -1 );
-    m_build->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
-
-    bSizer31->Add( m_build, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-
-    bSizer31->Add( 0, 10, 0, 0, 5 );
-
-    wxBoxSizer* bSizer53;
-    bSizer53 = new wxBoxSizer( wxVERTICAL );
-
-    m_panel33 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxDOUBLE_BORDER|wxTAB_TRAVERSAL );
-    m_panel33->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-
-    bSizerCodeInfo = new wxBoxSizer( wxVERTICAL );
-
-    m_staticText72 = new wxStaticText( m_panel33, wxID_ANY, _("Source code written in C++ utilizing:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText72->Wrap( -1 );
-    m_staticText72->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-
-    bSizerCodeInfo->Add( m_staticText72, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
-
-    wxBoxSizer* bSizer167;
-    bSizer167 = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer171;
-    bSizer171 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_hyperlink9 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("MinGW"), wxT("http://www.mingw.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    m_hyperlink9->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-
-    bSizer171->Add( m_hyperlink9, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-
-    m_hyperlink11 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("MS Visual C++"), wxT("http://msdn.microsoft.com/library/60k1461a.aspx"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    m_hyperlink11->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-
-    bSizer171->Add( m_hyperlink11, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-
-    m_hyperlink10 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("Code::Blocks"), wxT("http://www.codeblocks.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    m_hyperlink10->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-
-    bSizer171->Add( m_hyperlink10, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-
-    m_hyperlink13 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("Boost"), wxT("http://www.boost.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    m_hyperlink13->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-
-    bSizer171->Add( m_hyperlink13, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-
-    m_hyperlink7 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("wxWidgets"), wxT("http://www.wxwidgets.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    m_hyperlink7->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-
-    bSizer171->Add( m_hyperlink7, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-
-    m_hyperlink16 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("Artistic Style"), wxT("http://astyle.sourceforge.net"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    m_hyperlink16->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-
-    bSizer171->Add( m_hyperlink16, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-
-    bSizer167->Add( bSizer171, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM, 5 );
-
-    wxBoxSizer* bSizer172;
-    bSizer172 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_hyperlink8 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("Loki"), wxT("http://sourceforge.net/projects/loki-lib"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    m_hyperlink8->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-
-    bSizer172->Add( m_hyperlink8, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-
-    m_hyperlink15 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("zenXML"), wxT("http://sourceforge.net/projects/zenxml/"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    m_hyperlink15->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-
-    bSizer172->Add( m_hyperlink15, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-
-    m_hyperlink12 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("Google Test"), wxT("http://code.google.com/p/googletest"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    m_hyperlink12->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-
-    bSizer172->Add( m_hyperlink12, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-
-    m_hyperlink18 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("Unicode NSIS"), wxT("http://www.scratchpaper.com"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    m_hyperlink18->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-
-    bSizer172->Add( m_hyperlink18, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-
-    m_hyperlink14 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("wxFormBuilder"), wxT("http://wxformbuilder.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    m_hyperlink14->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-
-    bSizer172->Add( m_hyperlink14, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-
-    bSizer167->Add( bSizer172, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    bSizerCodeInfo->Add( bSizer167, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_hyperlink21 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("- ZenJu -"), wxT("mailto:zhnmju123@gmx.de"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    m_hyperlink21->SetFont( wxFont( 10, 74, 93, 92, false, wxT("Segoe Print") ) );
-    m_hyperlink21->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-    m_hyperlink21->SetToolTip( _("zhnmju123@gmx.de") );
-
-    bSizerCodeInfo->Add( m_hyperlink21, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_panel33->SetSizer( bSizerCodeInfo );
-    m_panel33->Layout();
-    bSizerCodeInfo->Fit( m_panel33 );
-    bSizer53->Add( m_panel33, 0, wxBOTTOM|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-
-    m_scrolledWindowTranslators = new wxScrolledWindow( this, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxDOUBLE_BORDER|wxHSCROLL|wxVSCROLL );
-    m_scrolledWindowTranslators->SetScrollRate( 5, 5 );
-    m_scrolledWindowTranslators->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-    m_scrolledWindowTranslators->SetMinSize( wxSize( -1,180 ) );
-
-    bSizerTranslators = new wxBoxSizer( wxVERTICAL );
-
-    m_staticText54 = new wxStaticText( m_scrolledWindowTranslators, wxID_ANY, _("Big thanks for localizing FreeFileSync goes out to:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText54->Wrap( -1 );
-    m_staticText54->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
-
-    bSizerTranslators->Add( m_staticText54, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxBOTTOM, 5 );
-
-
-    bSizerTranslators->Add( 0, 5, 0, 0, 5 );
-
-    fgSizerTranslators = new wxFlexGridSizer( 50, 3, 5, 20 );
-    fgSizerTranslators->SetFlexibleDirection( wxBOTH );
-    fgSizerTranslators->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-
-    bSizerTranslators->Add( fgSizerTranslators, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_scrolledWindowTranslators->SetSizer( bSizerTranslators );
-    m_scrolledWindowTranslators->Layout();
-    bSizerTranslators->Fit( m_scrolledWindowTranslators );
-    bSizer53->Add( m_scrolledWindowTranslators, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxBOTTOM, 5 );
-
-    bSizer31->Add( bSizer53, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT|wxEXPAND, 25 );
-
-    m_staticline3 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer31->Add( m_staticline3, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
-
-    m_staticText131 = new wxStaticText( this, wxID_ANY, _("Feedback and suggestions are welcome at:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText131->Wrap( -1 );
-    m_staticText131->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
-
-    bSizer31->Add( m_staticText131, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_staticline12 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer31->Add( m_staticline12, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
-
-    wxBoxSizer* bSizer156;
-    bSizer156 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bitmap9 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 );
-    m_bitmap9->SetToolTip( _("FreeFileSync at Sourceforge") );
-
-    bSizer156->Add( m_bitmap9, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-
-    m_hyperlink1 = new wxHyperlinkCtrl( this, wxID_ANY, _("Homepage"), wxT("http://sourceforge.net/projects/freefilesync/"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    m_hyperlink1->SetFont( wxFont( 10, 70, 90, 92, true, wxEmptyString ) );
-    m_hyperlink1->SetToolTip( _("http://sourceforge.net/projects/freefilesync/") );
-
-    bSizer156->Add( m_hyperlink1, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizer156->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    m_hyperlink3 = new wxHyperlinkCtrl( this, wxID_ANY, _("If you like FFS"), wxT("https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=zhnmju123@gmx.de&lc=US&currency_code=EUR"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    m_hyperlink3->SetFont( wxFont( 10, 70, 90, 92, true, wxEmptyString ) );
-    m_hyperlink3->SetToolTip( _("https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=zhnmju123@gmx.de&lc=US&currency_code=EUR") );
-
-    bSizer156->Add( m_hyperlink3, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_animationControl1 = new wxAnimationCtrl( this, wxID_ANY, wxNullAnimation, wxDefaultPosition, wxSize( -1,-1 ), wxAC_DEFAULT_STYLE );
-    m_animationControl1->SetToolTip( _("Donate with PayPal") );
-    m_animationControl1->SetMinSize( wxSize( 48,48 ) );
-
-    bSizer156->Add( m_animationControl1, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-
-    bSizer31->Add( bSizer156, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxRIGHT|wxLEFT, 10 );
-
-    wxBoxSizer* bSizer158;
-    bSizer158 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bitmap10 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 );
-    m_bitmap10->SetToolTip( _("Email") );
-
-    bSizer158->Add( m_bitmap10, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-
-    m_hyperlink2 = new wxHyperlinkCtrl( this, wxID_ANY, _("Email"), wxT("mailto:zhnmju123@gmx.de"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    m_hyperlink2->SetFont( wxFont( 10, 70, 90, 92, true, wxEmptyString ) );
-    m_hyperlink2->SetToolTip( _("zhnmju123@gmx.de") );
-
-    bSizer158->Add( m_hyperlink2, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizer158->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    m_hyperlink6 = new wxHyperlinkCtrl( this, wxID_ANY, _("Report translation error"), wxT("http://sourceforge.net/projects/freefilesync/forums/forum/976976"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    m_hyperlink6->SetFont( wxFont( 10, 70, 90, 92, true, wxEmptyString ) );
-    m_hyperlink6->SetToolTip( _("http://sourceforge.net/projects/freefilesync/forums/forum/976976") );
-
-    bSizer158->Add( m_hyperlink6, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_bitmapTransl = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 );
-    m_bitmapTransl->SetToolTip( _("Report translation error") );
-
-    bSizer158->Add( m_bitmapTransl, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-
-    bSizer31->Add( bSizer158, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxRIGHT|wxLEFT, 10 );
-
-    m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer31->Add( m_staticline2, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
-
-    wxStaticBoxSizer* sbSizer14;
-    sbSizer14 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Published under the GNU General Public License:") ), wxHORIZONTAL );
-
-
-    sbSizer14->Add( 0, 0, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_bitmap13 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 88,31 ), 0 );
-    sbSizer14->Add( m_bitmap13, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_hyperlink5 = new wxHyperlinkCtrl( this, wxID_ANY, _("http://www.gnu.org/licenses/gpl.html"), wxT("http://www.gnu.org/licenses/gpl.html"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-    sbSizer14->Add( m_hyperlink5, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    sbSizer14->Add( 0, 0, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizer31->Add( sbSizer14, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
-
-    m_buttonOkay = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( 100,32 ), 0 );
-    m_buttonOkay->SetDefault();
-    m_buttonOkay->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-
-    bSizer31->Add( m_buttonOkay, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
-
-    this->SetSizer( bSizer31 );
-    this->Layout();
-    bSizer31->Fit( this );
-
-    this->Centre( wxBOTH );
-
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( AboutDlgGenerated::OnClose ) );
-    m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::OnOK ), NULL, this );
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	
+	wxBoxSizer* bSizer31;
+	bSizer31 = new wxBoxSizer( wxVERTICAL );
+	
+	
+	bSizer31->Add( 0, 5, 0, 0, 5 );
+	
+	m_panel5 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxSIMPLE_BORDER|wxTAB_TRAVERSAL );
+	m_panel5->SetBackgroundColour( wxColour( 255, 255, 255 ) );
+	
+	wxBoxSizer* bSizer36;
+	bSizer36 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmap11 = new wxStaticBitmap( m_panel5, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 404,55 ), 0 );
+	bSizer36->Add( m_bitmap11, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_panel5->SetSizer( bSizer36 );
+	m_panel5->Layout();
+	bSizer36->Fit( m_panel5 );
+	bSizer31->Add( m_panel5, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_build = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_build->Wrap( -1 );
+	m_build->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
+	
+	bSizer31->Add( m_build, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	
+	bSizer31->Add( 0, 10, 0, 0, 5 );
+	
+	wxBoxSizer* bSizer53;
+	bSizer53 = new wxBoxSizer( wxVERTICAL );
+	
+	m_panel33 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxDOUBLE_BORDER|wxTAB_TRAVERSAL );
+	m_panel33->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+	
+	bSizerCodeInfo = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticText72 = new wxStaticText( m_panel33, wxID_ANY, _("Source code written in C++ utilizing:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText72->Wrap( -1 );
+	m_staticText72->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+	
+	bSizerCodeInfo->Add( m_staticText72, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
+	
+	wxBoxSizer* bSizer167;
+	bSizer167 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer171;
+	bSizer171 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_hyperlink9 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("MinGW"), wxT("http://www.mingw.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_hyperlink9->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+	
+	bSizer171->Add( m_hyperlink9, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	
+	m_hyperlink11 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("MS Visual C++"), wxT("http://msdn.microsoft.com/library/60k1461a.aspx"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_hyperlink11->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+	
+	bSizer171->Add( m_hyperlink11, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	
+	m_hyperlink10 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("Code::Blocks"), wxT("http://www.codeblocks.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_hyperlink10->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+	
+	bSizer171->Add( m_hyperlink10, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	
+	m_hyperlink13 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("Boost"), wxT("http://www.boost.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_hyperlink13->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+	
+	bSizer171->Add( m_hyperlink13, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	
+	m_hyperlink7 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("wxWidgets"), wxT("http://www.wxwidgets.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_hyperlink7->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+	
+	bSizer171->Add( m_hyperlink7, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	
+	m_hyperlink16 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("Artistic Style"), wxT("http://astyle.sourceforge.net"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_hyperlink16->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+	
+	bSizer171->Add( m_hyperlink16, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	
+	bSizer167->Add( bSizer171, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM, 5 );
+	
+	wxBoxSizer* bSizer172;
+	bSizer172 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_hyperlink8 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("Loki"), wxT("http://sourceforge.net/projects/loki-lib"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_hyperlink8->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+	
+	bSizer172->Add( m_hyperlink8, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	
+	m_hyperlink15 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("zenXML"), wxT("http://sourceforge.net/projects/zenxml/"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_hyperlink15->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+	
+	bSizer172->Add( m_hyperlink15, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	
+	m_hyperlink12 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("Google Test"), wxT("http://code.google.com/p/googletest"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_hyperlink12->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+	
+	bSizer172->Add( m_hyperlink12, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	
+	m_hyperlink18 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("Unicode NSIS"), wxT("http://www.scratchpaper.com"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_hyperlink18->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+	
+	bSizer172->Add( m_hyperlink18, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	
+	m_hyperlink14 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("wxFormBuilder"), wxT("http://wxformbuilder.org"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_hyperlink14->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+	
+	bSizer172->Add( m_hyperlink14, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	
+	bSizer167->Add( bSizer172, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	bSizerCodeInfo->Add( bSizer167, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_hyperlink21 = new wxHyperlinkCtrl( m_panel33, wxID_ANY, _("- ZenJu -"), wxT("mailto:zhnmju123@gmx.de"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_hyperlink21->SetFont( wxFont( 10, 74, 93, 92, false, wxT("Segoe Print") ) );
+	m_hyperlink21->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+	m_hyperlink21->SetToolTip( _("zhnmju123@gmx.de") );
+	
+	bSizerCodeInfo->Add( m_hyperlink21, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_panel33->SetSizer( bSizerCodeInfo );
+	m_panel33->Layout();
+	bSizerCodeInfo->Fit( m_panel33 );
+	bSizer53->Add( m_panel33, 0, wxBOTTOM|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+	
+	m_scrolledWindowTranslators = new wxScrolledWindow( this, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxDOUBLE_BORDER|wxHSCROLL|wxVSCROLL );
+	m_scrolledWindowTranslators->SetScrollRate( 5, 5 );
+	m_scrolledWindowTranslators->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+	m_scrolledWindowTranslators->SetMinSize( wxSize( -1,180 ) );
+	
+	bSizerTranslators = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticText54 = new wxStaticText( m_scrolledWindowTranslators, wxID_ANY, _("Big thanks for localizing FreeFileSync goes out to:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText54->Wrap( -1 );
+	m_staticText54->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
+	
+	bSizerTranslators->Add( m_staticText54, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxBOTTOM, 5 );
+	
+	
+	bSizerTranslators->Add( 0, 5, 0, 0, 5 );
+	
+	fgSizerTranslators = new wxFlexGridSizer( 50, 3, 5, 20 );
+	fgSizerTranslators->SetFlexibleDirection( wxBOTH );
+	fgSizerTranslators->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	
+	bSizerTranslators->Add( fgSizerTranslators, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_scrolledWindowTranslators->SetSizer( bSizerTranslators );
+	m_scrolledWindowTranslators->Layout();
+	bSizerTranslators->Fit( m_scrolledWindowTranslators );
+	bSizer53->Add( m_scrolledWindowTranslators, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxBOTTOM, 5 );
+	
+	bSizer31->Add( bSizer53, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT|wxEXPAND, 25 );
+	
+	m_staticline3 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer31->Add( m_staticline3, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
+	
+	m_staticText131 = new wxStaticText( this, wxID_ANY, _("Feedback and suggestions are welcome at:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText131->Wrap( -1 );
+	m_staticText131->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
+	
+	bSizer31->Add( m_staticText131, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_staticline12 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer31->Add( m_staticline12, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
+	
+	wxBoxSizer* bSizer156;
+	bSizer156 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmap9 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 );
+	m_bitmap9->SetToolTip( _("FreeFileSync at Sourceforge") );
+	
+	bSizer156->Add( m_bitmap9, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+	
+	m_hyperlink1 = new wxHyperlinkCtrl( this, wxID_ANY, _("Homepage"), wxT("http://sourceforge.net/projects/freefilesync/"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_hyperlink1->SetFont( wxFont( 10, 70, 90, 92, true, wxEmptyString ) );
+	m_hyperlink1->SetToolTip( _("http://sourceforge.net/projects/freefilesync/") );
+	
+	bSizer156->Add( m_hyperlink1, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizer156->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	m_hyperlink3 = new wxHyperlinkCtrl( this, wxID_ANY, _("If you like FFS"), wxT("https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=zhnmju123@gmx.de&lc=US&currency_code=EUR"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_hyperlink3->SetFont( wxFont( 10, 70, 90, 92, true, wxEmptyString ) );
+	m_hyperlink3->SetToolTip( _("https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=zhnmju123@gmx.de&lc=US&currency_code=EUR") );
+	
+	bSizer156->Add( m_hyperlink3, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_animationControl1 = new wxAnimationCtrl( this, wxID_ANY, wxNullAnimation, wxDefaultPosition, wxSize( -1,-1 ), wxAC_DEFAULT_STYLE ); 
+	m_animationControl1->SetToolTip( _("Donate with PayPal") );
+	m_animationControl1->SetMinSize( wxSize( 48,48 ) );
+	
+	bSizer156->Add( m_animationControl1, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+	
+	bSizer31->Add( bSizer156, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxRIGHT|wxLEFT, 10 );
+	
+	wxBoxSizer* bSizer158;
+	bSizer158 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmap10 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 );
+	m_bitmap10->SetToolTip( _("Email") );
+	
+	bSizer158->Add( m_bitmap10, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+	
+	m_hyperlink2 = new wxHyperlinkCtrl( this, wxID_ANY, _("Email"), wxT("mailto:zhnmju123@gmx.de"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_hyperlink2->SetFont( wxFont( 10, 70, 90, 92, true, wxEmptyString ) );
+	m_hyperlink2->SetToolTip( _("zhnmju123@gmx.de") );
+	
+	bSizer158->Add( m_hyperlink2, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizer158->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	m_hyperlink6 = new wxHyperlinkCtrl( this, wxID_ANY, _("Report translation error"), wxT("http://sourceforge.net/projects/freefilesync/forums/forum/976976"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	m_hyperlink6->SetFont( wxFont( 10, 70, 90, 92, true, wxEmptyString ) );
+	m_hyperlink6->SetToolTip( _("http://sourceforge.net/projects/freefilesync/forums/forum/976976") );
+	
+	bSizer158->Add( m_hyperlink6, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_bitmapTransl = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 );
+	m_bitmapTransl->SetToolTip( _("Report translation error") );
+	
+	bSizer158->Add( m_bitmapTransl, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+	
+	bSizer31->Add( bSizer158, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxRIGHT|wxLEFT, 10 );
+	
+	m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer31->Add( m_staticline2, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
+	
+	wxStaticBoxSizer* sbSizer14;
+	sbSizer14 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Published under the GNU General Public License:") ), wxHORIZONTAL );
+	
+	
+	sbSizer14->Add( 0, 0, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_bitmap13 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 88,31 ), 0 );
+	sbSizer14->Add( m_bitmap13, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_hyperlink5 = new wxHyperlinkCtrl( this, wxID_ANY, _("http://www.gnu.org/licenses/gpl.html"), wxT("http://www.gnu.org/licenses/gpl.html"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+	sbSizer14->Add( m_hyperlink5, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	sbSizer14->Add( 0, 0, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizer31->Add( sbSizer14, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
+	
+	m_buttonOkay = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( 100,32 ), 0 );
+	m_buttonOkay->SetDefault(); 
+	m_buttonOkay->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+	
+	bSizer31->Add( m_buttonOkay, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+	
+	this->SetSizer( bSizer31 );
+	this->Layout();
+	bSizer31->Fit( this );
+	
+	this->Centre( wxBOTH );
+	
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( AboutDlgGenerated::OnClose ) );
+	m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::OnOK ), NULL, this );
 }
 
 AboutDlgGenerated::~AboutDlgGenerated()
 {
-    // Disconnect Events
-    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( AboutDlgGenerated::OnClose ) );
-    m_buttonOkay->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::OnOK ), NULL, this );
-
+	// Disconnect Events
+	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( AboutDlgGenerated::OnClose ) );
+	m_buttonOkay->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::OnOK ), NULL, this );
+	
 }
 
 ErrorDlgGenerated::ErrorDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-
-    wxBoxSizer* bSizer24;
-    bSizer24 = new wxBoxSizer( wxVERTICAL );
-
-
-    bSizer24->Add( 0, 10, 0, wxEXPAND, 5 );
-
-    wxBoxSizer* bSizer26;
-    bSizer26 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bitmap10 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 );
-    bSizer26->Add( m_bitmap10, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_textCtrl8 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE|wxTE_READONLY );
-    m_textCtrl8->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-
-    bSizer26->Add( m_textCtrl8, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
-
-    bSizer24->Add( bSizer26, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-
-    m_checkBoxIgnoreErrors = new wxCheckBox( this, wxID_ANY, _("Ignore subsequent errors"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_checkBoxIgnoreErrors->SetToolTip( _("Hide further error messages during the current process") );
-
-    bSizer24->Add( m_checkBoxIgnoreErrors, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP, 10 );
-
-
-    bSizer24->Add( 0, 5, 0, wxEXPAND, 5 );
-
-    wxBoxSizer* bSizer25;
-    bSizer25 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_buttonIgnore = new wxButton( this, wxID_OK, _("&Ignore"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-    m_buttonIgnore->SetDefault();
-    m_buttonIgnore->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-
-    bSizer25->Add( m_buttonIgnore, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
-
-    m_buttonRetry = new wxButton( this, wxID_RETRY, _("&Retry"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-    m_buttonRetry->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-
-    bSizer25->Add( m_buttonRetry, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
-
-    m_buttonAbort = new wxButton( this, wxID_CANCEL, _("&Abort"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-    m_buttonAbort->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-
-    bSizer25->Add( m_buttonAbort, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
-
-
-    bSizer25->Add( 5, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizer24->Add( bSizer25, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    this->SetSizer( bSizer24 );
-    this->Layout();
-
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( ErrorDlgGenerated::OnClose ) );
-    m_buttonIgnore->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ErrorDlgGenerated::OnIgnore ), NULL, this );
-    m_buttonRetry->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ErrorDlgGenerated::OnRetry ), NULL, this );
-    m_buttonAbort->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ErrorDlgGenerated::OnAbort ), NULL, this );
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	
+	wxBoxSizer* bSizer24;
+	bSizer24 = new wxBoxSizer( wxVERTICAL );
+	
+	
+	bSizer24->Add( 0, 10, 0, wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer26;
+	bSizer26 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmap10 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 );
+	bSizer26->Add( m_bitmap10, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_textCtrl8 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE|wxTE_READONLY );
+	m_textCtrl8->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+	
+	bSizer26->Add( m_textCtrl8, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
+	
+	bSizer24->Add( bSizer26, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+	
+	m_checkBoxIgnoreErrors = new wxCheckBox( this, wxID_ANY, _("Ignore subsequent errors"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_checkBoxIgnoreErrors->SetToolTip( _("Hide further error messages during the current process") );
+	
+	bSizer24->Add( m_checkBoxIgnoreErrors, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP, 10 );
+	
+	
+	bSizer24->Add( 0, 5, 0, wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer25;
+	bSizer25 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_buttonIgnore = new wxButton( this, wxID_OK, _("&Ignore"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+	m_buttonIgnore->SetDefault(); 
+	m_buttonIgnore->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+	
+	bSizer25->Add( m_buttonIgnore, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
+	
+	m_buttonRetry = new wxButton( this, wxID_RETRY, _("&Retry"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+	m_buttonRetry->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+	
+	bSizer25->Add( m_buttonRetry, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
+	
+	m_buttonAbort = new wxButton( this, wxID_CANCEL, _("&Abort"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+	m_buttonAbort->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+	
+	bSizer25->Add( m_buttonAbort, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
+	
+	
+	bSizer25->Add( 5, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizer24->Add( bSizer25, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	this->SetSizer( bSizer24 );
+	this->Layout();
+	
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( ErrorDlgGenerated::OnClose ) );
+	m_buttonIgnore->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ErrorDlgGenerated::OnIgnore ), NULL, this );
+	m_buttonRetry->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ErrorDlgGenerated::OnRetry ), NULL, this );
+	m_buttonAbort->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ErrorDlgGenerated::OnAbort ), NULL, this );
 }
 
 ErrorDlgGenerated::~ErrorDlgGenerated()
 {
-    // Disconnect Events
-    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( ErrorDlgGenerated::OnClose ) );
-    m_buttonIgnore->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ErrorDlgGenerated::OnIgnore ), NULL, this );
-    m_buttonRetry->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ErrorDlgGenerated::OnRetry ), NULL, this );
-    m_buttonAbort->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ErrorDlgGenerated::OnAbort ), NULL, this );
-
+	// Disconnect Events
+	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( ErrorDlgGenerated::OnClose ) );
+	m_buttonIgnore->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ErrorDlgGenerated::OnIgnore ), NULL, this );
+	m_buttonRetry->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ErrorDlgGenerated::OnRetry ), NULL, this );
+	m_buttonAbort->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ErrorDlgGenerated::OnAbort ), NULL, this );
+	
 }
 
 WarningDlgGenerated::WarningDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-
-    wxBoxSizer* bSizer24;
-    bSizer24 = new wxBoxSizer( wxVERTICAL );
-
-
-    bSizer24->Add( 0, 10, 0, wxEXPAND, 5 );
-
-    wxBoxSizer* bSizer26;
-    bSizer26 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bitmap10 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 );
-    bSizer26->Add( m_bitmap10, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_textCtrl8 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE|wxTE_READONLY );
-    m_textCtrl8->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-
-    bSizer26->Add( m_textCtrl8, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
-
-    bSizer24->Add( bSizer26, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-
-    m_checkBoxDontShowAgain = new wxCheckBox( this, wxID_ANY, _("Do not show this dialog again"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer24->Add( m_checkBoxDontShowAgain, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP, 10 );
-
-
-    bSizer24->Add( 0, 5, 0, wxEXPAND, 5 );
-
-    wxBoxSizer* bSizer25;
-    bSizer25 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_buttonIgnore = new wxButton( this, wxID_IGNORE, _("&Ignore"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-    m_buttonIgnore->SetDefault();
-    m_buttonIgnore->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-
-    bSizer25->Add( m_buttonIgnore, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
-
-    m_buttonSwitch = new wxButton( this, wxID_MORE, _("&Switch"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-    m_buttonSwitch->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-
-    bSizer25->Add( m_buttonSwitch, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
-
-    m_buttonAbort = new wxButton( this, wxID_CANCEL, _("&Abort"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-    m_buttonAbort->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-
-    bSizer25->Add( m_buttonAbort, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
-
-
-    bSizer25->Add( 5, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizer24->Add( bSizer25, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    this->SetSizer( bSizer24 );
-    this->Layout();
-
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( WarningDlgGenerated::OnClose ) );
-    m_buttonIgnore->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarningDlgGenerated::OnIgnore ), NULL, this );
-    m_buttonSwitch->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarningDlgGenerated::OnSwitch ), NULL, this );
-    m_buttonAbort->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarningDlgGenerated::OnAbort ), NULL, this );
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	
+	wxBoxSizer* bSizer24;
+	bSizer24 = new wxBoxSizer( wxVERTICAL );
+	
+	
+	bSizer24->Add( 0, 10, 0, wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer26;
+	bSizer26 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmap10 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 );
+	bSizer26->Add( m_bitmap10, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_textCtrl8 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE|wxTE_READONLY );
+	m_textCtrl8->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+	
+	bSizer26->Add( m_textCtrl8, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
+	
+	bSizer24->Add( bSizer26, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+	
+	m_checkBoxDontShowAgain = new wxCheckBox( this, wxID_ANY, _("Do not show this dialog again"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer24->Add( m_checkBoxDontShowAgain, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP, 10 );
+	
+	
+	bSizer24->Add( 0, 5, 0, wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer25;
+	bSizer25 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_buttonIgnore = new wxButton( this, wxID_IGNORE, _("&Ignore"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+	m_buttonIgnore->SetDefault(); 
+	m_buttonIgnore->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+	
+	bSizer25->Add( m_buttonIgnore, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
+	
+	m_buttonSwitch = new wxButton( this, wxID_MORE, _("&Switch"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+	m_buttonSwitch->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+	
+	bSizer25->Add( m_buttonSwitch, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
+	
+	m_buttonAbort = new wxButton( this, wxID_CANCEL, _("&Abort"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+	m_buttonAbort->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+	
+	bSizer25->Add( m_buttonAbort, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
+	
+	
+	bSizer25->Add( 5, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizer24->Add( bSizer25, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	this->SetSizer( bSizer24 );
+	this->Layout();
+	
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( WarningDlgGenerated::OnClose ) );
+	m_buttonIgnore->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarningDlgGenerated::OnIgnore ), NULL, this );
+	m_buttonSwitch->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarningDlgGenerated::OnSwitch ), NULL, this );
+	m_buttonAbort->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarningDlgGenerated::OnAbort ), NULL, this );
 }
 
 WarningDlgGenerated::~WarningDlgGenerated()
 {
-    // Disconnect Events
-    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( WarningDlgGenerated::OnClose ) );
-    m_buttonIgnore->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarningDlgGenerated::OnIgnore ), NULL, this );
-    m_buttonSwitch->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarningDlgGenerated::OnSwitch ), NULL, this );
-    m_buttonAbort->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarningDlgGenerated::OnAbort ), NULL, this );
-
+	// Disconnect Events
+	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( WarningDlgGenerated::OnClose ) );
+	m_buttonIgnore->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarningDlgGenerated::OnIgnore ), NULL, this );
+	m_buttonSwitch->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarningDlgGenerated::OnSwitch ), NULL, this );
+	m_buttonAbort->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarningDlgGenerated::OnAbort ), NULL, this );
+	
 }
 
 QuestionDlgGenerated::QuestionDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-
-    wxBoxSizer* bSizer24;
-    bSizer24 = new wxBoxSizer( wxVERTICAL );
-
-
-    bSizer24->Add( 0, 10, 0, wxEXPAND, 5 );
-
-    wxBoxSizer* bSizer26;
-    bSizer26 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bitmap10 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 );
-    bSizer26->Add( m_bitmap10, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_textCtrl8 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE|wxTE_READONLY );
-    m_textCtrl8->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-
-    bSizer26->Add( m_textCtrl8, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
-
-    bSizer24->Add( bSizer26, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-
-    m_checkBoxDontAskAgain = new wxCheckBox( this, wxID_ANY, _("Do not show this dialog again"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer24->Add( m_checkBoxDontAskAgain, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP, 10 );
-
-
-    bSizer24->Add( 0, 5, 0, wxEXPAND, 5 );
-
-    wxBoxSizer* bSizer25;
-    bSizer25 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_buttonYes = new wxButton( this, wxID_YES, _("&Yes"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-    m_buttonYes->SetDefault();
-    m_buttonYes->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-
-    bSizer25->Add( m_buttonYes, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
-
-    m_buttonNo = new wxButton( this, wxID_NO, _("&No"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-    m_buttonNo->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-
-    bSizer25->Add( m_buttonNo, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
-
-    m_buttonCancel = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-    m_buttonCancel->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-
-    bSizer25->Add( m_buttonCancel, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
-
-
-    bSizer25->Add( 5, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizer24->Add( bSizer25, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    this->SetSizer( bSizer24 );
-    this->Layout();
-
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( QuestionDlgGenerated::OnClose ) );
-    m_checkBoxDontAskAgain->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( QuestionDlgGenerated::OnCheckBoxDontShowAgain ), NULL, this );
-    m_buttonYes->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( QuestionDlgGenerated::OnYes ), NULL, this );
-    m_buttonNo->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( QuestionDlgGenerated::OnNo ), NULL, this );
-    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( QuestionDlgGenerated::OnCancel ), NULL, this );
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	
+	wxBoxSizer* bSizer24;
+	bSizer24 = new wxBoxSizer( wxVERTICAL );
+	
+	
+	bSizer24->Add( 0, 10, 0, wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer26;
+	bSizer26 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmap10 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 );
+	bSizer26->Add( m_bitmap10, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_textCtrl8 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE|wxTE_READONLY );
+	m_textCtrl8->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+	
+	bSizer26->Add( m_textCtrl8, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
+	
+	bSizer24->Add( bSizer26, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+	
+	m_checkBoxDontAskAgain = new wxCheckBox( this, wxID_ANY, _("Do not show this dialog again"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer24->Add( m_checkBoxDontAskAgain, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP, 10 );
+	
+	
+	bSizer24->Add( 0, 5, 0, wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer25;
+	bSizer25 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_buttonYes = new wxButton( this, wxID_YES, _("&Yes"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+	m_buttonYes->SetDefault(); 
+	m_buttonYes->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+	
+	bSizer25->Add( m_buttonYes, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
+	
+	m_buttonNo = new wxButton( this, wxID_NO, _("&No"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+	m_buttonNo->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+	
+	bSizer25->Add( m_buttonNo, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
+	
+	m_buttonCancel = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+	m_buttonCancel->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+	
+	bSizer25->Add( m_buttonCancel, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
+	
+	
+	bSizer25->Add( 5, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizer24->Add( bSizer25, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	this->SetSizer( bSizer24 );
+	this->Layout();
+	
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( QuestionDlgGenerated::OnClose ) );
+	m_checkBoxDontAskAgain->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( QuestionDlgGenerated::OnCheckBoxDontShowAgain ), NULL, this );
+	m_buttonYes->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( QuestionDlgGenerated::OnYes ), NULL, this );
+	m_buttonNo->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( QuestionDlgGenerated::OnNo ), NULL, this );
+	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( QuestionDlgGenerated::OnCancel ), NULL, this );
 }
 
 QuestionDlgGenerated::~QuestionDlgGenerated()
 {
-    // Disconnect Events
-    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( QuestionDlgGenerated::OnClose ) );
-    m_checkBoxDontAskAgain->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( QuestionDlgGenerated::OnCheckBoxDontShowAgain ), NULL, this );
-    m_buttonYes->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( QuestionDlgGenerated::OnYes ), NULL, this );
-    m_buttonNo->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( QuestionDlgGenerated::OnNo ), NULL, this );
-    m_buttonCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( QuestionDlgGenerated::OnCancel ), NULL, this );
-
+	// Disconnect Events
+	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( QuestionDlgGenerated::OnClose ) );
+	m_checkBoxDontAskAgain->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( QuestionDlgGenerated::OnCheckBoxDontShowAgain ), NULL, this );
+	m_buttonYes->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( QuestionDlgGenerated::OnYes ), NULL, this );
+	m_buttonNo->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( QuestionDlgGenerated::OnNo ), NULL, this );
+	m_buttonCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( QuestionDlgGenerated::OnCancel ), NULL, this );
+	
 }
 
 DeleteDlgGenerated::DeleteDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-
-    wxBoxSizer* bSizer24;
-    bSizer24 = new wxBoxSizer( wxVERTICAL );
-
-
-    bSizer24->Add( 0, 10, 0, wxEXPAND, 5 );
-
-    wxBoxSizer* bSizer41;
-    bSizer41 = new wxBoxSizer( wxHORIZONTAL );
-
-
-    bSizer41->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    m_bitmap12 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), 0 );
-    bSizer41->Add( m_bitmap12, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_staticTextHeader = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextHeader->Wrap( -1 );
-    m_staticTextHeader->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-
-    bSizer41->Add( m_staticTextHeader, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-
-    bSizer41->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    bSizer24->Add( bSizer41, 0, wxEXPAND, 5 );
-
-    wxBoxSizer* bSizer99;
-    bSizer99 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_checkBoxDeleteBothSides = new wxCheckBox( this, wxID_ANY, _("Delete on both sides"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_checkBoxDeleteBothSides->SetToolTip( _("Delete on both sides even if the file is selected on one side only") );
-
-    bSizer99->Add( m_checkBoxDeleteBothSides, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizer99->Add( 0, 0, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_checkBoxUseRecycler = new wxCheckBox( this, wxID_ANY, _("Use Recycle Bin"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_checkBoxUseRecycler->SetValue(true);
-    bSizer99->Add( m_checkBoxUseRecycler, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizer24->Add( bSizer99, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 10 );
-
-    m_textCtrlMessage = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_DONTWRAP|wxTE_MULTILINE|wxTE_READONLY );
-    m_textCtrlMessage->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-
-    bSizer24->Add( m_textCtrlMessage, 1, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-
-    wxBoxSizer* bSizer25;
-    bSizer25 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_buttonOK = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-    m_buttonOK->SetDefault();
-    m_buttonOK->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
-
-    bSizer25->Add( m_buttonOK, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
-
-    m_buttonCancel = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-    m_buttonCancel->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-
-    bSizer25->Add( m_buttonCancel, 0, wxALL, 5 );
-
-    bSizer24->Add( bSizer25, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    this->SetSizer( bSizer24 );
-    this->Layout();
-
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DeleteDlgGenerated::OnClose ) );
-    m_checkBoxDeleteBothSides->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnDelOnBothSides ), NULL, this );
-    m_checkBoxUseRecycler->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnUseRecycler ), NULL, this );
-    m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnOK ), NULL, this );
-    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnCancel ), NULL, this );
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	
+	wxBoxSizer* bSizer24;
+	bSizer24 = new wxBoxSizer( wxVERTICAL );
+	
+	
+	bSizer24->Add( 0, 10, 0, wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer41;
+	bSizer41 = new wxBoxSizer( wxHORIZONTAL );
+	
+	
+	bSizer41->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	m_bitmap12 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), 0 );
+	bSizer41->Add( m_bitmap12, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_staticTextHeader = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextHeader->Wrap( -1 );
+	m_staticTextHeader->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+	
+	bSizer41->Add( m_staticTextHeader, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	
+	bSizer41->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	bSizer24->Add( bSizer41, 0, wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer99;
+	bSizer99 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_checkBoxDeleteBothSides = new wxCheckBox( this, wxID_ANY, _("Delete on both sides"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_checkBoxDeleteBothSides->SetToolTip( _("Delete on both sides even if the file is selected on one side only") );
+	
+	bSizer99->Add( m_checkBoxDeleteBothSides, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizer99->Add( 0, 0, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_checkBoxUseRecycler = new wxCheckBox( this, wxID_ANY, _("Use Recycle Bin"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_checkBoxUseRecycler->SetValue(true); 
+	bSizer99->Add( m_checkBoxUseRecycler, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizer24->Add( bSizer99, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 10 );
+	
+	m_textCtrlMessage = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_DONTWRAP|wxTE_MULTILINE|wxTE_READONLY );
+	m_textCtrlMessage->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+	
+	bSizer24->Add( m_textCtrlMessage, 1, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer25;
+	bSizer25 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_buttonOK = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+	m_buttonOK->SetDefault(); 
+	m_buttonOK->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
+	
+	bSizer25->Add( m_buttonOK, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
+	
+	m_buttonCancel = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+	m_buttonCancel->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+	
+	bSizer25->Add( m_buttonCancel, 0, wxALL, 5 );
+	
+	bSizer24->Add( bSizer25, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	this->SetSizer( bSizer24 );
+	this->Layout();
+	
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DeleteDlgGenerated::OnClose ) );
+	m_checkBoxDeleteBothSides->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnDelOnBothSides ), NULL, this );
+	m_checkBoxUseRecycler->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnUseRecycler ), NULL, this );
+	m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnOK ), NULL, this );
+	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnCancel ), NULL, this );
 }
 
 DeleteDlgGenerated::~DeleteDlgGenerated()
 {
-    // Disconnect Events
-    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DeleteDlgGenerated::OnClose ) );
-    m_checkBoxDeleteBothSides->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnDelOnBothSides ), NULL, this );
-    m_checkBoxUseRecycler->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnUseRecycler ), NULL, this );
-    m_buttonOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnOK ), NULL, this );
-    m_buttonCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnCancel ), NULL, this );
-
+	// Disconnect Events
+	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DeleteDlgGenerated::OnClose ) );
+	m_checkBoxDeleteBothSides->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnDelOnBothSides ), NULL, this );
+	m_checkBoxUseRecycler->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnUseRecycler ), NULL, this );
+	m_buttonOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnOK ), NULL, this );
+	m_buttonCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DeleteDlgGenerated::OnCancel ), NULL, this );
+	
 }
 
 FilterDlgGenerated::FilterDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-    this->SetSizeHints( wxSize( 370,380 ), wxDefaultSize );
-
-    wxBoxSizer* bSizer21;
-    bSizer21 = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer86;
-    bSizer86 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bitmap26 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), 0 );
-    bSizer86->Add( m_bitmap26, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-
-    m_panel8 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER|wxTAB_TRAVERSAL );
-    m_panel8->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DLIGHT ) );
-
-    wxBoxSizer* bSizer72;
-    bSizer72 = new wxBoxSizer( wxVERTICAL );
-
-    m_staticTexHeader = new wxStaticText( m_panel8, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTexHeader->Wrap( -1 );
-    m_staticTexHeader->SetFont( wxFont( 16, 70, 90, 92, false, wxEmptyString ) );
-
-    bSizer72->Add( m_staticTexHeader, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
-
-    m_panel8->SetSizer( bSizer72 );
-    m_panel8->Layout();
-    bSizer72->Fit( m_panel8 );
-    bSizer86->Add( m_panel8, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-
-    bSizer86->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizer21->Add( bSizer86, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM, 5 );
-
-    wxBoxSizer* bSizer70;
-    bSizer70 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_staticText44 = new wxStaticText( this, wxID_ANY, _("Only files/directories that match all filter settings will be selected for synchronization.\nNote: The name filter must be specified relative(!) to main synchronization directories."), wxDefaultPosition, wxSize( 550,-1 ), wxALIGN_CENTRE );
-    m_staticText44->Wrap( 550 );
-    bSizer70->Add( m_staticText44, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_bpButtonHelp = new wxBitmapButton( this, wxID_HELP, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-    m_bpButtonHelp->SetToolTip( _("Help") );
-
-    bSizer70->Add( m_bpButtonHelp, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-
-    bSizer21->Add( bSizer70, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 10 );
-
-
-    bSizer21->Add( 0, 5, 0, 0, 5 );
-
-    m_panel13 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-    wxBoxSizer* bSizer69;
-    bSizer69 = new wxBoxSizer( wxVERTICAL );
-
-    m_staticline10 = new wxStaticLine( m_panel13, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer69->Add( m_staticline10, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
-
-    wxBoxSizer* bSizer52;
-    bSizer52 = new wxBoxSizer( wxVERTICAL );
-
-    m_staticText45 = new wxStaticText( m_panel13, wxID_ANY, _("Hints:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText45->Wrap( -1 );
-    m_staticText45->SetFont( wxFont( 10, 70, 90, 92, true, wxEmptyString ) );
-
-    bSizer52->Add( m_staticText45, 0, wxBOTTOM, 5 );
-
-    m_staticText83 = new wxStaticText( m_panel13, wxID_ANY, _("1. Enter relative file or directory names separated by ';' or a new line."), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText83->Wrap( -1 );
-    bSizer52->Add( m_staticText83, 0, 0, 5 );
-
-    m_staticText84 = new wxStaticText( m_panel13, wxID_ANY, _("2. Use wildcard characters '*' and '?'."), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText84->Wrap( -1 );
-    bSizer52->Add( m_staticText84, 0, 0, 5 );
-
-    m_staticText85 = new wxStaticText( m_panel13, wxID_ANY, _("3. Exclude files directly on main grid via context menu."), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText85->Wrap( -1 );
-    bSizer52->Add( m_staticText85, 0, 0, 5 );
-
-    bSizer69->Add( bSizer52, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 10 );
-
-    wxStaticBoxSizer* sbSizer21;
-    sbSizer21 = new wxStaticBoxSizer( new wxStaticBox( m_panel13, wxID_ANY, _("Example") ), wxVERTICAL );
-
-    wxBoxSizer* bSizer66;
-    bSizer66 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_staticText181 = new wxStaticText( m_panel13, wxID_ANY, _("Include: *.doc;*.zip;*.exe\nExclude: \\stuff\\temp\\*"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText181->Wrap( -1 );
-    bSizer66->Add( m_staticText181, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_staticText1811 = new wxStaticText( m_panel13, wxID_ANY, _("Synchronize all .doc, .zip and .exe files except everything in subfolder \"temp\"."), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText1811->Wrap( 250 );
-    m_staticText1811->SetFont( wxFont( 8, 70, 93, 90, false, wxEmptyString ) );
-
-    bSizer66->Add( m_staticText1811, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-
-    sbSizer21->Add( bSizer66, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 5 );
-
-    bSizer69->Add( sbSizer21, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxRIGHT|wxLEFT, 5 );
-
-    m_panel13->SetSizer( bSizer69 );
-    m_panel13->Layout();
-    bSizer69->Fit( m_panel13 );
-    bSizer21->Add( m_panel13, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxEXPAND, 5 );
-
-
-    bSizer21->Add( 0, 0, 0, 0, 5 );
-
-    wxBoxSizer* bSizer159;
-    bSizer159 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxBoxSizer* bSizer166;
-    bSizer166 = new wxBoxSizer( wxVERTICAL );
-
-    wxStaticBoxSizer* sbSizer8;
-    sbSizer8 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Include") ), wxHORIZONTAL );
-
-    m_bitmapInclude = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), 0 );
-    sbSizer8->Add( m_bitmapInclude, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxRIGHT, 5 );
-
-    m_textCtrlInclude = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE );
-    sbSizer8->Add( m_textCtrlInclude, 1, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-
-    bSizer166->Add( sbSizer8, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-
-    wxStaticBoxSizer* sbSizer26;
-    sbSizer26 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Exclude") ), wxHORIZONTAL );
-
-    m_bitmapExclude = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), 0 );
-    sbSizer26->Add( m_bitmapExclude, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-
-    m_textCtrlExclude = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE );
-    sbSizer26->Add( m_textCtrlExclude, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    bSizer166->Add( sbSizer26, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-
-    bSizer159->Add( bSizer166, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-
-
-    bSizer159->Add( 5, 0, 0, 0, 5 );
-
-    wxBoxSizer* bSizer160;
-    bSizer160 = new wxBoxSizer( wxVERTICAL );
-
-    wxStaticBoxSizer* sbSizer25;
-    sbSizer25 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Date") ), wxHORIZONTAL );
-
-    wxBoxSizer* bSizer169;
-    bSizer169 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bitmapFilterDate = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 34,34 ), 0 );
-    bSizer169->Add( m_bitmapFilterDate, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-
-    wxBoxSizer* bSizer165;
-    bSizer165 = new wxBoxSizer( wxVERTICAL );
-
-    m_staticText103 = new wxStaticText( this, wxID_ANY, _("Select time span"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText103->Wrap( -1 );
-    bSizer165->Add( m_staticText103, 0, 0, 5 );
-
-    wxBoxSizer* bSizer164;
-    bSizer164 = new wxBoxSizer( wxVERTICAL );
-
-    wxArrayString m_choiceUnitTimespanChoices;
-    m_choiceUnitTimespan = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitTimespanChoices, 0 );
-    m_choiceUnitTimespan->SetSelection( 0 );
-    bSizer164->Add( m_choiceUnitTimespan, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_spinCtrlTimespan = new wxSpinCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
-    m_spinCtrlTimespan->Hide();
-
-    bSizer164->Add( m_spinCtrlTimespan, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizer165->Add( bSizer164, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizer169->Add( bSizer165, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    sbSizer25->Add( bSizer169, 0, 0, 5 );
-
-    bSizer160->Add( sbSizer25, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-
-    wxStaticBoxSizer* sbSizer81;
-    sbSizer81 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Size") ), wxHORIZONTAL );
-
-    wxBoxSizer* bSizer170;
-    bSizer170 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bitmapFilterSize = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 32,32 ), 0 );
-    bSizer170->Add( m_bitmapFilterSize, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxRIGHT, 5 );
-
-    wxBoxSizer* bSizer158;
-    bSizer158 = new wxBoxSizer( wxVERTICAL );
-
-    m_staticText101 = new wxStaticText( this, wxID_ANY, _("Minimum file size"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText101->Wrap( -1 );
-    bSizer158->Add( m_staticText101, 0, 0, 5 );
-
-    wxBoxSizer* bSizer162;
-    bSizer162 = new wxBoxSizer( wxVERTICAL );
-
-    m_spinCtrlMinSize = new wxSpinCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
-    bSizer162->Add( m_spinCtrlMinSize, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    wxArrayString m_choiceUnitMinSizeChoices;
-    m_choiceUnitMinSize = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitMinSizeChoices, 0 );
-    m_choiceUnitMinSize->SetSelection( 0 );
-    bSizer162->Add( m_choiceUnitMinSize, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizer158->Add( bSizer162, 0, wxBOTTOM, 5 );
-
-    m_staticText102 = new wxStaticText( this, wxID_ANY, _("Maximum file size"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText102->Wrap( -1 );
-    bSizer158->Add( m_staticText102, 0, 0, 5 );
-
-    wxBoxSizer* bSizer163;
-    bSizer163 = new wxBoxSizer( wxVERTICAL );
-
-    m_spinCtrlMaxSize = new wxSpinCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
-    bSizer163->Add( m_spinCtrlMaxSize, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    wxArrayString m_choiceUnitMaxSizeChoices;
-    m_choiceUnitMaxSize = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitMaxSizeChoices, 0 );
-    m_choiceUnitMaxSize->SetSelection( 0 );
-    bSizer163->Add( m_choiceUnitMaxSize, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizer158->Add( bSizer163, 0, wxTOP, 5 );
-
-    bSizer170->Add( bSizer158, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    sbSizer81->Add( bSizer170, 0, 0, 5 );
-
-    bSizer160->Add( sbSizer81, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-
-    bSizer159->Add( bSizer160, 0, wxEXPAND, 5 );
-
-    bSizer21->Add( bSizer159, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
-
-    wxBoxSizer* bSizer22;
-    bSizer22 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_button9 = new wxButton( this, wxID_DEFAULT, _("&Default"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-    m_button9->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-
-    bSizer22->Add( m_button9, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizer22->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_button10 = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-    m_button10->SetDefault();
-    m_button10->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
-
-    bSizer22->Add( m_button10, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
-
-    m_button17 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-    m_button17->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-
-    bSizer22->Add( m_button17, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-    bSizer21->Add( bSizer22, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxBOTTOM|wxEXPAND, 5 );
-
-    this->SetSizer( bSizer21 );
-    this->Layout();
-    bSizer21->Fit( this );
-
-    this->Centre( wxBOTH );
-
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( FilterDlgGenerated::OnClose ) );
-    m_bpButtonHelp->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnHelp ), NULL, this );
-    m_textCtrlInclude->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateNameFilter ), NULL, this );
-    m_textCtrlExclude->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateNameFilter ), NULL, this );
-    m_choiceUnitTimespan->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateChoice ), NULL, this );
-    m_choiceUnitMinSize->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateChoice ), NULL, this );
-    m_choiceUnitMaxSize->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateChoice ), NULL, this );
-    m_button9->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnDefault ), NULL, this );
-    m_button10->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnApply ), NULL, this );
-    m_button17->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnCancel ), NULL, this );
+	this->SetSizeHints( wxSize( 370,380 ), wxDefaultSize );
+	
+	wxBoxSizer* bSizer21;
+	bSizer21 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer86;
+	bSizer86 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmap26 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), 0 );
+	bSizer86->Add( m_bitmap26, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	
+	m_panel8 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER|wxTAB_TRAVERSAL );
+	m_panel8->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DLIGHT ) );
+	
+	wxBoxSizer* bSizer72;
+	bSizer72 = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticTexHeader = new wxStaticText( m_panel8, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTexHeader->Wrap( -1 );
+	m_staticTexHeader->SetFont( wxFont( 16, 70, 90, 92, false, wxEmptyString ) );
+	
+	bSizer72->Add( m_staticTexHeader, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+	
+	m_panel8->SetSizer( bSizer72 );
+	m_panel8->Layout();
+	bSizer72->Fit( m_panel8 );
+	bSizer86->Add( m_panel8, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	
+	bSizer86->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizer21->Add( bSizer86, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM, 5 );
+	
+	wxBoxSizer* bSizer70;
+	bSizer70 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_staticText44 = new wxStaticText( this, wxID_ANY, _("Only files/directories that match all filter settings will be selected for synchronization.\nNote: The name filter must be specified relative(!) to main synchronization directories."), wxDefaultPosition, wxSize( 550,-1 ), wxALIGN_CENTRE );
+	m_staticText44->Wrap( 550 );
+	bSizer70->Add( m_staticText44, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_bpButtonHelp = new wxBitmapButton( this, wxID_HELP, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+	m_bpButtonHelp->SetToolTip( _("Help") );
+	
+	bSizer70->Add( m_bpButtonHelp, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+	
+	bSizer21->Add( bSizer70, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 10 );
+	
+	
+	bSizer21->Add( 0, 5, 0, 0, 5 );
+	
+	m_panel13 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+	wxBoxSizer* bSizer69;
+	bSizer69 = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticline10 = new wxStaticLine( m_panel13, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer69->Add( m_staticline10, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
+	
+	wxBoxSizer* bSizer52;
+	bSizer52 = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticText45 = new wxStaticText( m_panel13, wxID_ANY, _("Hints:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText45->Wrap( -1 );
+	m_staticText45->SetFont( wxFont( 10, 70, 90, 92, true, wxEmptyString ) );
+	
+	bSizer52->Add( m_staticText45, 0, wxBOTTOM, 5 );
+	
+	m_staticText83 = new wxStaticText( m_panel13, wxID_ANY, _("1. Enter relative file or directory names separated by ';' or a new line."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText83->Wrap( -1 );
+	bSizer52->Add( m_staticText83, 0, 0, 5 );
+	
+	m_staticText84 = new wxStaticText( m_panel13, wxID_ANY, _("2. Use wildcard characters '*' and '?'."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText84->Wrap( -1 );
+	bSizer52->Add( m_staticText84, 0, 0, 5 );
+	
+	m_staticText85 = new wxStaticText( m_panel13, wxID_ANY, _("3. Exclude files directly on main grid via context menu."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText85->Wrap( -1 );
+	bSizer52->Add( m_staticText85, 0, 0, 5 );
+	
+	bSizer69->Add( bSizer52, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 10 );
+	
+	wxStaticBoxSizer* sbSizer21;
+	sbSizer21 = new wxStaticBoxSizer( new wxStaticBox( m_panel13, wxID_ANY, _("Example") ), wxVERTICAL );
+	
+	wxBoxSizer* bSizer66;
+	bSizer66 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_staticText181 = new wxStaticText( m_panel13, wxID_ANY, _("Include: *.doc;*.zip;*.exe\nExclude: \\stuff\\temp\\*"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText181->Wrap( -1 );
+	bSizer66->Add( m_staticText181, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_staticText1811 = new wxStaticText( m_panel13, wxID_ANY, _("Synchronize all .doc, .zip and .exe files except everything in subfolder \"temp\"."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText1811->Wrap( 250 );
+	m_staticText1811->SetFont( wxFont( 8, 70, 93, 90, false, wxEmptyString ) );
+	
+	bSizer66->Add( m_staticText1811, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+	
+	sbSizer21->Add( bSizer66, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 5 );
+	
+	bSizer69->Add( sbSizer21, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	m_panel13->SetSizer( bSizer69 );
+	m_panel13->Layout();
+	bSizer69->Fit( m_panel13 );
+	bSizer21->Add( m_panel13, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxEXPAND, 5 );
+	
+	
+	bSizer21->Add( 0, 0, 0, 0, 5 );
+	
+	wxBoxSizer* bSizer159;
+	bSizer159 = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxBoxSizer* bSizer166;
+	bSizer166 = new wxBoxSizer( wxVERTICAL );
+	
+	wxStaticBoxSizer* sbSizer8;
+	sbSizer8 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Include") ), wxHORIZONTAL );
+	
+	m_bitmapInclude = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), 0 );
+	sbSizer8->Add( m_bitmapInclude, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxRIGHT, 5 );
+	
+	m_textCtrlInclude = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE );
+	sbSizer8->Add( m_textCtrlInclude, 1, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+	
+	bSizer166->Add( sbSizer8, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	
+	wxStaticBoxSizer* sbSizer26;
+	sbSizer26 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Exclude") ), wxHORIZONTAL );
+	
+	m_bitmapExclude = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), 0 );
+	sbSizer26->Add( m_bitmapExclude, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	
+	m_textCtrlExclude = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE );
+	sbSizer26->Add( m_textCtrlExclude, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	bSizer166->Add( sbSizer26, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+	
+	bSizer159->Add( bSizer166, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	
+	
+	bSizer159->Add( 5, 0, 0, 0, 5 );
+	
+	wxBoxSizer* bSizer160;
+	bSizer160 = new wxBoxSizer( wxVERTICAL );
+	
+	wxStaticBoxSizer* sbSizer25;
+	sbSizer25 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Date") ), wxHORIZONTAL );
+	
+	wxBoxSizer* bSizer169;
+	bSizer169 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmapFilterDate = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 34,34 ), 0 );
+	bSizer169->Add( m_bitmapFilterDate, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+	
+	wxBoxSizer* bSizer165;
+	bSizer165 = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticText103 = new wxStaticText( this, wxID_ANY, _("Select time span"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText103->Wrap( -1 );
+	bSizer165->Add( m_staticText103, 0, 0, 5 );
+	
+	wxBoxSizer* bSizer164;
+	bSizer164 = new wxBoxSizer( wxVERTICAL );
+	
+	wxArrayString m_choiceUnitTimespanChoices;
+	m_choiceUnitTimespan = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitTimespanChoices, 0 );
+	m_choiceUnitTimespan->SetSelection( 0 );
+	bSizer164->Add( m_choiceUnitTimespan, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_spinCtrlTimespan = new wxSpinCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
+	m_spinCtrlTimespan->Hide();
+	
+	bSizer164->Add( m_spinCtrlTimespan, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizer165->Add( bSizer164, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizer169->Add( bSizer165, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	sbSizer25->Add( bSizer169, 0, 0, 5 );
+	
+	bSizer160->Add( sbSizer25, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+	
+	wxStaticBoxSizer* sbSizer81;
+	sbSizer81 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Size") ), wxHORIZONTAL );
+	
+	wxBoxSizer* bSizer170;
+	bSizer170 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmapFilterSize = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 32,32 ), 0 );
+	bSizer170->Add( m_bitmapFilterSize, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxRIGHT, 5 );
+	
+	wxBoxSizer* bSizer158;
+	bSizer158 = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticText101 = new wxStaticText( this, wxID_ANY, _("Minimum file size"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText101->Wrap( -1 );
+	bSizer158->Add( m_staticText101, 0, 0, 5 );
+	
+	wxBoxSizer* bSizer162;
+	bSizer162 = new wxBoxSizer( wxVERTICAL );
+	
+	m_spinCtrlMinSize = new wxSpinCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
+	bSizer162->Add( m_spinCtrlMinSize, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	wxArrayString m_choiceUnitMinSizeChoices;
+	m_choiceUnitMinSize = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitMinSizeChoices, 0 );
+	m_choiceUnitMinSize->SetSelection( 0 );
+	bSizer162->Add( m_choiceUnitMinSize, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizer158->Add( bSizer162, 0, wxBOTTOM, 5 );
+	
+	m_staticText102 = new wxStaticText( this, wxID_ANY, _("Maximum file size"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText102->Wrap( -1 );
+	bSizer158->Add( m_staticText102, 0, 0, 5 );
+	
+	wxBoxSizer* bSizer163;
+	bSizer163 = new wxBoxSizer( wxVERTICAL );
+	
+	m_spinCtrlMaxSize = new wxSpinCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
+	bSizer163->Add( m_spinCtrlMaxSize, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	wxArrayString m_choiceUnitMaxSizeChoices;
+	m_choiceUnitMaxSize = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceUnitMaxSizeChoices, 0 );
+	m_choiceUnitMaxSize->SetSelection( 0 );
+	bSizer163->Add( m_choiceUnitMaxSize, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizer158->Add( bSizer163, 0, wxTOP, 5 );
+	
+	bSizer170->Add( bSizer158, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	sbSizer81->Add( bSizer170, 0, 0, 5 );
+	
+	bSizer160->Add( sbSizer81, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+	
+	bSizer159->Add( bSizer160, 0, wxEXPAND, 5 );
+	
+	bSizer21->Add( bSizer159, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
+	
+	wxBoxSizer* bSizer22;
+	bSizer22 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_button9 = new wxButton( this, wxID_DEFAULT, _("&Default"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+	m_button9->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+	
+	bSizer22->Add( m_button9, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizer22->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_button10 = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+	m_button10->SetDefault(); 
+	m_button10->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
+	
+	bSizer22->Add( m_button10, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
+	
+	m_button17 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+	m_button17->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+	
+	bSizer22->Add( m_button17, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	bSizer21->Add( bSizer22, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxBOTTOM|wxEXPAND, 5 );
+	
+	this->SetSizer( bSizer21 );
+	this->Layout();
+	bSizer21->Fit( this );
+	
+	this->Centre( wxBOTH );
+	
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( FilterDlgGenerated::OnClose ) );
+	m_bpButtonHelp->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnHelp ), NULL, this );
+	m_textCtrlInclude->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateNameFilter ), NULL, this );
+	m_textCtrlExclude->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateNameFilter ), NULL, this );
+	m_choiceUnitTimespan->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateChoice ), NULL, this );
+	m_choiceUnitMinSize->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateChoice ), NULL, this );
+	m_choiceUnitMaxSize->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateChoice ), NULL, this );
+	m_button9->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnDefault ), NULL, this );
+	m_button10->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnApply ), NULL, this );
+	m_button17->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnCancel ), NULL, this );
 }
 
 FilterDlgGenerated::~FilterDlgGenerated()
 {
-    // Disconnect Events
-    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( FilterDlgGenerated::OnClose ) );
-    m_bpButtonHelp->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnHelp ), NULL, this );
-    m_textCtrlInclude->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateNameFilter ), NULL, this );
-    m_textCtrlExclude->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateNameFilter ), NULL, this );
-    m_choiceUnitTimespan->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateChoice ), NULL, this );
-    m_choiceUnitMinSize->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateChoice ), NULL, this );
-    m_choiceUnitMaxSize->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateChoice ), NULL, this );
-    m_button9->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnDefault ), NULL, this );
-    m_button10->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnApply ), NULL, this );
-    m_button17->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnCancel ), NULL, this );
-
+	// Disconnect Events
+	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( FilterDlgGenerated::OnClose ) );
+	m_bpButtonHelp->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnHelp ), NULL, this );
+	m_textCtrlInclude->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateNameFilter ), NULL, this );
+	m_textCtrlExclude->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateNameFilter ), NULL, this );
+	m_choiceUnitTimespan->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateChoice ), NULL, this );
+	m_choiceUnitMinSize->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateChoice ), NULL, this );
+	m_choiceUnitMaxSize->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( FilterDlgGenerated::OnUpdateChoice ), NULL, this );
+	m_button9->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnDefault ), NULL, this );
+	m_button10->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnApply ), NULL, this );
+	m_button17->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnCancel ), NULL, this );
+	
 }
 
 CustomizeColsDlgGenerated::CustomizeColsDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-
-    wxBoxSizer* bSizer96;
-    bSizer96 = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer99;
-    bSizer99 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxArrayString m_checkListColumnsChoices;
-    m_checkListColumns = new wxCheckListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_checkListColumnsChoices, 0 );
-    bSizer99->Add( m_checkListColumns, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    wxBoxSizer* bSizer98;
-    bSizer98 = new wxBoxSizer( wxVERTICAL );
-
-    m_bpButton29 = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-    m_bpButton29->SetToolTip( _("Move column up") );
-
-    bSizer98->Add( m_bpButton29, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-
-    m_bpButton30 = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-    m_bpButton30->SetToolTip( _("Move column down") );
-
-    bSizer98->Add( m_bpButton30, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
-    bSizer99->Add( bSizer98, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizer96->Add( bSizer99, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    wxBoxSizer* bSizer97;
-    bSizer97 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_button9 = new wxButton( this, wxID_DEFAULT, _("&Default"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-    m_button9->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-
-    bSizer97->Add( m_button9, 0, wxALL, 5 );
-
-
-    bSizer97->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_button28 = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-    m_button28->SetDefault();
-    m_button28->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
-
-    bSizer97->Add( m_button28, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
-
-    m_button29 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-    m_button29->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-
-    bSizer97->Add( m_button29, 0, wxALL, 5 );
-
-    bSizer96->Add( bSizer97, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-
-    this->SetSizer( bSizer96 );
-    this->Layout();
-    bSizer96->Fit( this );
-
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CustomizeColsDlgGenerated::OnClose ) );
-    m_bpButton29->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnMoveUp ), NULL, this );
-    m_bpButton30->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnMoveDown ), NULL, this );
-    m_button9->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnDefault ), NULL, this );
-    m_button28->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnOkay ), NULL, this );
-    m_button29->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnCancel ), NULL, this );
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	
+	wxBoxSizer* bSizer96;
+	bSizer96 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer99;
+	bSizer99 = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxArrayString m_checkListColumnsChoices;
+	m_checkListColumns = new wxCheckListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_checkListColumnsChoices, 0 );
+	bSizer99->Add( m_checkListColumns, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	wxBoxSizer* bSizer98;
+	bSizer98 = new wxBoxSizer( wxVERTICAL );
+	
+	m_bpButton29 = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+	m_bpButton29->SetToolTip( _("Move column up") );
+	
+	bSizer98->Add( m_bpButton29, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+	
+	m_bpButton30 = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+	m_bpButton30->SetToolTip( _("Move column down") );
+	
+	bSizer98->Add( m_bpButton30, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	
+	bSizer99->Add( bSizer98, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizer96->Add( bSizer99, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	wxBoxSizer* bSizer97;
+	bSizer97 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_button9 = new wxButton( this, wxID_DEFAULT, _("&Default"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+	m_button9->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+	
+	bSizer97->Add( m_button9, 0, wxALL, 5 );
+	
+	
+	bSizer97->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_button28 = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+	m_button28->SetDefault(); 
+	m_button28->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
+	
+	bSizer97->Add( m_button28, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
+	
+	m_button29 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+	m_button29->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+	
+	bSizer97->Add( m_button29, 0, wxALL, 5 );
+	
+	bSizer96->Add( bSizer97, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+	
+	this->SetSizer( bSizer96 );
+	this->Layout();
+	bSizer96->Fit( this );
+	
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CustomizeColsDlgGenerated::OnClose ) );
+	m_bpButton29->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnMoveUp ), NULL, this );
+	m_bpButton30->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnMoveDown ), NULL, this );
+	m_button9->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnDefault ), NULL, this );
+	m_button28->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnOkay ), NULL, this );
+	m_button29->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnCancel ), NULL, this );
 }
 
 CustomizeColsDlgGenerated::~CustomizeColsDlgGenerated()
 {
-    // Disconnect Events
-    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CustomizeColsDlgGenerated::OnClose ) );
-    m_bpButton29->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnMoveUp ), NULL, this );
-    m_bpButton30->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnMoveDown ), NULL, this );
-    m_button9->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnDefault ), NULL, this );
-    m_button28->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnOkay ), NULL, this );
-    m_button29->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnCancel ), NULL, this );
-
+	// Disconnect Events
+	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CustomizeColsDlgGenerated::OnClose ) );
+	m_bpButton29->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnMoveUp ), NULL, this );
+	m_bpButton30->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnMoveDown ), NULL, this );
+	m_button9->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnDefault ), NULL, this );
+	m_button28->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnOkay ), NULL, this );
+	m_button29->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnCancel ), NULL, this );
+	
 }
 
 GlobalSettingsDlgGenerated::GlobalSettingsDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-    this->SetSizeHints( wxSize( 280,230 ), wxDefaultSize );
-
-    wxBoxSizer* bSizer95;
-    bSizer95 = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer86;
-    bSizer86 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bitmapSettings = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), 0 );
-    bSizer86->Add( m_bitmapSettings, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-
-
-    bSizer86->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_panel8 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER|wxTAB_TRAVERSAL );
-    m_panel8->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DLIGHT ) );
-
-    wxBoxSizer* bSizer72;
-    bSizer72 = new wxBoxSizer( wxVERTICAL );
-
-    m_staticText56 = new wxStaticText( m_panel8, wxID_ANY, _("Global settings"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText56->Wrap( -1 );
-    m_staticText56->SetFont( wxFont( 16, 70, 90, 92, false, wxEmptyString ) );
-
-    bSizer72->Add( m_staticText56, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
-
-    m_panel8->SetSizer( bSizer72 );
-    m_panel8->Layout();
-    bSizer72->Fit( m_panel8 );
-    bSizer86->Add( m_panel8, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-    bSizer95->Add( bSizer86, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-
-    bSizer95->Add( 0, 10, 0, 0, 5 );
-
-    wxStaticBoxSizer* sbSizer23;
-    sbSizer23 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxEmptyString ), wxVERTICAL );
-
-    m_checkBoxTransCopy = new wxCheckBox( this, wxID_ANY, _("Transactional file copy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_checkBoxTransCopy->SetToolTip( _("Write files to a temporary (*.ffs_tmp) first and rename them. This guarantees a consistent state even in situations of fatal error.") );
-
-    sbSizer23->Add( m_checkBoxTransCopy, 0, wxALL|wxEXPAND, 5 );
-
-    m_checkBoxCopyLocked = new wxCheckBox( this, wxID_ANY, _("Copy locked files"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_checkBoxCopyLocked->SetToolTip( _("Copy shared or locked files using Volume Shadow Copy Service\n(Requires Administrator rights)") );
-
-    sbSizer23->Add( m_checkBoxCopyLocked, 0, wxALL|wxEXPAND, 5 );
-
-    m_checkBoxCopyPermissions = new wxCheckBox( this, wxID_ANY, _("Copy file access permissions"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_checkBoxCopyPermissions->SetToolTip( _("Transfer file and directory permissions\n(Requires Administrator rights)") );
-
-    sbSizer23->Add( m_checkBoxCopyPermissions, 0, wxALL|wxEXPAND, 5 );
-
-    m_staticline10 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    sbSizer23->Add( m_staticline10, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxTOP|wxBOTTOM, 5 );
-
-    wxBoxSizer* bSizer101;
-    bSizer101 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_staticText100 = new wxStaticText( this, wxID_ANY, _("Hidden dialogs:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText100->Wrap( -1 );
-    bSizer101->Add( m_staticText100, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizer101->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    m_buttonResetDialogs = new wxButtonWithImage( this, wxID_ANY, _("Reset"), wxDefaultPosition, wxSize( 80,-1 ), 0 );
-    m_buttonResetDialogs->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-    m_buttonResetDialogs->SetToolTip( _("Show hidden dialogs") );
-
-    bSizer101->Add( m_buttonResetDialogs, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
-
-    sbSizer23->Add( bSizer101, 0, wxEXPAND, 5 );
-
-    bSizer95->Add( sbSizer23, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-
-
-    bSizer95->Add( 0, 10, 0, 0, 5 );
-
-    wxStaticBoxSizer* sbSizer26;
-    sbSizer26 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("External applications") ), wxHORIZONTAL );
-
-
-    sbSizer26->Add( 5, 0, 0, 0, 5 );
-
-    m_gridCustomCommand = new wxGrid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-
-    // Grid
-    m_gridCustomCommand->CreateGrid( 5, 2 );
-    m_gridCustomCommand->EnableEditing( true );
-    m_gridCustomCommand->EnableGridLines( true );
-    m_gridCustomCommand->EnableDragGridSize( false );
-    m_gridCustomCommand->SetMargins( 0, 0 );
-
-    // Columns
-    m_gridCustomCommand->SetColSize( 0, 129 );
-    m_gridCustomCommand->SetColSize( 1, 179 );
-    m_gridCustomCommand->EnableDragColMove( false );
-    m_gridCustomCommand->EnableDragColSize( true );
-    m_gridCustomCommand->SetColLabelSize( 20 );
-    m_gridCustomCommand->SetColLabelValue( 0, _("Description") );
-    m_gridCustomCommand->SetColLabelValue( 1, _("Command line") );
-    m_gridCustomCommand->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-
-    // Rows
-    m_gridCustomCommand->EnableDragRowSize( false );
-    m_gridCustomCommand->SetRowLabelSize( 0 );
-    m_gridCustomCommand->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-
-    // Label Appearance
-
-    // Cell Defaults
-    m_gridCustomCommand->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
-    sbSizer26->Add( m_gridCustomCommand, 1, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-
-    wxBoxSizer* bSizer157;
-    bSizer157 = new wxBoxSizer( wxVERTICAL );
-
-    m_bpButtonAddRow = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
-    bSizer157->Add( m_bpButtonAddRow, 0, 0, 5 );
-
-    m_bpButtonRemoveRow = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
-    bSizer157->Add( m_bpButtonRemoveRow, 0, 0, 5 );
-
-    sbSizer26->Add( bSizer157, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-
-    sbSizer26->Add( 5, 0, 0, 0, 5 );
-
-    bSizer95->Add( sbSizer26, 1, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-
-    wxBoxSizer* bSizer97;
-    bSizer97 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_button9 = new wxButton( this, wxID_DEFAULT, _("&Default"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-    m_button9->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-
-    bSizer97->Add( m_button9, 0, wxALL, 5 );
-
-
-    bSizer97->Add( 0, 0, 1, 0, 5 );
-
-    m_buttonOkay = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-    m_buttonOkay->SetDefault();
-    m_buttonOkay->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
-
-    bSizer97->Add( m_buttonOkay, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
-
-    m_button29 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-    m_button29->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-
-    bSizer97->Add( m_button29, 0, wxALL, 5 );
-
-    bSizer95->Add( bSizer97, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-
-    this->SetSizer( bSizer95 );
-    this->Layout();
-    bSizer95->Fit( this );
-
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( GlobalSettingsDlgGenerated::OnClose ) );
-    m_buttonResetDialogs->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnResetDialogs ), NULL, this );
-    m_bpButtonAddRow->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnAddRow ), NULL, this );
-    m_bpButtonRemoveRow->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnRemoveRow ), NULL, this );
-    m_button9->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnDefault ), NULL, this );
-    m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnOkay ), NULL, this );
-    m_button29->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnCancel ), NULL, this );
+	this->SetSizeHints( wxSize( 280,230 ), wxDefaultSize );
+	
+	wxBoxSizer* bSizer95;
+	bSizer95 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer86;
+	bSizer86 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmapSettings = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), 0 );
+	bSizer86->Add( m_bitmapSettings, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+	
+	
+	bSizer86->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_panel8 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER|wxTAB_TRAVERSAL );
+	m_panel8->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DLIGHT ) );
+	
+	wxBoxSizer* bSizer72;
+	bSizer72 = new wxBoxSizer( wxVERTICAL );
+	
+	m_staticText56 = new wxStaticText( m_panel8, wxID_ANY, _("Global settings"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText56->Wrap( -1 );
+	m_staticText56->SetFont( wxFont( 16, 70, 90, 92, false, wxEmptyString ) );
+	
+	bSizer72->Add( m_staticText56, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+	
+	m_panel8->SetSizer( bSizer72 );
+	m_panel8->Layout();
+	bSizer72->Fit( m_panel8 );
+	bSizer86->Add( m_panel8, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	bSizer95->Add( bSizer86, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	
+	bSizer95->Add( 0, 10, 0, 0, 5 );
+	
+	wxStaticBoxSizer* sbSizer23;
+	sbSizer23 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxEmptyString ), wxVERTICAL );
+	
+	m_checkBoxTransCopy = new wxCheckBox( this, wxID_ANY, _("Transactional file copy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_checkBoxTransCopy->SetToolTip( _("Write to a temporary file (*.ffs_tmp) first then rename it. This guarantees a consistent state even in case of fatal error.") );
+	
+	sbSizer23->Add( m_checkBoxTransCopy, 0, wxALL|wxEXPAND, 5 );
+	
+	m_checkBoxCopyLocked = new wxCheckBox( this, wxID_ANY, _("Copy locked files"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_checkBoxCopyLocked->SetToolTip( _("Copy shared or locked files using Volume Shadow Copy Service\n(Requires Administrator rights)") );
+	
+	sbSizer23->Add( m_checkBoxCopyLocked, 0, wxALL|wxEXPAND, 5 );
+	
+	m_checkBoxCopyPermissions = new wxCheckBox( this, wxID_ANY, _("Copy file access permissions"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_checkBoxCopyPermissions->SetToolTip( _("Transfer file and directory permissions\n(Requires Administrator rights)") );
+	
+	sbSizer23->Add( m_checkBoxCopyPermissions, 0, wxALL|wxEXPAND, 5 );
+	
+	m_staticline10 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	sbSizer23->Add( m_staticline10, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxTOP|wxBOTTOM, 5 );
+	
+	wxBoxSizer* bSizer101;
+	bSizer101 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_staticText100 = new wxStaticText( this, wxID_ANY, _("Hidden dialogs:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText100->Wrap( -1 );
+	bSizer101->Add( m_staticText100, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizer101->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	m_buttonResetDialogs = new zen::BitmapButton( this, wxID_ANY, _("Reset"), wxDefaultPosition, wxSize( 80,-1 ), 0 );
+	m_buttonResetDialogs->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+	m_buttonResetDialogs->SetToolTip( _("Show hidden dialogs") );
+	
+	bSizer101->Add( m_buttonResetDialogs, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	sbSizer23->Add( bSizer101, 0, wxEXPAND, 5 );
+	
+	bSizer95->Add( sbSizer23, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+	
+	
+	bSizer95->Add( 0, 10, 0, 0, 5 );
+	
+	wxStaticBoxSizer* sbSizer26;
+	sbSizer26 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("External applications") ), wxHORIZONTAL );
+	
+	
+	sbSizer26->Add( 5, 0, 0, 0, 5 );
+	
+	m_gridCustomCommand = new wxGrid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+	
+	// Grid
+	m_gridCustomCommand->CreateGrid( 5, 2 );
+	m_gridCustomCommand->EnableEditing( true );
+	m_gridCustomCommand->EnableGridLines( true );
+	m_gridCustomCommand->EnableDragGridSize( false );
+	m_gridCustomCommand->SetMargins( 0, 0 );
+	
+	// Columns
+	m_gridCustomCommand->SetColSize( 0, 129 );
+	m_gridCustomCommand->SetColSize( 1, 179 );
+	m_gridCustomCommand->EnableDragColMove( false );
+	m_gridCustomCommand->EnableDragColSize( true );
+	m_gridCustomCommand->SetColLabelSize( 20 );
+	m_gridCustomCommand->SetColLabelValue( 0, _("Description") );
+	m_gridCustomCommand->SetColLabelValue( 1, _("Command line") );
+	m_gridCustomCommand->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
+	
+	// Rows
+	m_gridCustomCommand->EnableDragRowSize( false );
+	m_gridCustomCommand->SetRowLabelSize( 0 );
+	m_gridCustomCommand->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
+	
+	// Label Appearance
+	
+	// Cell Defaults
+	m_gridCustomCommand->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+	sbSizer26->Add( m_gridCustomCommand, 1, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer157;
+	bSizer157 = new wxBoxSizer( wxVERTICAL );
+	
+	m_bpButtonAddRow = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
+	bSizer157->Add( m_bpButtonAddRow, 0, 0, 5 );
+	
+	m_bpButtonRemoveRow = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
+	bSizer157->Add( m_bpButtonRemoveRow, 0, 0, 5 );
+	
+	sbSizer26->Add( bSizer157, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	
+	sbSizer26->Add( 5, 0, 0, 0, 5 );
+	
+	bSizer95->Add( sbSizer26, 1, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer97;
+	bSizer97 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_button9 = new wxButton( this, wxID_DEFAULT, _("&Default"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+	m_button9->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+	
+	bSizer97->Add( m_button9, 0, wxALL, 5 );
+	
+	
+	bSizer97->Add( 0, 0, 1, 0, 5 );
+	
+	m_buttonOkay = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+	m_buttonOkay->SetDefault(); 
+	m_buttonOkay->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
+	
+	bSizer97->Add( m_buttonOkay, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
+	
+	m_button29 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+	m_button29->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+	
+	bSizer97->Add( m_button29, 0, wxALL, 5 );
+	
+	bSizer95->Add( bSizer97, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+	
+	this->SetSizer( bSizer95 );
+	this->Layout();
+	bSizer95->Fit( this );
+	
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( GlobalSettingsDlgGenerated::OnClose ) );
+	m_buttonResetDialogs->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnResetDialogs ), NULL, this );
+	m_bpButtonAddRow->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnAddRow ), NULL, this );
+	m_bpButtonRemoveRow->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnRemoveRow ), NULL, this );
+	m_button9->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnDefault ), NULL, this );
+	m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnOkay ), NULL, this );
+	m_button29->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnCancel ), NULL, this );
 }
 
 GlobalSettingsDlgGenerated::~GlobalSettingsDlgGenerated()
 {
-    // Disconnect Events
-    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( GlobalSettingsDlgGenerated::OnClose ) );
-    m_buttonResetDialogs->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnResetDialogs ), NULL, this );
-    m_bpButtonAddRow->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnAddRow ), NULL, this );
-    m_bpButtonRemoveRow->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnRemoveRow ), NULL, this );
-    m_button9->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnDefault ), NULL, this );
-    m_buttonOkay->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnOkay ), NULL, this );
-    m_button29->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnCancel ), NULL, this );
-
+	// Disconnect Events
+	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( GlobalSettingsDlgGenerated::OnClose ) );
+	m_buttonResetDialogs->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnResetDialogs ), NULL, this );
+	m_bpButtonAddRow->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnAddRow ), NULL, this );
+	m_bpButtonRemoveRow->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnRemoveRow ), NULL, this );
+	m_button9->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnDefault ), NULL, this );
+	m_buttonOkay->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnOkay ), NULL, this );
+	m_button29->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnCancel ), NULL, this );
+	
 }
 
 SyncPreviewDlgGenerated::SyncPreviewDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-
-    wxBoxSizer* bSizer134;
-    bSizer134 = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer158;
-    bSizer158 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_buttonStartSync = new wxButtonWithImage( this, wxID_ANY, _("Start"), wxDefaultPosition, wxSize( -1,40 ), 0 );
-    m_buttonStartSync->SetDefault();
-    m_buttonStartSync->SetFont( wxFont( 14, 70, 90, 92, false, wxT("Arial Black") ) );
-    m_buttonStartSync->SetToolTip( _("Start synchronization") );
-
-    bSizer158->Add( m_buttonStartSync, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_staticline16 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-    bSizer158->Add( m_staticline16, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
-
-    wxStaticBoxSizer* sbSizer28;
-    sbSizer28 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Variant") ), wxVERTICAL );
-
-    m_staticTextVariant = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextVariant->Wrap( -1 );
-    m_staticTextVariant->SetFont( wxFont( 10, 70, 90, 92, false, wxT("Arial Black") ) );
-
-    sbSizer28->Add( m_staticTextVariant, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    bSizer158->Add( sbSizer28, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
-    bSizer134->Add( bSizer158, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-
-    m_staticline14 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer134->Add( m_staticline14, 0, wxEXPAND, 5 );
-
-    wxBoxSizer* bSizer141;
-    bSizer141 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxStaticBoxSizer* sbSizer161;
-    sbSizer161 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Statistics") ), wxVERTICAL );
-
-    wxBoxSizer* bSizer157;
-    bSizer157 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxFlexGridSizer* fgSizer5;
-    fgSizer5 = new wxFlexGridSizer( 4, 2, 0, 5 );
-    fgSizer5->SetFlexibleDirection( wxHORIZONTAL );
-    fgSizer5->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-
-
-    fgSizer5->Add( 0, 0, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_staticText94 = new wxStaticText( this, wxID_ANY, _("Left"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText94->Wrap( -1 );
-    m_staticText94->SetFont( wxFont( 9, 70, 90, 92, false, wxEmptyString ) );
-
-    fgSizer5->Add( m_staticText94, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_bitmapCreate = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    m_bitmapCreate->SetToolTip( _("Number of files and directories that will be created") );
-
-    fgSizer5->Add( m_bitmapCreate, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_textCtrlCreateL = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY|wxTE_RIGHT );
-    m_textCtrlCreateL->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
-    m_textCtrlCreateL->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-    m_textCtrlCreateL->SetToolTip( _("Number of files and directories that will be created") );
-
-    fgSizer5->Add( m_textCtrlCreateL, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_bitmapUpdate = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    m_bitmapUpdate->SetToolTip( _("Number of files that will be overwritten") );
-
-    fgSizer5->Add( m_bitmapUpdate, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_textCtrlUpdateL = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY|wxTE_RIGHT );
-    m_textCtrlUpdateL->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
-    m_textCtrlUpdateL->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-    m_textCtrlUpdateL->SetToolTip( _("Number of files that will be overwritten") );
-
-    fgSizer5->Add( m_textCtrlUpdateL, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_bitmapDelete = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    m_bitmapDelete->SetToolTip( _("Number of files and directories that will be deleted") );
-
-    fgSizer5->Add( m_bitmapDelete, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_textCtrlDeleteL = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY|wxTE_RIGHT );
-    m_textCtrlDeleteL->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
-    m_textCtrlDeleteL->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-    m_textCtrlDeleteL->SetToolTip( _("Number of files and directories that will be deleted") );
-
-    fgSizer5->Add( m_textCtrlDeleteL, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizer157->Add( fgSizer5, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-
-    wxFlexGridSizer* fgSizer51;
-    fgSizer51 = new wxFlexGridSizer( 3, 1, 0, 5 );
-    fgSizer51->SetFlexibleDirection( wxHORIZONTAL );
-    fgSizer51->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-
-    m_staticText95 = new wxStaticText( this, wxID_ANY, _("Right"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText95->Wrap( -1 );
-    m_staticText95->SetFont( wxFont( 9, 70, 90, 92, false, wxEmptyString ) );
-
-    fgSizer51->Add( m_staticText95, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_textCtrlCreateR = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY|wxTE_RIGHT );
-    m_textCtrlCreateR->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
-    m_textCtrlCreateR->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-    m_textCtrlCreateR->SetToolTip( _("Number of files and directories that will be created") );
-
-    fgSizer51->Add( m_textCtrlCreateR, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_textCtrlUpdateR = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY|wxTE_RIGHT );
-    m_textCtrlUpdateR->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
-    m_textCtrlUpdateR->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-    m_textCtrlUpdateR->SetToolTip( _("Number of files that will be overwritten") );
-
-    fgSizer51->Add( m_textCtrlUpdateR, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_textCtrlDeleteR = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY|wxTE_RIGHT );
-    m_textCtrlDeleteR->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
-    m_textCtrlDeleteR->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-    m_textCtrlDeleteR->SetToolTip( _("Number of files and directories that will be deleted") );
-
-    fgSizer51->Add( m_textCtrlDeleteR, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizer157->Add( fgSizer51, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
-
-    sbSizer161->Add( bSizer157, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-
-    sbSizer161->Add( 0, 10, 0, 0, 5 );
-
-    wxBoxSizer* bSizer156;
-    bSizer156 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bitmapData = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    m_bitmapData->SetToolTip( _("Total amount of data that will be transferred") );
-
-    bSizer156->Add( m_bitmapData, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxRIGHT, 5 );
-
-
-    bSizer156->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    m_textCtrlData = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_CENTRE|wxTE_READONLY );
-    m_textCtrlData->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
-    m_textCtrlData->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-    m_textCtrlData->SetToolTip( _("Total amount of data that will be transferred") );
-
-    bSizer156->Add( m_textCtrlData, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizer156->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    sbSizer161->Add( bSizer156, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-
-    bSizer141->Add( sbSizer161, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
-
-    bSizer134->Add( bSizer141, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    m_staticline12 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-    bSizer134->Add( m_staticline12, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
-
-    wxBoxSizer* bSizer142;
-    bSizer142 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_checkBoxDontShowAgain = new wxCheckBox( this, wxID_ANY, _("Do not show this dialog again"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer142->Add( m_checkBoxDontShowAgain, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-
-    bSizer142->Add( 10, 0, 1, 0, 5 );
-
-    m_button16 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-    m_button16->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-
-    bSizer142->Add( m_button16, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    bSizer134->Add( bSizer142, 0, wxEXPAND, 5 );
-
-    this->SetSizer( bSizer134 );
-    this->Layout();
-    bSizer134->Fit( this );
-
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SyncPreviewDlgGenerated::OnClose ) );
-    m_buttonStartSync->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncPreviewDlgGenerated::OnStartSync ), NULL, this );
-    m_button16->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncPreviewDlgGenerated::OnCancel ), NULL, this );
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	
+	wxBoxSizer* bSizer134;
+	bSizer134 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer158;
+	bSizer158 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_buttonStartSync = new zen::BitmapButton( this, wxID_ANY, _("Start"), wxDefaultPosition, wxSize( -1,40 ), 0 );
+	m_buttonStartSync->SetDefault(); 
+	m_buttonStartSync->SetFont( wxFont( 14, 70, 90, 92, false, wxT("Arial Black") ) );
+	m_buttonStartSync->SetToolTip( _("Start synchronization") );
+	
+	bSizer158->Add( m_buttonStartSync, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_staticline16 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+	bSizer158->Add( m_staticline16, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
+	
+	wxStaticBoxSizer* sbSizer28;
+	sbSizer28 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Variant") ), wxVERTICAL );
+	
+	m_staticTextVariant = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextVariant->Wrap( -1 );
+	m_staticTextVariant->SetFont( wxFont( 10, 70, 90, 92, false, wxT("Arial Black") ) );
+	
+	sbSizer28->Add( m_staticTextVariant, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	bSizer158->Add( sbSizer28, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	
+	bSizer134->Add( bSizer158, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+	
+	m_staticline14 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer134->Add( m_staticline14, 0, wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer141;
+	bSizer141 = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxStaticBoxSizer* sbSizer161;
+	sbSizer161 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Statistics") ), wxVERTICAL );
+	
+	wxBoxSizer* bSizer157;
+	bSizer157 = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxFlexGridSizer* fgSizer5;
+	fgSizer5 = new wxFlexGridSizer( 4, 2, 0, 5 );
+	fgSizer5->SetFlexibleDirection( wxHORIZONTAL );
+	fgSizer5->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	
+	
+	fgSizer5->Add( 0, 0, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_staticText94 = new wxStaticText( this, wxID_ANY, _("Left"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText94->Wrap( -1 );
+	m_staticText94->SetFont( wxFont( 9, 70, 90, 92, false, wxEmptyString ) );
+	
+	fgSizer5->Add( m_staticText94, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_bitmapCreate = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	m_bitmapCreate->SetToolTip( _("Number of files and directories that will be created") );
+	
+	fgSizer5->Add( m_bitmapCreate, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_textCtrlCreateL = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY|wxTE_RIGHT );
+	m_textCtrlCreateL->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
+	m_textCtrlCreateL->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+	m_textCtrlCreateL->SetToolTip( _("Number of files and directories that will be created") );
+	
+	fgSizer5->Add( m_textCtrlCreateL, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_bitmapUpdate = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	m_bitmapUpdate->SetToolTip( _("Number of files that will be overwritten") );
+	
+	fgSizer5->Add( m_bitmapUpdate, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_textCtrlUpdateL = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY|wxTE_RIGHT );
+	m_textCtrlUpdateL->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
+	m_textCtrlUpdateL->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+	m_textCtrlUpdateL->SetToolTip( _("Number of files that will be overwritten") );
+	
+	fgSizer5->Add( m_textCtrlUpdateL, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_bitmapDelete = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	m_bitmapDelete->SetToolTip( _("Number of files and directories that will be deleted") );
+	
+	fgSizer5->Add( m_bitmapDelete, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_textCtrlDeleteL = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY|wxTE_RIGHT );
+	m_textCtrlDeleteL->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
+	m_textCtrlDeleteL->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+	m_textCtrlDeleteL->SetToolTip( _("Number of files and directories that will be deleted") );
+	
+	fgSizer5->Add( m_textCtrlDeleteL, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizer157->Add( fgSizer5, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+	
+	wxFlexGridSizer* fgSizer51;
+	fgSizer51 = new wxFlexGridSizer( 3, 1, 0, 5 );
+	fgSizer51->SetFlexibleDirection( wxHORIZONTAL );
+	fgSizer51->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	
+	m_staticText95 = new wxStaticText( this, wxID_ANY, _("Right"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText95->Wrap( -1 );
+	m_staticText95->SetFont( wxFont( 9, 70, 90, 92, false, wxEmptyString ) );
+	
+	fgSizer51->Add( m_staticText95, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_textCtrlCreateR = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY|wxTE_RIGHT );
+	m_textCtrlCreateR->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
+	m_textCtrlCreateR->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+	m_textCtrlCreateR->SetToolTip( _("Number of files and directories that will be created") );
+	
+	fgSizer51->Add( m_textCtrlCreateR, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_textCtrlUpdateR = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY|wxTE_RIGHT );
+	m_textCtrlUpdateR->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
+	m_textCtrlUpdateR->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+	m_textCtrlUpdateR->SetToolTip( _("Number of files that will be overwritten") );
+	
+	fgSizer51->Add( m_textCtrlUpdateR, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_textCtrlDeleteR = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY|wxTE_RIGHT );
+	m_textCtrlDeleteR->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
+	m_textCtrlDeleteR->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+	m_textCtrlDeleteR->SetToolTip( _("Number of files and directories that will be deleted") );
+	
+	fgSizer51->Add( m_textCtrlDeleteR, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizer157->Add( fgSizer51, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	sbSizer161->Add( bSizer157, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	
+	sbSizer161->Add( 0, 10, 0, 0, 5 );
+	
+	wxBoxSizer* bSizer156;
+	bSizer156 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmapData = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	m_bitmapData->SetToolTip( _("Total amount of data that will be transferred") );
+	
+	bSizer156->Add( m_bitmapData, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxRIGHT, 5 );
+	
+	
+	bSizer156->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	m_textCtrlData = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_CENTRE|wxTE_READONLY );
+	m_textCtrlData->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
+	m_textCtrlData->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+	m_textCtrlData->SetToolTip( _("Total amount of data that will be transferred") );
+	
+	bSizer156->Add( m_textCtrlData, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizer156->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	sbSizer161->Add( bSizer156, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+	
+	bSizer141->Add( sbSizer161, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+	
+	bSizer134->Add( bSizer141, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	m_staticline12 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+	bSizer134->Add( m_staticline12, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
+	
+	wxBoxSizer* bSizer142;
+	bSizer142 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_checkBoxDontShowAgain = new wxCheckBox( this, wxID_ANY, _("Do not show this dialog again"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer142->Add( m_checkBoxDontShowAgain, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizer142->Add( 10, 0, 1, 0, 5 );
+	
+	m_button16 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+	m_button16->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+	
+	bSizer142->Add( m_button16, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+	
+	bSizer134->Add( bSizer142, 0, wxEXPAND, 5 );
+	
+	this->SetSizer( bSizer134 );
+	this->Layout();
+	bSizer134->Fit( this );
+	
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SyncPreviewDlgGenerated::OnClose ) );
+	m_buttonStartSync->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncPreviewDlgGenerated::OnStartSync ), NULL, this );
+	m_button16->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncPreviewDlgGenerated::OnCancel ), NULL, this );
 }
 
 SyncPreviewDlgGenerated::~SyncPreviewDlgGenerated()
 {
-    // Disconnect Events
-    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SyncPreviewDlgGenerated::OnClose ) );
-    m_buttonStartSync->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncPreviewDlgGenerated::OnStartSync ), NULL, this );
-    m_button16->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncPreviewDlgGenerated::OnCancel ), NULL, this );
-
+	// Disconnect Events
+	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SyncPreviewDlgGenerated::OnClose ) );
+	m_buttonStartSync->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncPreviewDlgGenerated::OnStartSync ), NULL, this );
+	m_button16->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncPreviewDlgGenerated::OnCancel ), NULL, this );
+	
 }
 
 PopupFrameGenerated1::PopupFrameGenerated1( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxFrame( parent, id, title, pos, size, style )
 {
-    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-
-    wxBoxSizer* bSizer158;
-    bSizer158 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_bitmapLeft = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer158->Add( m_bitmapLeft, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_staticTextMain = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticTextMain->Wrap( 600 );
-    bSizer158->Add( m_staticTextMain, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    this->SetSizer( bSizer158 );
-    this->Layout();
-    bSizer158->Fit( this );
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	
+	wxBoxSizer* bSizer158;
+	bSizer158 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_bitmapLeft = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer158->Add( m_bitmapLeft, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_staticTextMain = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticTextMain->Wrap( 600 );
+	bSizer158->Add( m_staticTextMain, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	this->SetSizer( bSizer158 );
+	this->Layout();
+	bSizer158->Fit( this );
 }
 
 PopupFrameGenerated1::~PopupFrameGenerated1()
@@ -3698,130 +3731,130 @@ PopupFrameGenerated1::~PopupFrameGenerated1()
 
 SearchDialogGenerated::SearchDialogGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-
-    wxBoxSizer* bSizer161;
-    bSizer161 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxBoxSizer* bSizer166;
-    bSizer166 = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer162;
-    bSizer162 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_staticText101 = new wxStaticText( this, wxID_ANY, _("Find what:"), wxDefaultPosition, wxDefaultSize, 0 );
-    m_staticText101->Wrap( -1 );
-    bSizer162->Add( m_staticText101, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_textCtrlSearchTxt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 220,-1 ), 0 );
-    bSizer162->Add( m_textCtrlSearchTxt, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-
-    bSizer166->Add( bSizer162, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-
-
-    bSizer166->Add( 0, 5, 0, 0, 5 );
-
-    m_checkBoxMatchCase = new wxCheckBox( this, wxID_ANY, _("Match case"), wxDefaultPosition, wxDefaultSize, 0 );
-    bSizer166->Add( m_checkBoxMatchCase, 0, wxALL, 5 );
-
-    bSizer161->Add( bSizer166, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-
-    wxBoxSizer* bSizer97;
-    bSizer97 = new wxBoxSizer( wxVERTICAL );
-
-    m_buttonFindNext = new wxButton( this, wxID_OK, _("&Find next"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-    m_buttonFindNext->SetDefault();
-    m_buttonFindNext->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
-
-    bSizer97->Add( m_buttonFindNext, 0, wxEXPAND|wxTOP|wxRIGHT, 5 );
-
-    m_button29 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-    m_button29->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-
-    bSizer97->Add( m_button29, 0, wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT, 5 );
-
-    bSizer161->Add( bSizer97, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    this->SetSizer( bSizer161 );
-    this->Layout();
-    bSizer161->Fit( this );
-
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SearchDialogGenerated::OnClose ) );
-    m_textCtrlSearchTxt->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( SearchDialogGenerated::OnText ), NULL, this );
-    m_buttonFindNext->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SearchDialogGenerated::OnFindNext ), NULL, this );
-    m_button29->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SearchDialogGenerated::OnCancel ), NULL, this );
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	
+	wxBoxSizer* bSizer161;
+	bSizer161 = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxBoxSizer* bSizer166;
+	bSizer166 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer162;
+	bSizer162 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_staticText101 = new wxStaticText( this, wxID_ANY, _("Find what:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText101->Wrap( -1 );
+	bSizer162->Add( m_staticText101, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_textCtrlSearchTxt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 220,-1 ), 0 );
+	bSizer162->Add( m_textCtrlSearchTxt, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	bSizer166->Add( bSizer162, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	
+	
+	bSizer166->Add( 0, 5, 0, 0, 5 );
+	
+	m_checkBoxMatchCase = new wxCheckBox( this, wxID_ANY, _("Match case"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizer166->Add( m_checkBoxMatchCase, 0, wxALL, 5 );
+	
+	bSizer161->Add( bSizer166, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	
+	wxBoxSizer* bSizer97;
+	bSizer97 = new wxBoxSizer( wxVERTICAL );
+	
+	m_buttonFindNext = new wxButton( this, wxID_OK, _("&Find next"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+	m_buttonFindNext->SetDefault(); 
+	m_buttonFindNext->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
+	
+	bSizer97->Add( m_buttonFindNext, 0, wxEXPAND|wxTOP|wxRIGHT, 5 );
+	
+	m_button29 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+	m_button29->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+	
+	bSizer97->Add( m_button29, 0, wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	
+	bSizer161->Add( bSizer97, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	this->SetSizer( bSizer161 );
+	this->Layout();
+	bSizer161->Fit( this );
+	
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SearchDialogGenerated::OnClose ) );
+	m_textCtrlSearchTxt->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( SearchDialogGenerated::OnText ), NULL, this );
+	m_buttonFindNext->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SearchDialogGenerated::OnFindNext ), NULL, this );
+	m_button29->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SearchDialogGenerated::OnCancel ), NULL, this );
 }
 
 SearchDialogGenerated::~SearchDialogGenerated()
 {
-    // Disconnect Events
-    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SearchDialogGenerated::OnClose ) );
-    m_textCtrlSearchTxt->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( SearchDialogGenerated::OnText ), NULL, this );
-    m_buttonFindNext->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SearchDialogGenerated::OnFindNext ), NULL, this );
-    m_button29->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SearchDialogGenerated::OnCancel ), NULL, this );
-
+	// Disconnect Events
+	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SearchDialogGenerated::OnClose ) );
+	m_textCtrlSearchTxt->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( SearchDialogGenerated::OnText ), NULL, this );
+	m_buttonFindNext->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SearchDialogGenerated::OnFindNext ), NULL, this );
+	m_button29->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SearchDialogGenerated::OnCancel ), NULL, this );
+	
 }
 
 SelectTimespanDlgGenerated::SelectTimespanDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-
-    wxBoxSizer* bSizer96;
-    bSizer96 = new wxBoxSizer( wxVERTICAL );
-
-    wxBoxSizer* bSizer98;
-    bSizer98 = new wxBoxSizer( wxHORIZONTAL );
-
-    m_calendarFrom = new wxCalendarCtrl( this, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxCAL_SHOW_HOLIDAYS );
-    bSizer98->Add( m_calendarFrom, 0, wxALL, 5 );
-
-    m_calendarTo = new wxCalendarCtrl( this, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxCAL_SHOW_HOLIDAYS );
-    bSizer98->Add( m_calendarTo, 0, wxALL, 5 );
-
-    bSizer96->Add( bSizer98, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    wxBoxSizer* bSizer97;
-    bSizer97 = new wxBoxSizer( wxHORIZONTAL );
-
-
-    bSizer97->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    m_buttonOkay = new wxButton( this, wxID_ANY, _("&OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-    m_buttonOkay->SetDefault();
-    m_buttonOkay->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
-
-    bSizer97->Add( m_buttonOkay, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
-
-    m_button29 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-    m_button29->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-
-    bSizer97->Add( m_button29, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-
-    bSizer97->Add( 0, 0, 1, wxEXPAND, 5 );
-
-    bSizer96->Add( bSizer97, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
-    this->SetSizer( bSizer96 );
-    this->Layout();
-    bSizer96->Fit( this );
-
-    // Connect Events
-    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SelectTimespanDlgGenerated::OnClose ) );
-    m_calendarFrom->Connect( wxEVT_CALENDAR_SEL_CHANGED, wxCalendarEventHandler( SelectTimespanDlgGenerated::OnChangeSelectionFrom ), NULL, this );
-    m_calendarTo->Connect( wxEVT_CALENDAR_SEL_CHANGED, wxCalendarEventHandler( SelectTimespanDlgGenerated::OnChangeSelectionTo ), NULL, this );
-    m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SelectTimespanDlgGenerated::OnOkay ), NULL, this );
-    m_button29->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SelectTimespanDlgGenerated::OnCancel ), NULL, this );
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	
+	wxBoxSizer* bSizer96;
+	bSizer96 = new wxBoxSizer( wxVERTICAL );
+	
+	wxBoxSizer* bSizer98;
+	bSizer98 = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_calendarFrom = new wxCalendarCtrl( this, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxCAL_SHOW_HOLIDAYS );
+	bSizer98->Add( m_calendarFrom, 0, wxALL, 5 );
+	
+	m_calendarTo = new wxCalendarCtrl( this, wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxCAL_SHOW_HOLIDAYS );
+	bSizer98->Add( m_calendarTo, 0, wxALL, 5 );
+	
+	bSizer96->Add( bSizer98, 0, wxALIGN_CENTER_VERTICAL, 5 );
+	
+	wxBoxSizer* bSizer97;
+	bSizer97 = new wxBoxSizer( wxHORIZONTAL );
+	
+	
+	bSizer97->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	m_buttonOkay = new wxButton( this, wxID_ANY, _("&OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+	m_buttonOkay->SetDefault(); 
+	m_buttonOkay->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
+	
+	bSizer97->Add( m_buttonOkay, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_button29 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+	m_button29->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+	
+	bSizer97->Add( m_button29, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	
+	bSizer97->Add( 0, 0, 1, wxEXPAND, 5 );
+	
+	bSizer96->Add( bSizer97, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+	
+	this->SetSizer( bSizer96 );
+	this->Layout();
+	bSizer96->Fit( this );
+	
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SelectTimespanDlgGenerated::OnClose ) );
+	m_calendarFrom->Connect( wxEVT_CALENDAR_SEL_CHANGED, wxCalendarEventHandler( SelectTimespanDlgGenerated::OnChangeSelectionFrom ), NULL, this );
+	m_calendarTo->Connect( wxEVT_CALENDAR_SEL_CHANGED, wxCalendarEventHandler( SelectTimespanDlgGenerated::OnChangeSelectionTo ), NULL, this );
+	m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SelectTimespanDlgGenerated::OnOkay ), NULL, this );
+	m_button29->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SelectTimespanDlgGenerated::OnCancel ), NULL, this );
 }
 
 SelectTimespanDlgGenerated::~SelectTimespanDlgGenerated()
 {
-    // Disconnect Events
-    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SelectTimespanDlgGenerated::OnClose ) );
-    m_calendarFrom->Disconnect( wxEVT_CALENDAR_SEL_CHANGED, wxCalendarEventHandler( SelectTimespanDlgGenerated::OnChangeSelectionFrom ), NULL, this );
-    m_calendarTo->Disconnect( wxEVT_CALENDAR_SEL_CHANGED, wxCalendarEventHandler( SelectTimespanDlgGenerated::OnChangeSelectionTo ), NULL, this );
-    m_buttonOkay->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SelectTimespanDlgGenerated::OnOkay ), NULL, this );
-    m_button29->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SelectTimespanDlgGenerated::OnCancel ), NULL, this );
-
+	// 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 6a755d59..3d0d3daa 100644
--- a/ui/gui_generated.h
+++ b/ui/gui_generated.h
@@ -14,10 +14,12 @@
 class CustomGridLeft;
 class CustomGridMiddle;
 class CustomGridRight;
-class FfsDirPickerCtrl;
 class FolderHistoryBox;
 class ToggleButton;
-class wxButtonWithImage;
+class wxStaticText;
+namespace zen{ class BitmapButton; }
+namespace zen{ class DirPickerCtrl; }
+namespace zen{ class Graph2D; }
 
 #include <wx/string.h>
 #include <wx/bitmap.h>
@@ -46,7 +48,8 @@ class wxButtonWithImage;
 #include <wx/frame.h>
 #include <wx/choice.h>
 #include <wx/spinctrl.h>
-#include <wx/notebook.h>
+#include <wx/listbook.h>
+#include <wx/listctrl.h>
 #include <wx/dialog.h>
 #include <wx/gauge.h>
 #include <wx/radiobut.h>
@@ -55,7 +58,7 @@ class wxButtonWithImage;
 #include <wx/checklst.h>
 #include <wx/calctrl.h>
 
-#include "../shared/i18n.h"
+#include "../zen/i18n.h"
 
 ///////////////////////////////////////////////////////////////////////////
 
@@ -63,955 +66,961 @@ class wxButtonWithImage;
 ///////////////////////////////////////////////////////////////////////////////
 /// Class MainDialogGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class MainDialogGenerated : public wxFrame
+class MainDialogGenerated : public wxFrame 
 {
-private:
-
-protected:
-    wxMenuBar* m_menubar1;
-    wxMenu* m_menuFile;
-    wxMenuItem* m_menuItem10;
-    wxMenuItem* m_menuItem11;
-    wxMenuItem* m_menuItemSwitchView;
-    wxMenuItem* m_menuItemNew;
-    wxMenuItem* m_menuItemSave;
-    wxMenuItem* m_menuItemLoad;
-    wxMenu* m_menuAdvanced;
-    wxMenu* m_menuLanguages;
-    wxMenuItem* m_menuItemGlobSett;
-    wxMenuItem* m_menuItem7;
-    wxMenu* m_menuHelp;
-    wxMenuItem* m_menuItemCheckVer;
-    wxMenuItem* m_menuItemAbout;
-    wxBoxSizer* bSizerPanelHolder;
-    wxPanel* m_panelTopButtons;
-    wxBoxSizer* bSizerTopButtons;
-    wxStaticText* m_staticTextCmpVariant;
-    wxButtonWithImage* m_buttonCompare;
-    wxButton* m_buttonAbort;
-    wxBitmapButton* m_bpButtonCmpConfig;
-    wxStaticText* m_staticTextSyncVariant;
-    wxBitmapButton* m_bpButtonSyncConfig;
-    wxButtonWithImage* m_buttonStartSync;
-    wxPanel* m_panelDirectoryPairs;
-    wxStaticBoxSizer* sbSizerDirLeft;
-    wxBitmapButton* m_bpButtonAddPair;
-    wxPanel* m_panelTopMiddle;
-    wxBitmapButton* m_bpButtonSwapSides;
-    wxStaticBoxSizer* sbSizerDirRight;
-    wxScrolledWindow* m_scrolledWindowFolderPairs;
-    wxBoxSizer* bSizerAddFolderPairs;
-    wxPanel* m_panelGrids;
-    wxBoxSizer* bSizerGridHolder;
-    CustomGridLeft* m_gridLeft;
-    wxPanel* m_panelMiddle;
-    CustomGridMiddle* m_gridMiddle;
-    CustomGridRight* m_gridRight;
-    wxPanel* m_panelConfig;
-    wxBoxSizer* bSizerConfig;
-    wxBitmapButton* m_bpButtonSave;
-    wxBitmapButton* m_bpButtonLoad;
-    wxListBox* m_listBoxHistory;
-    wxPanel* m_panelFilter;
-    wxBitmapButton* m_bpButtonFilter;
-    wxCheckBox* m_checkBoxHideFilt;
-    wxPanel* m_panelStatistics;
-    wxBoxSizer* bSizerStatistics;
-    wxStaticBitmap* m_bitmapCreate;
-    wxTextCtrl* m_textCtrlCreate;
-    wxStaticBitmap* m_bitmapUpdate;
-    wxTextCtrl* m_textCtrlUpdate;
-    wxStaticBitmap* m_bitmapDelete;
-    wxTextCtrl* m_textCtrlDelete;
-    wxStaticBitmap* m_bitmapData;
-    wxTextCtrl* m_textCtrlData;
-    wxPanel* m_panelViewFilter;
-    wxBoxSizer* bSizerViewFilter;
-    ToggleButton* m_bpButtonSyncCreateLeft;
-    ToggleButton* m_bpButtonSyncDirOverwLeft;
-    ToggleButton* m_bpButtonSyncDeleteLeft;
-    ToggleButton* m_bpButtonLeftOnly;
-    ToggleButton* m_bpButtonLeftNewer;
-    ToggleButton* m_bpButtonEqual;
-    ToggleButton* m_bpButtonDifferent;
-    ToggleButton* m_bpButtonSyncDirNone;
-    ToggleButton* m_bpButtonRightNewer;
-    ToggleButton* m_bpButtonRightOnly;
-    ToggleButton* m_bpButtonSyncDeleteRight;
-    ToggleButton* m_bpButtonSyncDirOverwRight;
-    ToggleButton* m_bpButtonSyncCreateRight;
-    ToggleButton* m_bpButtonConflict;
-    wxPanel* m_panelStatusBar;
-    wxStaticText* m_staticTextStatusLeft;
-    wxStaticLine* m_staticline9;
-    wxStaticText* m_staticTextStatusMiddle;
-    wxStaticLine* m_staticline10;
-    wxStaticText* m_staticTextStatusRight;
-    wxStaticBitmap* m_bitmap15;
-
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-    virtual void OnCompare( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnStartSync( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnSwitchView( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnNewConfig( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnSaveConfig( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnLoadConfig( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnMenuQuit( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnMenuGlobalSettings( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnMenuBatchJob( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnMenuExportFileList( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnShowHelp( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnMenuCheckVersion( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnMenuAbout( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCmpSettings( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnSyncSettings( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnAddFolderPair( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnRemoveTopFolderPair( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnDirSelected( wxFileDirPickerEvent& event ) { event.Skip(); }
-    virtual void OnSwapSides( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnLeftGridDoubleClick( wxGridEvent& event ) { event.Skip(); }
-    virtual void OnContextRim( wxGridEvent& event ) { event.Skip(); }
-    virtual void OnSortLeftGrid( wxGridEvent& event ) { event.Skip(); }
-    virtual void OnContextRimLabelLeft( wxGridEvent& event ) { event.Skip(); }
-    virtual void OnContextMiddle( wxGridEvent& event ) { event.Skip(); }
-    virtual void OnSortMiddleGrid( wxGridEvent& event ) { event.Skip(); }
-    virtual void OnContextMiddleLabel( wxGridEvent& event ) { event.Skip(); }
-    virtual void OnRightGridDoubleClick( wxGridEvent& event ) { event.Skip(); }
-    virtual void OnSortRightGrid( wxGridEvent& event ) { event.Skip(); }
-    virtual void OnContextRimLabelRight( wxGridEvent& event ) { event.Skip(); }
-    virtual void OnCfgHistoryKeyEvent( wxKeyEvent& event ) { event.Skip(); }
-    virtual void OnLoadFromHistory( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnConfigureFilter( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnHideFilteredButton( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnSyncCreateLeft( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnSyncDirLeft( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnSyncDeleteLeft( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnLeftOnlyFiles( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnLeftNewerFiles( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnEqualFiles( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnDifferentFiles( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnSyncDirNone( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnRightNewerFiles( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnRightOnlyFiles( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnSyncDeleteRight( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnSyncDirRight( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnSyncCreateRight( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnConflictFiles( wxCommandEvent& event ) { event.Skip(); }
-
-
-public:
-    wxPanel* m_panelTopLeft;
-    wxBitmapButton* m_bpButtonRemovePair;
-    FolderHistoryBox* m_directoryLeft;
-    FfsDirPickerCtrl* m_dirPickerLeft;
-    wxBitmapButton* m_bpButtonAltCompCfg;
-    wxBitmapButton* m_bpButtonLocalFilter;
-    wxBitmapButton* m_bpButtonAltSyncCfg;
-    wxPanel* m_panelTopRight;
-    FolderHistoryBox* m_directoryRight;
-    FfsDirPickerCtrl* m_dirPickerRight;
-    wxPanel* m_panelLeft;
-    wxPanel* m_panelRight;
-
-    MainDialogGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
-
-    ~MainDialogGenerated();
-
+	private:
+	
+	protected:
+		wxMenuBar* m_menubar1;
+		wxMenu* m_menuFile;
+		wxMenuItem* m_menuItem10;
+		wxMenuItem* m_menuItem11;
+		wxMenuItem* m_menuItemSwitchView;
+		wxMenuItem* m_menuItemNew;
+		wxMenuItem* m_menuItemSave;
+		wxMenuItem* m_menuItemLoad;
+		wxMenu* m_menuAdvanced;
+		wxMenu* m_menuLanguages;
+		wxMenuItem* m_menuItemGlobSett;
+		wxMenuItem* m_menuItem7;
+		wxMenu* m_menuHelp;
+		wxMenuItem* m_menuItemCheckVer;
+		wxMenuItem* m_menuItemAbout;
+		wxBoxSizer* bSizerPanelHolder;
+		wxPanel* m_panelTopButtons;
+		wxBoxSizer* bSizerTopButtons;
+		wxStaticText* m_staticTextCmpVariant;
+		zen::BitmapButton* m_buttonCompare;
+		wxButton* m_buttonAbort;
+		wxBitmapButton* m_bpButtonCmpConfig;
+		wxStaticText* m_staticTextSyncVariant;
+		wxBitmapButton* m_bpButtonSyncConfig;
+		zen::BitmapButton* m_buttonStartSync;
+		wxPanel* m_panelDirectoryPairs;
+		wxStaticBoxSizer* sbSizerDirLeft;
+		wxBitmapButton* m_bpButtonAddPair;
+		wxPanel* m_panelTopMiddle;
+		wxBitmapButton* m_bpButtonSwapSides;
+		wxStaticBoxSizer* sbSizerDirRight;
+		wxScrolledWindow* m_scrolledWindowFolderPairs;
+		wxBoxSizer* bSizerAddFolderPairs;
+		wxPanel* m_panelGrids;
+		wxBoxSizer* bSizerGridHolder;
+		CustomGridLeft* m_gridLeft;
+		wxPanel* m_panelMiddle;
+		CustomGridMiddle* m_gridMiddle;
+		CustomGridRight* m_gridRight;
+		wxPanel* m_panelConfig;
+		wxBoxSizer* bSizerConfig;
+		wxBitmapButton* m_bpButtonSave;
+		wxBitmapButton* m_bpButtonLoad;
+		wxListBox* m_listBoxHistory;
+		wxPanel* m_panelFilter;
+		wxBitmapButton* m_bpButtonFilter;
+		wxCheckBox* m_checkBoxHideFilt;
+		wxPanel* m_panelStatistics;
+		wxBoxSizer* bSizerStatistics;
+		wxStaticBitmap* m_bitmapCreate;
+		wxTextCtrl* m_textCtrlCreate;
+		wxStaticBitmap* m_bitmapUpdate;
+		wxTextCtrl* m_textCtrlUpdate;
+		wxStaticBitmap* m_bitmapDelete;
+		wxTextCtrl* m_textCtrlDelete;
+		wxStaticBitmap* m_bitmapData;
+		wxTextCtrl* m_textCtrlData;
+		wxPanel* m_panelViewFilter;
+		wxBoxSizer* bSizerViewFilter;
+		ToggleButton* m_bpButtonSyncCreateLeft;
+		ToggleButton* m_bpButtonSyncDirOverwLeft;
+		ToggleButton* m_bpButtonSyncDeleteLeft;
+		ToggleButton* m_bpButtonLeftOnly;
+		ToggleButton* m_bpButtonLeftNewer;
+		ToggleButton* m_bpButtonEqual;
+		ToggleButton* m_bpButtonDifferent;
+		ToggleButton* m_bpButtonSyncDirNone;
+		ToggleButton* m_bpButtonRightNewer;
+		ToggleButton* m_bpButtonRightOnly;
+		ToggleButton* m_bpButtonSyncDeleteRight;
+		ToggleButton* m_bpButtonSyncDirOverwRight;
+		ToggleButton* m_bpButtonSyncCreateRight;
+		ToggleButton* m_bpButtonConflict;
+		wxPanel* m_panelStatusBar;
+		wxStaticText* m_staticTextStatusLeft;
+		wxStaticLine* m_staticline9;
+		wxStaticText* m_staticTextStatusMiddle;
+		wxStaticLine* m_staticline10;
+		wxStaticText* m_staticTextStatusRight;
+		wxStaticBitmap* m_bitmap15;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnCompare( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnStartSync( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSwitchView( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnNewConfig( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSaveConfig( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnLoadConfig( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnMenuQuit( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnMenuGlobalSettings( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnMenuBatchJob( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnMenuExportFileList( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnShowHelp( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnMenuCheckVersion( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnMenuAbout( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCmpSettings( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSyncSettings( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnAddFolderPair( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnRemoveTopFolderPair( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnDirSelected( wxFileDirPickerEvent& event ) { event.Skip(); }
+		virtual void OnSwapSides( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnLeftGridDoubleClick( wxGridEvent& event ) { event.Skip(); }
+		virtual void OnContextRim( wxGridEvent& event ) { event.Skip(); }
+		virtual void OnSortLeftGrid( wxGridEvent& event ) { event.Skip(); }
+		virtual void OnContextRimLabelLeft( wxGridEvent& event ) { event.Skip(); }
+		virtual void OnContextMiddle( wxGridEvent& event ) { event.Skip(); }
+		virtual void OnSortMiddleGrid( wxGridEvent& event ) { event.Skip(); }
+		virtual void OnContextMiddleLabel( wxGridEvent& event ) { event.Skip(); }
+		virtual void OnRightGridDoubleClick( wxGridEvent& event ) { event.Skip(); }
+		virtual void OnSortRightGrid( wxGridEvent& event ) { event.Skip(); }
+		virtual void OnContextRimLabelRight( wxGridEvent& event ) { event.Skip(); }
+		virtual void OnCfgHistoryKeyEvent( wxKeyEvent& event ) { event.Skip(); }
+		virtual void OnLoadFromHistory( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnConfigureFilter( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnHideFilteredButton( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSyncCreateLeft( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSyncDirLeft( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSyncDeleteLeft( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnLeftOnlyFiles( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnLeftNewerFiles( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnEqualFiles( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnDifferentFiles( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSyncDirNone( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnRightNewerFiles( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnRightOnlyFiles( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSyncDeleteRight( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSyncDirRight( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSyncCreateRight( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnConflictFiles( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		wxPanel* m_panelTopLeft;
+		wxBitmapButton* m_bpButtonRemovePair;
+		FolderHistoryBox* m_directoryLeft;
+		zen::DirPickerCtrl* m_dirPickerLeft;
+		wxBitmapButton* m_bpButtonAltCompCfg;
+		wxBitmapButton* m_bpButtonLocalFilter;
+		wxBitmapButton* m_bpButtonAltSyncCfg;
+		wxPanel* m_panelTopRight;
+		FolderHistoryBox* m_directoryRight;
+		zen::DirPickerCtrl* m_dirPickerRight;
+		wxPanel* m_panelLeft;
+		wxPanel* m_panelRight;
+		
+		MainDialogGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
+		
+		~MainDialogGenerated();
+	
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class FolderPairGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class FolderPairGenerated : public wxPanel
+class FolderPairGenerated : public wxPanel 
 {
-private:
-
-protected:
-
-public:
-    wxPanel* m_panelLeft;
-    wxBitmapButton* m_bpButtonRemovePair;
-    FolderHistoryBox* m_directoryLeft;
-    FfsDirPickerCtrl* m_dirPickerLeft;
-    wxPanel* m_panel20;
-    wxBitmapButton* m_bpButtonAltCompCfg;
-    wxBitmapButton* m_bpButtonLocalFilter;
-    wxBitmapButton* m_bpButtonAltSyncCfg;
-    wxPanel* m_panelRight;
-    FolderHistoryBox* m_directoryRight;
-    FfsDirPickerCtrl* m_dirPickerRight;
-
-    FolderPairGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );
-    ~FolderPairGenerated();
-
+	private:
+	
+	protected:
+	
+	public:
+		wxPanel* m_panelLeft;
+		wxBitmapButton* m_bpButtonRemovePair;
+		FolderHistoryBox* m_directoryLeft;
+		zen::DirPickerCtrl* m_dirPickerLeft;
+		wxPanel* m_panel20;
+		wxBitmapButton* m_bpButtonAltCompCfg;
+		wxBitmapButton* m_bpButtonLocalFilter;
+		wxBitmapButton* m_bpButtonAltSyncCfg;
+		wxPanel* m_panelRight;
+		FolderHistoryBox* m_directoryRight;
+		zen::DirPickerCtrl* m_dirPickerRight;
+		
+		FolderPairGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL ); 
+		~FolderPairGenerated();
+	
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class BatchDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class BatchDlgGenerated : public wxDialog
+class BatchDlgGenerated : public wxDialog 
 {
-private:
-
-protected:
-    wxBoxSizer* bSizer69;
-    wxStaticBitmap* m_bitmap27;
-    wxPanel* m_panel8;
-    wxStaticText* m_staticText56;
-    wxStaticText* m_staticText44;
-    wxBitmapButton* m_bpButtonHelp;
-    wxNotebook* m_notebookSettings;
-    wxPanel* m_panelOverview;
-    wxBitmapButton* m_bpButtonCmpConfig;
-    wxStaticText* m_staticTextCmpVariant;
-    wxBitmapButton* m_bpButtonFilter;
-    wxStaticText* m_staticTextSyncVariant;
-    wxBitmapButton* m_bpButtonSyncConfig;
-    wxChoice* m_choiceHandleError;
-    wxBoxSizer* sbSizerMainPair;
-    wxPanel* m_panelMainPair;
-    wxStaticText* m_staticText532;
-    wxStaticText* m_staticText5411;
-    wxBoxSizer* bSizerAddFolderPairs;
-    wxPanel* m_panelBatchSettings;
-    wxCheckBox* m_checkBoxSilent;
-    wxStaticBoxSizer* sbSizerLogfileDir;
-    wxStaticText* m_staticText96;
-    wxSpinCtrl* m_spinCtrlLogCountMax;
-    wxPanel* m_panelLogfile;
-    wxStaticText* m_staticText94;
-    wxTextCtrl* m_textCtrlLogfileDir;
-    FfsDirPickerCtrl* m_dirPickerLogfileDir;
-    wxButton* m_buttonSave;
-    wxButton* m_buttonLoad;
-    wxButton* m_button6;
-
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-    virtual void OnHelp( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCmpSettings( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnConfigureFilter( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnSyncSettings( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnChangeErrorHandling( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnAddFolderPair( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnRemoveTopFolderPair( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnChangeMaxLogCountTxt( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnSaveBatchJob( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnLoadBatchJob( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-
-
-public:
-    wxScrolledWindow* m_scrolledWindow6;
-    wxBitmapButton* m_bpButtonAddPair;
-    wxBitmapButton* m_bpButtonRemovePair;
-    wxPanel* m_panelLeft;
-    FolderHistoryBox* m_directoryLeft;
-    FfsDirPickerCtrl* m_dirPickerLeft;
-    wxPanel* m_panelRight;
-    FolderHistoryBox* m_directoryRight;
-    FfsDirPickerCtrl* m_dirPickerRight;
-    wxBitmapButton* m_bpButtonAltCompCfg;
-    wxBitmapButton* m_bpButtonLocalFilter;
-    wxBitmapButton* m_bpButtonAltSyncCfg;
-
-    BatchDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Create a batch job"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
-    ~BatchDlgGenerated();
-
+	private:
+	
+	protected:
+		wxStaticBitmap* m_bitmap27;
+		wxPanel* m_panel8;
+		wxStaticText* m_staticText56;
+		wxStaticText* m_staticText44;
+		wxBitmapButton* m_bpButtonHelp;
+		wxListbook* m_listbook1;
+		wxPanel* m_panelOverview;
+		wxBitmapButton* m_bpButtonCmpConfig;
+		wxStaticText* m_staticTextCmpVariant;
+		wxBitmapButton* m_bpButtonFilter;
+		wxStaticText* m_staticTextSyncVariant;
+		wxBitmapButton* m_bpButtonSyncConfig;
+		wxChoice* m_choiceHandleError;
+		wxBoxSizer* sbSizerMainPair;
+		wxPanel* m_panelMainPair;
+		wxStaticText* m_staticText532;
+		wxStaticText* m_staticText5411;
+		wxBoxSizer* bSizerAddFolderPairs;
+		wxPanel* m_panelBatchSettings;
+		wxCheckBox* m_checkBoxSilent;
+		wxStaticBoxSizer* sbSizerLogfileDir;
+		wxStaticText* m_staticText96;
+		wxSpinCtrl* m_spinCtrlLogCountMax;
+		wxPanel* m_panelLogfile;
+		wxStaticText* m_staticText94;
+		zen::DirPickerCtrl* m_dirPickerLogfileDir;
+		wxButton* m_buttonSave;
+		wxButton* m_buttonLoad;
+		wxButton* m_button6;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnHelp( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCmpSettings( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnConfigureFilter( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSyncSettings( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnChangeErrorHandling( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnAddFolderPair( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnRemoveTopFolderPair( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnChangeMaxLogCountTxt( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSaveBatchJob( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnLoadBatchJob( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		wxScrolledWindow* m_scrolledWindow6;
+		wxBitmapButton* m_bpButtonAddPair;
+		wxBitmapButton* m_bpButtonRemovePair;
+		wxPanel* m_panelLeft;
+		FolderHistoryBox* m_directoryLeft;
+		zen::DirPickerCtrl* m_dirPickerLeft;
+		wxPanel* m_panelRight;
+		FolderHistoryBox* m_directoryRight;
+		zen::DirPickerCtrl* m_dirPickerRight;
+		wxBitmapButton* m_bpButtonAltCompCfg;
+		wxBitmapButton* m_bpButtonLocalFilter;
+		wxBitmapButton* m_bpButtonAltSyncCfg;
+		FolderHistoryBox* m_comboBoxLogfileDir;
+		
+		BatchDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Create a batch job"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
+		~BatchDlgGenerated();
+	
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class BatchFolderPairGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class BatchFolderPairGenerated : public wxPanel
+class BatchFolderPairGenerated : public wxPanel 
 {
-private:
-
-protected:
-    wxPanel* m_panel32;
-    wxStaticText* m_staticText53;
-    wxStaticText* m_staticText541;
-    wxPanel* m_panelLeft;
-    wxPanel* m_panelRight;
-
-public:
-    wxBitmapButton* m_bpButtonRemovePair;
-    FolderHistoryBox* m_directoryLeft;
-    FfsDirPickerCtrl* m_dirPickerLeft;
-    FolderHistoryBox* m_directoryRight;
-    FfsDirPickerCtrl* m_dirPickerRight;
-    wxBitmapButton* m_bpButtonAltCompCfg;
-    wxBitmapButton* m_bpButtonLocalFilter;
-    wxBitmapButton* m_bpButtonAltSyncCfg;
-
-    BatchFolderPairGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );
-    ~BatchFolderPairGenerated();
-
+	private:
+	
+	protected:
+		wxPanel* m_panel32;
+		wxStaticText* m_staticText53;
+		wxStaticText* m_staticText541;
+		wxPanel* m_panelLeft;
+		wxPanel* m_panelRight;
+	
+	public:
+		wxBitmapButton* m_bpButtonRemovePair;
+		FolderHistoryBox* m_directoryLeft;
+		zen::DirPickerCtrl* m_dirPickerLeft;
+		FolderHistoryBox* m_directoryRight;
+		zen::DirPickerCtrl* m_dirPickerRight;
+		wxBitmapButton* m_bpButtonAltCompCfg;
+		wxBitmapButton* m_bpButtonLocalFilter;
+		wxBitmapButton* m_bpButtonAltSyncCfg;
+		
+		BatchFolderPairGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL ); 
+		~BatchFolderPairGenerated();
+	
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class CompareStatusGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class CompareStatusGenerated : public wxPanel
+class CompareStatusGenerated : public wxPanel 
 {
-private:
-
-protected:
-    wxBoxSizer* bSizer42;
-    wxBoxSizer* bSizerFilesFound;
-    wxStaticText* m_staticText321;
-    wxStaticText* m_staticTextScanned;
-    wxBoxSizer* bSizerFilesRemaining;
-    wxStaticText* m_staticText46;
-    wxStaticText* m_staticTextFilesRemaining;
-    wxStaticText* m_staticText117;
-    wxStaticText* m_staticTextDataRemaining;
-    wxStaticText* m_staticText118;
-    wxBoxSizer* sSizerSpeed;
-    wxStaticText* m_staticText104;
-    wxStaticText* m_staticTextSpeed;
-    wxBoxSizer* sSizerTimeRemaining;
-    wxStaticText* m_staticTextTimeRemFixed;
-    wxStaticText* m_staticTextTimeRemaining;
-    wxBoxSizer* sSizerTimeElapsed;
-    wxStaticText* m_staticTextTimeElapsed;
-    wxStaticText* m_staticText30;
-    wxTextCtrl* m_textCtrlStatus;
-    wxGauge* m_gauge2;
-
-public:
-
-    CompareStatusGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxRAISED_BORDER|wxTAB_TRAVERSAL );
-    ~CompareStatusGenerated();
-
+	private:
+	
+	protected:
+		wxStaticText* m_staticText30;
+		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_staticText117;
+		wxStaticText* m_staticTextDataRemaining;
+		wxStaticText* m_staticText118;
+		wxBoxSizer* sSizerSpeed;
+		wxStaticText* m_staticText104;
+		wxStaticText* m_staticTextSpeed;
+		wxBoxSizer* sSizerTimeRemaining;
+		wxStaticText* m_staticTextTimeRemFixed;
+		wxStaticText* m_staticTextRemTime;
+		wxBoxSizer* sSizerTimeElapsed;
+		wxStaticText* m_staticTextTimeElapsed;
+	
+	public:
+		
+		CompareStatusGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxRAISED_BORDER|wxTAB_TRAVERSAL ); 
+		~CompareStatusGenerated();
+	
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class SyncCfgDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class SyncCfgDlgGenerated : public wxDialog
+class SyncCfgDlgGenerated : public wxDialog 
 {
-private:
-
-protected:
-    wxStaticText* m_staticText1;
-    wxRadioButton* m_radioBtnAutomatic;
-    wxButton* m_buttonAutomatic;
-    wxStaticText* m_staticText81;
-    wxRadioButton* m_radioBtnMirror;
-    wxButton* m_buttonOneWay;
-    wxStaticText* m_staticText8;
-    wxRadioButton* m_radioBtnUpdate;
-    wxButton* m_buttonUpdate;
-    wxStaticText* m_staticText101;
-    wxRadioButton* m_radioBtnCustom;
-    wxButton* m_buttonUpdate1;
-    wxStaticText* m_staticText9;
-    wxBoxSizer* bSizer201;
-    wxStaticBoxSizer* sbSizerErrorHandling;
-    wxChoice* m_choiceHandleError;
-    wxStaticBoxSizer* sbSizerCustDelDir;
-    wxChoice* m_choiceHandleDeletion;
-    wxPanel* m_panelCustomDeletionDir;
-    FolderHistoryBox* m_customDelFolder;
-    FfsDirPickerCtrl* m_dirPickerCustomDelFolder;
-    wxButton* m_buttonOK;
-    wxButton* m_button16;
-    wxStaticBitmap* m_bitmapDatabase;
-    wxBoxSizer* sbSizerSyncDirections;
-    wxStaticText* m_staticText21;
-    wxStaticText* m_staticText31;
-    wxStaticLine* m_staticline3;
-    wxBoxSizer* bSizerLeftOnly;
-    wxStaticBitmap* m_bitmapLeftOnly;
-    wxBitmapButton* m_bpButtonLeftOnly;
-    wxBoxSizer* bSizerRightOnly;
-    wxStaticBitmap* m_bitmapRightOnly;
-    wxBitmapButton* m_bpButtonRightOnly;
-    wxBoxSizer* bSizerLeftNewer;
-    wxStaticBitmap* m_bitmapLeftNewer;
-    wxBitmapButton* m_bpButtonLeftNewer;
-    wxBoxSizer* bSizerRightNewer;
-    wxStaticBitmap* m_bitmapRightNewer;
-    wxBitmapButton* m_bpButtonRightNewer;
-    wxBoxSizer* bSizerDifferent;
-    wxStaticBitmap* m_bitmapDifferent;
-    wxBitmapButton* m_bpButtonDifferent;
-    wxBoxSizer* bSizerConflict;
-    wxStaticBitmap* m_bitmapConflict;
-    wxBitmapButton* m_bpButtonConflict;
-
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-    virtual void OnSyncAutomatic( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnSyncAutomaticDouble( wxMouseEvent& event ) { event.Skip(); }
-    virtual void OnSyncMirror( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnSyncMirrorDouble( wxMouseEvent& event ) { event.Skip(); }
-    virtual void OnSyncUpdate( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnSyncUpdateDouble( wxMouseEvent& event ) { event.Skip(); }
-    virtual void OnSyncCustom( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnSyncCustomDouble( wxMouseEvent& event ) { event.Skip(); }
-    virtual void OnChangeErrorHandling( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnChangeDeletionHandling( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnApply( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnExLeftSideOnly( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnExRightSideOnly( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnLeftNewer( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnRightNewer( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnDifferent( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnConflict( wxCommandEvent& event ) { event.Skip(); }
-
-
-public:
-
-    SyncCfgDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Synchronization settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
-    ~SyncCfgDlgGenerated();
-
+	private:
+	
+	protected:
+		wxStaticText* m_staticText1;
+		wxRadioButton* m_radioBtnAutomatic;
+		wxButton* m_buttonAutomatic;
+		wxStaticText* m_staticText81;
+		wxRadioButton* m_radioBtnMirror;
+		wxButton* m_buttonOneWay;
+		wxStaticText* m_staticText8;
+		wxRadioButton* m_radioBtnUpdate;
+		wxButton* m_buttonUpdate;
+		wxStaticText* m_staticText101;
+		wxRadioButton* m_radioBtnCustom;
+		wxButton* m_buttonUpdate1;
+		wxStaticText* m_staticText9;
+		wxBoxSizer* bSizer201;
+		wxStaticBoxSizer* sbSizerErrorHandling;
+		wxChoice* m_choiceHandleError;
+		wxStaticBoxSizer* sbSizerCustDelDir;
+		wxChoice* m_choiceHandleDeletion;
+		wxPanel* m_panelCustomDeletionDir;
+		FolderHistoryBox* m_customDelFolder;
+		zen::DirPickerCtrl* m_dirPickerCustomDelFolder;
+		wxButton* m_buttonOK;
+		wxButton* m_button16;
+		wxStaticBitmap* m_bitmapDatabase;
+		wxBoxSizer* sbSizerSyncDirections;
+		wxStaticText* m_staticText21;
+		wxStaticText* m_staticText31;
+		wxStaticLine* m_staticline3;
+		wxBoxSizer* bSizerLeftOnly;
+		wxStaticBitmap* m_bitmapLeftOnly;
+		wxBitmapButton* m_bpButtonLeftOnly;
+		wxBoxSizer* bSizerRightOnly;
+		wxStaticBitmap* m_bitmapRightOnly;
+		wxBitmapButton* m_bpButtonRightOnly;
+		wxBoxSizer* bSizerLeftNewer;
+		wxStaticBitmap* m_bitmapLeftNewer;
+		wxBitmapButton* m_bpButtonLeftNewer;
+		wxBoxSizer* bSizerRightNewer;
+		wxStaticBitmap* m_bitmapRightNewer;
+		wxBitmapButton* m_bpButtonRightNewer;
+		wxBoxSizer* bSizerDifferent;
+		wxStaticBitmap* m_bitmapDifferent;
+		wxBitmapButton* m_bpButtonDifferent;
+		wxBoxSizer* bSizerConflict;
+		wxStaticBitmap* m_bitmapConflict;
+		wxBitmapButton* m_bpButtonConflict;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnSyncAutomatic( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSyncAutomaticDouble( wxMouseEvent& event ) { event.Skip(); }
+		virtual void OnSyncMirror( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSyncMirrorDouble( wxMouseEvent& event ) { event.Skip(); }
+		virtual void OnSyncUpdate( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSyncUpdateDouble( wxMouseEvent& event ) { event.Skip(); }
+		virtual void OnSyncCustom( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSyncCustomDouble( wxMouseEvent& event ) { event.Skip(); }
+		virtual void OnChangeErrorHandling( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnChangeDeletionHandling( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnApply( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnExLeftSideOnly( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnExRightSideOnly( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnLeftNewer( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnRightNewer( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnDifferent( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnConflict( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		
+		SyncCfgDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Synchronization settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE ); 
+		~SyncCfgDlgGenerated();
+	
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class CmpCfgDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class CmpCfgDlgGenerated : public wxDialog
+class CmpCfgDlgGenerated : public wxDialog 
 {
-private:
-
-protected:
-    wxRadioButton* m_radioBtnSizeDate;
-    wxStaticBitmap* m_bitmapByTime;
-    wxButton* m_buttonTimeSize;
-    wxRadioButton* m_radioBtnContent;
-    wxStaticBitmap* m_bitmapByContent;
-    wxButton* m_buttonContent;
-    wxChoice* m_choiceHandleSymlinks;
-    wxBitmapButton* m_bpButtonHelp;
-    wxButton* m_button10;
-    wxButton* m_button6;
-
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-    virtual void OnTimeSize( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnTimeSizeDouble( wxMouseEvent& event ) { event.Skip(); }
-    virtual void OnContent( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnContentDouble( wxMouseEvent& event ) { event.Skip(); }
-    virtual void OnChangeErrorHandling( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnShowHelp( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-
-
-public:
-
-    CmpCfgDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Comparison settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
-    ~CmpCfgDlgGenerated();
-
+	private:
+	
+	protected:
+		wxRadioButton* m_radioBtnSizeDate;
+		wxStaticBitmap* m_bitmapByTime;
+		wxButton* m_buttonTimeSize;
+		wxRadioButton* m_radioBtnContent;
+		wxStaticBitmap* m_bitmapByContent;
+		wxButton* m_buttonContent;
+		wxChoice* m_choiceHandleSymlinks;
+		wxBitmapButton* m_bpButtonHelp;
+		wxButton* m_button10;
+		wxButton* m_button6;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnTimeSize( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnTimeSizeDouble( wxMouseEvent& event ) { event.Skip(); }
+		virtual void OnContent( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnContentDouble( wxMouseEvent& event ) { event.Skip(); }
+		virtual void OnChangeErrorHandling( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnShowHelp( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		
+		CmpCfgDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Comparison settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); 
+		~CmpCfgDlgGenerated();
+	
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class SyncStatusDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class SyncStatusDlgGenerated : public wxFrame
+class SyncStatusDlgGenerated : public wxFrame 
 {
-private:
-
-protected:
-    wxStaticBitmap* m_bitmapStatus;
-    wxStaticText* m_staticTextStatus;
-    wxAnimationCtrl* m_animationControl1;
-    wxBoxSizer* bSizer31;
-    wxBoxSizer* bSizerObjectsRemaining;
-    wxStaticText* m_staticText25;
-    wxStaticText* m_staticTextRemainingObj;
-    wxStaticText* m_staticText96;
-    wxStaticText* m_staticTextDataRemaining;
-    wxStaticText* m_staticText97;
-    wxBoxSizer* bSizerObjectsProcessed;
-    wxStaticText* m_staticText251;
-    wxStaticText* m_staticTextProcessedObj;
-    wxStaticText* m_staticText98;
-    wxStaticText* m_staticTextDataProcessed;
-    wxStaticText* m_staticText99;
-    wxStaticText* m_staticText55;
-    wxStaticText* m_staticTextTimeElapsed;
-    wxBoxSizer* bSizerProgressText;
-    wxTextCtrl* m_textCtrlInfo;
-    wxBoxSizer* bSizer28;
-    wxBoxSizer* bSizerSpeed;
-    wxStaticText* m_staticText108;
-    wxStaticText* m_staticTextSpeed;
-    wxButton* m_buttonOK;
-    wxButton* m_buttonPause;
-    wxButton* m_buttonAbort;
-    wxBoxSizer* bSizerRemTime;
-    wxStaticText* m_staticText21;
-    wxStaticText* m_staticTextTimeRemaining;
-
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-    virtual void OnIconize( wxIconizeEvent& event ) { event.Skip(); }
-    virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnPause( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnAbort( wxCommandEvent& event ) { event.Skip(); }
-
-
-public:
-    wxGauge* m_gauge1;
-
-    SyncStatusDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 638,350 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
-
-    ~SyncStatusDlgGenerated();
-
+	private:
+	
+	protected:
+		wxBoxSizer* bSizer27;
+		wxStaticBitmap* m_bitmapStatus;
+		wxStaticText* m_staticTextStatus;
+		wxAnimationCtrl* m_animationControl1;
+		wxBoxSizer* bSizerCurrentOperation;
+		wxStaticText* m_staticText2511;
+		wxTextCtrl* m_textCtrlInfo;
+		wxBoxSizer* bSizerHoldStretch;
+		wxBoxSizer* bSizerProgressMain;
+		wxStaticBoxSizer* bSizerProgressStat;
+		wxStaticText* m_staticTextItemsRem;
+		wxBoxSizer* bSizerItemsRem;
+		wxStaticText* m_staticTextRemainingObj;
+		wxStaticText* m_staticText96;
+		wxStaticText* m_staticTextDataRemaining;
+		wxStaticText* m_staticText97;
+		wxStaticText* m_staticTextSpeedDescr;
+		wxStaticText* m_staticTextSpeed;
+		wxStaticText* m_staticText55;
+		wxStaticText* m_staticTextTimeElapsed;
+		wxStaticText* m_staticTextRemTimeDescr;
+		wxStaticText* m_staticTextRemTime;
+		zen::Graph2D* m_panelGraph;
+		wxBoxSizer* bSizerFinalStat;
+		wxListbook* m_listbookResult;
+		wxStaticText* m_staticTextItemsProc;
+		wxBoxSizer* bSizerItemsProc;
+		wxStaticText* m_staticTextProcessedObj;
+		wxStaticText* m_staticText98;
+		wxStaticText* m_staticTextDataProcessed;
+		wxStaticText* m_staticText99;
+		wxStaticText* m_staticText551;
+		wxStaticText* m_staticTextTimeTotal;
+		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;
+		
+		SyncStatusDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 620,330 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
+		
+		~SyncStatusDlgGenerated();
+	
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class LogControlGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class LogControlGenerated : public wxPanel
+class LogControlGenerated : public wxPanel 
 {
-private:
-
-protected:
-    ToggleButton* m_bpButtonErrors;
-    ToggleButton* m_bpButtonWarnings;
-    ToggleButton* m_bpButtonInfo;
-    wxTextCtrl* m_textCtrlInfo;
-
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnErrors( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnWarnings( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnInfo( wxCommandEvent& event ) { event.Skip(); }
-
-
-public:
-
-    LogControlGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );
-    ~LogControlGenerated();
-
+	private:
+	
+	protected:
+		ToggleButton* m_bpButtonErrors;
+		ToggleButton* m_bpButtonWarnings;
+		ToggleButton* m_bpButtonInfo;
+		wxTextCtrl* m_textCtrlInfo;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnErrors( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnWarnings( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnInfo( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		
+		LogControlGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL ); 
+		~LogControlGenerated();
+	
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class AboutDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class AboutDlgGenerated : public wxDialog
+class AboutDlgGenerated : public wxDialog 
 {
-private:
-
-protected:
-    wxPanel* m_panel5;
-    wxStaticBitmap* m_bitmap11;
-    wxStaticText* m_build;
-    wxPanel* m_panel33;
-    wxBoxSizer* bSizerCodeInfo;
-    wxStaticText* m_staticText72;
-    wxHyperlinkCtrl* m_hyperlink9;
-    wxHyperlinkCtrl* m_hyperlink11;
-    wxHyperlinkCtrl* m_hyperlink10;
-    wxHyperlinkCtrl* m_hyperlink13;
-    wxHyperlinkCtrl* m_hyperlink7;
-    wxHyperlinkCtrl* m_hyperlink16;
-    wxHyperlinkCtrl* m_hyperlink8;
-    wxHyperlinkCtrl* m_hyperlink15;
-    wxHyperlinkCtrl* m_hyperlink12;
-    wxHyperlinkCtrl* m_hyperlink18;
-    wxHyperlinkCtrl* m_hyperlink14;
-    wxHyperlinkCtrl* m_hyperlink21;
-    wxScrolledWindow* m_scrolledWindowTranslators;
-    wxBoxSizer* bSizerTranslators;
-    wxStaticText* m_staticText54;
-    wxFlexGridSizer* fgSizerTranslators;
-    wxStaticLine* m_staticline3;
-    wxStaticText* m_staticText131;
-    wxStaticLine* m_staticline12;
-    wxStaticBitmap* m_bitmap9;
-    wxHyperlinkCtrl* m_hyperlink1;
-    wxHyperlinkCtrl* m_hyperlink3;
-    wxAnimationCtrl* m_animationControl1;
-    wxStaticBitmap* m_bitmap10;
-    wxHyperlinkCtrl* m_hyperlink2;
-    wxHyperlinkCtrl* m_hyperlink6;
-    wxStaticBitmap* m_bitmapTransl;
-    wxStaticLine* m_staticline2;
-    wxStaticBitmap* m_bitmap13;
-    wxHyperlinkCtrl* m_hyperlink5;
-    wxButton* m_buttonOkay;
-
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-    virtual void OnOK( wxCommandEvent& event ) { event.Skip(); }
-
-
-public:
-
-    AboutDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("About"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
-    ~AboutDlgGenerated();
-
+	private:
+	
+	protected:
+		wxPanel* m_panel5;
+		wxStaticBitmap* m_bitmap11;
+		wxStaticText* m_build;
+		wxPanel* m_panel33;
+		wxBoxSizer* bSizerCodeInfo;
+		wxStaticText* m_staticText72;
+		wxHyperlinkCtrl* m_hyperlink9;
+		wxHyperlinkCtrl* m_hyperlink11;
+		wxHyperlinkCtrl* m_hyperlink10;
+		wxHyperlinkCtrl* m_hyperlink13;
+		wxHyperlinkCtrl* m_hyperlink7;
+		wxHyperlinkCtrl* m_hyperlink16;
+		wxHyperlinkCtrl* m_hyperlink8;
+		wxHyperlinkCtrl* m_hyperlink15;
+		wxHyperlinkCtrl* m_hyperlink12;
+		wxHyperlinkCtrl* m_hyperlink18;
+		wxHyperlinkCtrl* m_hyperlink14;
+		wxHyperlinkCtrl* m_hyperlink21;
+		wxScrolledWindow* m_scrolledWindowTranslators;
+		wxBoxSizer* bSizerTranslators;
+		wxStaticText* m_staticText54;
+		wxFlexGridSizer* fgSizerTranslators;
+		wxStaticLine* m_staticline3;
+		wxStaticText* m_staticText131;
+		wxStaticLine* m_staticline12;
+		wxStaticBitmap* m_bitmap9;
+		wxHyperlinkCtrl* m_hyperlink1;
+		wxHyperlinkCtrl* m_hyperlink3;
+		wxAnimationCtrl* m_animationControl1;
+		wxStaticBitmap* m_bitmap10;
+		wxHyperlinkCtrl* m_hyperlink2;
+		wxHyperlinkCtrl* m_hyperlink6;
+		wxStaticBitmap* m_bitmapTransl;
+		wxStaticLine* m_staticline2;
+		wxStaticBitmap* m_bitmap13;
+		wxHyperlinkCtrl* m_hyperlink5;
+		wxButton* m_buttonOkay;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnOK( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		
+		AboutDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("About"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE ); 
+		~AboutDlgGenerated();
+	
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class ErrorDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class ErrorDlgGenerated : public wxDialog
+class ErrorDlgGenerated : public wxDialog 
 {
-private:
-
-protected:
-    wxStaticBitmap* m_bitmap10;
-    wxTextCtrl* m_textCtrl8;
-    wxCheckBox* m_checkBoxIgnoreErrors;
-    wxButton* m_buttonIgnore;
-    wxButton* m_buttonRetry;
-    wxButton* m_buttonAbort;
-
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-    virtual void OnIgnore( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnRetry( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnAbort( wxCommandEvent& event ) { event.Skip(); }
-
-
-public:
-
-    ErrorDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Error"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 460,250 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER );
-    ~ErrorDlgGenerated();
-
+	private:
+	
+	protected:
+		wxStaticBitmap* m_bitmap10;
+		wxTextCtrl* m_textCtrl8;
+		wxCheckBox* m_checkBoxIgnoreErrors;
+		wxButton* m_buttonIgnore;
+		wxButton* m_buttonRetry;
+		wxButton* m_buttonAbort;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnIgnore( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnRetry( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnAbort( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		
+		ErrorDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Error"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 460,250 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER ); 
+		~ErrorDlgGenerated();
+	
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class WarningDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class WarningDlgGenerated : public wxDialog
+class WarningDlgGenerated : public wxDialog 
 {
-private:
-
-protected:
-    wxTextCtrl* m_textCtrl8;
-    wxCheckBox* m_checkBoxDontShowAgain;
-    wxButton* m_buttonIgnore;
-    wxButton* m_buttonSwitch;
-    wxButton* m_buttonAbort;
-
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-    virtual void OnIgnore( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnSwitch( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnAbort( wxCommandEvent& event ) { event.Skip(); }
-
-
-public:
-    wxStaticBitmap* m_bitmap10;
-
-    WarningDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Warning"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 460,250 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER );
-    ~WarningDlgGenerated();
-
+	private:
+	
+	protected:
+		wxTextCtrl* m_textCtrl8;
+		wxCheckBox* m_checkBoxDontShowAgain;
+		wxButton* m_buttonIgnore;
+		wxButton* m_buttonSwitch;
+		wxButton* m_buttonAbort;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnIgnore( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSwitch( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnAbort( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		wxStaticBitmap* m_bitmap10;
+		
+		WarningDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Warning"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 460,250 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER ); 
+		~WarningDlgGenerated();
+	
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class QuestionDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class QuestionDlgGenerated : public wxDialog
+class QuestionDlgGenerated : public wxDialog 
 {
-private:
-
-protected:
-    wxStaticBitmap* m_bitmap10;
-    wxTextCtrl* m_textCtrl8;
-    wxCheckBox* m_checkBoxDontAskAgain;
-    wxButton* m_buttonYes;
-    wxButton* m_buttonNo;
-    wxButton* m_buttonCancel;
-
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-    virtual void OnCheckBoxDontShowAgain( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnYes( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnNo( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-
-
-public:
-
-    QuestionDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Question"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 420,198 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER );
-    ~QuestionDlgGenerated();
-
+	private:
+	
+	protected:
+		wxStaticBitmap* m_bitmap10;
+		wxTextCtrl* m_textCtrl8;
+		wxCheckBox* m_checkBoxDontAskAgain;
+		wxButton* m_buttonYes;
+		wxButton* m_buttonNo;
+		wxButton* m_buttonCancel;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnCheckBoxDontShowAgain( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnYes( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnNo( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		
+		QuestionDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Question"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 420,198 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER ); 
+		~QuestionDlgGenerated();
+	
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class DeleteDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class DeleteDlgGenerated : public wxDialog
+class DeleteDlgGenerated : public wxDialog 
 {
-private:
-
-protected:
-    wxStaticBitmap* m_bitmap12;
-    wxStaticText* m_staticTextHeader;
-    wxCheckBox* m_checkBoxDeleteBothSides;
-    wxCheckBox* m_checkBoxUseRecycler;
-    wxTextCtrl* m_textCtrlMessage;
-    wxButton* m_buttonOK;
-    wxButton* m_buttonCancel;
-
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-    virtual void OnDelOnBothSides( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnUseRecycler( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnOK( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-
-
-public:
-
-    DeleteDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Confirm"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 553,336 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER );
-    ~DeleteDlgGenerated();
-
+	private:
+	
+	protected:
+		wxStaticBitmap* m_bitmap12;
+		wxStaticText* m_staticTextHeader;
+		wxCheckBox* m_checkBoxDeleteBothSides;
+		wxCheckBox* m_checkBoxUseRecycler;
+		wxTextCtrl* m_textCtrlMessage;
+		wxButton* m_buttonOK;
+		wxButton* m_buttonCancel;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnDelOnBothSides( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnUseRecycler( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnOK( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		
+		DeleteDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Confirm"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 553,336 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER ); 
+		~DeleteDlgGenerated();
+	
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class FilterDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class FilterDlgGenerated : public wxDialog
+class FilterDlgGenerated : public wxDialog 
 {
-private:
-
-protected:
-    wxStaticBitmap* m_bitmap26;
-    wxPanel* m_panel8;
-    wxStaticText* m_staticTexHeader;
-    wxStaticText* m_staticText44;
-    wxBitmapButton* m_bpButtonHelp;
-    wxPanel* m_panel13;
-    wxStaticLine* m_staticline10;
-    wxStaticText* m_staticText45;
-    wxStaticText* m_staticText83;
-    wxStaticText* m_staticText84;
-    wxStaticText* m_staticText85;
-    wxStaticText* m_staticText181;
-    wxStaticText* m_staticText1811;
-    wxStaticBitmap* m_bitmapInclude;
-    wxTextCtrl* m_textCtrlInclude;
-    wxStaticBitmap* m_bitmapExclude;
-    wxTextCtrl* m_textCtrlExclude;
-    wxStaticBitmap* m_bitmapFilterDate;
-    wxStaticText* m_staticText103;
-    wxChoice* m_choiceUnitTimespan;
-    wxSpinCtrl* m_spinCtrlTimespan;
-    wxStaticBitmap* m_bitmapFilterSize;
-    wxStaticText* m_staticText101;
-    wxSpinCtrl* m_spinCtrlMinSize;
-    wxChoice* m_choiceUnitMinSize;
-    wxStaticText* m_staticText102;
-    wxSpinCtrl* m_spinCtrlMaxSize;
-    wxChoice* m_choiceUnitMaxSize;
-    wxButton* m_button9;
-    wxButton* m_button10;
-    wxButton* m_button17;
-
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-    virtual void OnHelp( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnUpdateNameFilter( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnUpdateChoice( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnDefault( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnApply( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-
-
-public:
-
-    FilterDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Configure filter"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
-    ~FilterDlgGenerated();
-
+	private:
+	
+	protected:
+		wxStaticBitmap* m_bitmap26;
+		wxPanel* m_panel8;
+		wxStaticText* m_staticTexHeader;
+		wxStaticText* m_staticText44;
+		wxBitmapButton* m_bpButtonHelp;
+		wxPanel* m_panel13;
+		wxStaticLine* m_staticline10;
+		wxStaticText* m_staticText45;
+		wxStaticText* m_staticText83;
+		wxStaticText* m_staticText84;
+		wxStaticText* m_staticText85;
+		wxStaticText* m_staticText181;
+		wxStaticText* m_staticText1811;
+		wxStaticBitmap* m_bitmapInclude;
+		wxTextCtrl* m_textCtrlInclude;
+		wxStaticBitmap* m_bitmapExclude;
+		wxTextCtrl* m_textCtrlExclude;
+		wxStaticBitmap* m_bitmapFilterDate;
+		wxStaticText* m_staticText103;
+		wxChoice* m_choiceUnitTimespan;
+		wxSpinCtrl* m_spinCtrlTimespan;
+		wxStaticBitmap* m_bitmapFilterSize;
+		wxStaticText* m_staticText101;
+		wxSpinCtrl* m_spinCtrlMinSize;
+		wxChoice* m_choiceUnitMinSize;
+		wxStaticText* m_staticText102;
+		wxSpinCtrl* m_spinCtrlMaxSize;
+		wxChoice* m_choiceUnitMaxSize;
+		wxButton* m_button9;
+		wxButton* m_button10;
+		wxButton* m_button17;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnHelp( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnUpdateNameFilter( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnUpdateChoice( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnDefault( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnApply( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		
+		FilterDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Configure filter"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
+		~FilterDlgGenerated();
+	
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class CustomizeColsDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class CustomizeColsDlgGenerated : public wxDialog
+class CustomizeColsDlgGenerated : public wxDialog 
 {
-private:
-
-protected:
-    wxCheckListBox* m_checkListColumns;
-    wxBitmapButton* m_bpButton29;
-    wxBitmapButton* m_bpButton30;
-    wxButton* m_button9;
-    wxButton* m_button28;
-    wxButton* m_button29;
-
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-    virtual void OnMoveUp( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnMoveDown( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnDefault( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-
-
-public:
-
-    CustomizeColsDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Customize columns"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
-    ~CustomizeColsDlgGenerated();
-
+	private:
+	
+	protected:
+		wxCheckListBox* m_checkListColumns;
+		wxBitmapButton* m_bpButton29;
+		wxBitmapButton* m_bpButton30;
+		wxButton* m_button9;
+		wxButton* m_button28;
+		wxButton* m_button29;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnMoveUp( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnMoveDown( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnDefault( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		
+		CustomizeColsDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Customize columns"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); 
+		~CustomizeColsDlgGenerated();
+	
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class GlobalSettingsDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class GlobalSettingsDlgGenerated : public wxDialog
+class GlobalSettingsDlgGenerated : public wxDialog 
 {
-private:
-
-protected:
-    wxStaticBitmap* m_bitmapSettings;
-    wxPanel* m_panel8;
-    wxStaticText* m_staticText56;
-    wxCheckBox* m_checkBoxTransCopy;
-    wxCheckBox* m_checkBoxCopyLocked;
-    wxCheckBox* m_checkBoxCopyPermissions;
-    wxStaticLine* m_staticline10;
-    wxStaticText* m_staticText100;
-    wxButtonWithImage* m_buttonResetDialogs;
-    wxGrid* m_gridCustomCommand;
-    wxBitmapButton* m_bpButtonAddRow;
-    wxBitmapButton* m_bpButtonRemoveRow;
-    wxButton* m_button9;
-    wxButton* m_buttonOkay;
-    wxButton* m_button29;
-
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-    virtual void OnResetDialogs( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnAddRow( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnRemoveRow( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnDefault( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-
-
-public:
-
-    GlobalSettingsDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Global settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
-    ~GlobalSettingsDlgGenerated();
-
+	private:
+	
+	protected:
+		wxStaticBitmap* m_bitmapSettings;
+		wxPanel* m_panel8;
+		wxStaticText* m_staticText56;
+		wxCheckBox* m_checkBoxTransCopy;
+		wxCheckBox* m_checkBoxCopyLocked;
+		wxCheckBox* m_checkBoxCopyPermissions;
+		wxStaticLine* m_staticline10;
+		wxStaticText* m_staticText100;
+		zen::BitmapButton* m_buttonResetDialogs;
+		wxGrid* m_gridCustomCommand;
+		wxBitmapButton* m_bpButtonAddRow;
+		wxBitmapButton* m_bpButtonRemoveRow;
+		wxButton* m_button9;
+		wxButton* m_buttonOkay;
+		wxButton* m_button29;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnResetDialogs( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnAddRow( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnRemoveRow( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnDefault( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		
+		GlobalSettingsDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Global settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
+		~GlobalSettingsDlgGenerated();
+	
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class SyncPreviewDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class SyncPreviewDlgGenerated : public wxDialog
+class SyncPreviewDlgGenerated : public wxDialog 
 {
-private:
-
-protected:
-    wxButtonWithImage* m_buttonStartSync;
-    wxStaticLine* m_staticline16;
-    wxStaticText* m_staticTextVariant;
-    wxStaticLine* m_staticline14;
-    wxStaticText* m_staticText94;
-    wxStaticBitmap* m_bitmapCreate;
-    wxTextCtrl* m_textCtrlCreateL;
-    wxStaticBitmap* m_bitmapUpdate;
-    wxTextCtrl* m_textCtrlUpdateL;
-    wxStaticBitmap* m_bitmapDelete;
-    wxTextCtrl* m_textCtrlDeleteL;
-    wxStaticText* m_staticText95;
-    wxTextCtrl* m_textCtrlCreateR;
-    wxTextCtrl* m_textCtrlUpdateR;
-    wxTextCtrl* m_textCtrlDeleteR;
-    wxStaticBitmap* m_bitmapData;
-    wxTextCtrl* m_textCtrlData;
-    wxStaticLine* m_staticline12;
-    wxCheckBox* m_checkBoxDontShowAgain;
-    wxButton* m_button16;
-
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-    virtual void OnStartSync( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-
-
-public:
-
-    SyncPreviewDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Synchronization Preview"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
-    ~SyncPreviewDlgGenerated();
-
+	private:
+	
+	protected:
+		zen::BitmapButton* m_buttonStartSync;
+		wxStaticLine* m_staticline16;
+		wxStaticText* m_staticTextVariant;
+		wxStaticLine* m_staticline14;
+		wxStaticText* m_staticText94;
+		wxStaticBitmap* m_bitmapCreate;
+		wxTextCtrl* m_textCtrlCreateL;
+		wxStaticBitmap* m_bitmapUpdate;
+		wxTextCtrl* m_textCtrlUpdateL;
+		wxStaticBitmap* m_bitmapDelete;
+		wxTextCtrl* m_textCtrlDeleteL;
+		wxStaticText* m_staticText95;
+		wxTextCtrl* m_textCtrlCreateR;
+		wxTextCtrl* m_textCtrlUpdateR;
+		wxTextCtrl* m_textCtrlDeleteR;
+		wxStaticBitmap* m_bitmapData;
+		wxTextCtrl* m_textCtrlData;
+		wxStaticLine* m_staticline12;
+		wxCheckBox* m_checkBoxDontShowAgain;
+		wxButton* m_button16;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnStartSync( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		
+		SyncPreviewDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Synchronization Preview"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); 
+		~SyncPreviewDlgGenerated();
+	
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class PopupFrameGenerated1
 ///////////////////////////////////////////////////////////////////////////////
-class PopupFrameGenerated1 : public wxFrame
+class PopupFrameGenerated1 : public wxFrame 
 {
-private:
-
-protected:
-
-public:
-    wxStaticBitmap* m_bitmapLeft;
-    wxStaticText* m_staticTextMain;
-
-    PopupFrameGenerated1( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP|wxSTATIC_BORDER );
-
-    ~PopupFrameGenerated1();
-
+	private:
+	
+	protected:
+	
+	public:
+		wxStaticBitmap* m_bitmapLeft;
+		wxStaticText* m_staticTextMain;
+		
+		PopupFrameGenerated1( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP|wxSTATIC_BORDER );
+		
+		~PopupFrameGenerated1();
+	
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class SearchDialogGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class SearchDialogGenerated : public wxDialog
+class SearchDialogGenerated : public wxDialog 
 {
-private:
-
-protected:
-    wxStaticText* m_staticText101;
-    wxTextCtrl* m_textCtrlSearchTxt;
-    wxCheckBox* m_checkBoxMatchCase;
-    wxButton* m_buttonFindNext;
-    wxButton* m_button29;
-
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-    virtual void OnText( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnFindNext( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-
-
-public:
-
-    SearchDialogGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Find"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
-    ~SearchDialogGenerated();
-
+	private:
+	
+	protected:
+		wxStaticText* m_staticText101;
+		wxTextCtrl* m_textCtrlSearchTxt;
+		wxCheckBox* m_checkBoxMatchCase;
+		wxButton* m_buttonFindNext;
+		wxButton* m_button29;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnText( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnFindNext( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		
+		SearchDialogGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Find"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE ); 
+		~SearchDialogGenerated();
+	
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class SelectTimespanDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class SelectTimespanDlgGenerated : public wxDialog
+class SelectTimespanDlgGenerated : public wxDialog 
 {
-private:
-
-protected:
-    wxCalendarCtrl* m_calendarFrom;
-    wxCalendarCtrl* m_calendarTo;
-    wxButton* m_buttonOkay;
-    wxButton* m_button29;
-
-    // Virtual event handlers, overide them in your derived class
-    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-    virtual void OnChangeSelectionFrom( wxCalendarEvent& event ) { event.Skip(); }
-    virtual void OnChangeSelectionTo( wxCalendarEvent& event ) { event.Skip(); }
-    virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
-    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-
-
-public:
-
-    SelectTimespanDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Select time span"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
-    ~SelectTimespanDlgGenerated();
-
+	private:
+	
+	protected:
+		wxCalendarCtrl* m_calendarFrom;
+		wxCalendarCtrl* m_calendarTo;
+		wxButton* m_buttonOkay;
+		wxButton* m_button29;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnChangeSelectionFrom( wxCalendarEvent& event ) { event.Skip(); }
+		virtual void OnChangeSelectionTo( wxCalendarEvent& event ) { event.Skip(); }
+		virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		
+		SelectTimespanDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Select time span"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); 
+		~SelectTimespanDlgGenerated();
+	
 };
 
 #endif //__GUI_GENERATED_H__
diff --git a/ui/gui_status_handler.cpp b/ui/gui_status_handler.cpp
index 252fc80c..824c8084 100644
--- a/ui/gui_status_handler.cpp
+++ b/ui/gui_status_handler.cpp
@@ -9,9 +9,7 @@
 #include "msg_popup.h"
 #include "main_dlg.h"
 #include <wx/wupdlock.h>
-#include "../shared/global_func.h"
-#include "../shared/string_conv.h"
-#include "../shared/util.h"
+#include <wx+/string_conv.h>
 
 using namespace zen;
 using namespace xmlAccess;
diff --git a/ui/gui_status_handler.h b/ui/gui_status_handler.h
index 1e86c0cc..28429d68 100644
--- a/ui/gui_status_handler.h
+++ b/ui/gui_status_handler.h
@@ -7,11 +7,11 @@
 #ifndef GUISTATUSHANDLER_H_INCLUDED
 #define GUISTATUSHANDLER_H_INCLUDED
 
-#include "../library/status_handler.h"
+#include "../lib/status_handler.h"
 #include <wx/event.h>
-#include "../library/error_log.h"
+#include "../lib/error_log.h"
 #include "progress_indicator.h"
-#include "../library/process_xml.h"
+#include "../lib/process_xml.h"
 #include "main_dlg.h"
 
 class SyncStatus;
diff --git a/ui/main_dlg.cpp b/ui/main_dlg.cpp
index f03fd1f7..30d1a3b4 100644
--- a/ui/main_dlg.cpp
+++ b/ui/main_dlg.cpp
@@ -18,43 +18,42 @@
 #include <wx/app.h>
 #include <wx/dcmemory.h>
 #include <boost/bind.hpp>
-#include "../shared/folder_history_box.h"
-#include "../library/custom_grid.h"
-#include "../shared/custom_button.h"
-#include "../shared/dir_picker_i18n.h"
+#include "../lib/folder_history_box.h"
+#include "../lib/custom_grid.h"
+#include <wx+/button.h>
+#include <wx+/dir_picker.h>
 #include "../comparison.h"
 #include "../synchronization.h"
 #include "../algorithm.h"
-#include "../shared/app_main.h"
-#include "../shared/util.h"
+#include <wx+/app_main.h>
+#include <wx+/format_unit.h>
 #include "check_version.h"
 #include "gui_status_handler.h"
 #include "sync_cfg.h"
-#include "../shared/i18n.h"
-#include "../shared/string_conv.h"
+#include <wx+/string_conv.h>
 #include "small_dlgs.h"
-#include "../shared/mouse_move_dlg.h"
+#include <wx+/mouse_move_dlg.h>
 #include "progress_indicator.h"
 #include "msg_popup.h"
-#include "../shared/dir_name.h"
+#include "../lib/dir_name.h"
 #include "../structures.h"
 #include "grid_view.h"
-#include "../library/resources.h"
-#include "../shared/file_handling.h"
-#include "../shared/resolve_path.h"
-#include "../shared/recycler.h"
-#include "../shared/standard_paths.h"
-#include "../shared/toggle_button.h"
+#include "../lib/resources.h"
+#include <zen/file_handling.h>
+#include <zen/file_id.h>
+#include "../lib/resolve_path.h"
+#include "../lib/recycler.h"
+#include "../lib/ffs_paths.h"
+#include <wx+/toggle_button.h>
 #include "folder_pair.h"
-#include "../shared/global_func.h"
 #include "search.h"
-#include "../shared/help_provider.h"
+#include "../lib/help_provider.h"
 #include "batch_config.h"
-#include "../shared/check_exist.h"
-#include "../library/lock_holder.h"
-#include "../shared/shell_execute.h"
-#include "../shared/localization.h"
-#include "../shared/image_tools.h"
+#include <zen/thread.h>
+#include "../lib/lock_holder.h"
+#include <wx+/shell_execute.h>
+#include "../lib/localization.h"
+#include <wx+/image_tools.h>
 
 using namespace zen;
 using namespace std::rel_ops;
@@ -300,20 +299,6 @@ private:
 };
 
 
-struct DirNotFound
-{
-    bool operator()(const FolderPairEnh& fp) const
-    {
-        const Zstring dirFmtLeft  = zen::getFormattedDirectoryName(fp.leftDirectory);
-        const Zstring dirFmtRight = zen::getFormattedDirectoryName(fp.rightDirectory);
-
-        if (dirFmtLeft.empty() && dirFmtRight.empty())
-            return false;
-
-        return !dirExists(dirFmtLeft) || !dirExists(dirFmtRight);
-    }
-};
-
 
 #ifdef FFS_WIN
 class PanelMoveWindow : public MouseMoveWindow
@@ -342,22 +327,36 @@ private:
 
 
 //##################################################################################################################################
-MainDialog::MainDialog(const wxString& cfgFileName, xmlAccess::XmlGlobalSettings& settings) :
+MainDialog::MainDialog(const std::vector<wxString>& cfgFileNames, xmlAccess::XmlGlobalSettings& settings) :
     MainDialogGenerated(NULL)
 {
     xmlAccess::XmlGuiConfig guiCfg;  //structure to receive gui settings, already defaulted!!
 
     std::vector<wxString> filenames;
-    if (!cfgFileName.empty()) //1. this one has priority
-        filenames.push_back(cfgFileName);
+    if (!cfgFileNames.empty()) //1. this one has priority
+        filenames = cfgFileNames;
     else //next: use last used selection
     {
         filenames = settings.gui.lastUsedConfigFiles; //2. now try last used files
 
+        //------------------------------------------------------------------------------------------
+        //check existence of all directories in parallel!
+        std::list<boost::unique_future<bool>> fileEx;
+
+        std::for_each(filenames.begin(), filenames.end(),
+                      [&fileEx](const wxString& filename)
+        {
+            const Zstring filenameFmt = toZ(filename); //convert to Zstring first: we don't want to pass wxString by value and risk MT issues!
+            fileEx.push_back(zen::async2<bool>([=]() { return !filenameFmt.empty() && zen::fileExists(filenameFmt); }));
+        });
+        //potentially slow network access: give all checks 500ms to finish
+        wait_for_all_timed(fileEx.begin(), fileEx.end(), boost::posix_time::milliseconds(500));
+        //------------------------------------------------------------------------------------------
+
         //check if one of the files is not existing (this shall not be an error!)
-        if (std::find_if(filenames.begin(), filenames.end(),
-        [](const wxString& filename) { return !fileExists(toZ(filename)); }) != filenames.end())
-        filenames.clear();
+        const bool allFilesExist = std::find_if(fileEx.begin(), fileEx.end(), [](boost::unique_future<bool>& ft) { return !ft.is_ready() || !ft.get(); }) == fileEx.end();
+        if (!allFilesExist)
+            filenames.clear();
 
         if (filenames.empty())
         {
@@ -382,7 +381,7 @@ MainDialog::MainDialog(const wxString& cfgFileName, xmlAccess::XmlGlobalSettings
             else
                 wxMessageBox(error.msg(), _("Error"), wxOK | wxICON_ERROR);
         }
-    const bool startComparisonImmediately = loadCfgSuccess && !cfgFileName.empty();
+    const bool startComparisonImmediately = !cfgFileNames.empty() && loadCfgSuccess;
 
     init(guiCfg,
          settings,
@@ -392,7 +391,8 @@ MainDialog::MainDialog(const wxString& cfgFileName, xmlAccess::XmlGlobalSettings
 }
 
 
-MainDialog::MainDialog(const xmlAccess::XmlGuiConfig& guiCfg,
+MainDialog::MainDialog(const std::vector<wxString>& referenceFiles,
+                       const xmlAccess::XmlGuiConfig& guiCfg,
                        xmlAccess::XmlGlobalSettings& settings,
                        bool startComparison) :
     MainDialogGenerated(NULL)
@@ -401,7 +401,7 @@ MainDialog::MainDialog(const xmlAccess::XmlGuiConfig& guiCfg,
          settings,
          startComparison);
 
-    setLastUsedConfig(std::vector<wxString>(), guiCfg);
+    setLastUsedConfig(referenceFiles, guiCfg);
 }
 
 
@@ -464,7 +464,7 @@ void MainDialog::init(const xmlAccess::XmlGuiConfig guiCfg,
                    wxAuiPaneInfo().Name(wxT("Panel4")).Bottom().Row(1).Position(0).Caption(_("Configuration")).MinSize(m_listBoxHistory->GetSize().GetWidth(), m_panelConfig->GetSize().GetHeight()));
 
     auiMgr.AddPane(m_panelFilter,
-                   wxAuiPaneInfo().Name(wxT("Panel5")).Bottom().Row(1).Position(1).Caption(_("Filter files")).MinSize(-1, m_panelFilter->GetSize().GetHeight()));
+                   wxAuiPaneInfo().Name(wxT("Panel5")).Bottom().Row(1).Position(1).Caption(_("Filter files")).MinSize(m_bpButtonFilter->GetSize().GetWidth(), m_panelFilter->GetSize().GetHeight()));
 
     auiMgr.AddPane(m_panelViewFilter,
                    wxAuiPaneInfo().Name(wxT("Panel6")).Bottom().Row(1).Position(2).Caption(_("Select view")).MinSize(m_bpButtonSyncDirNone->GetSize().GetWidth(), m_panelViewFilter->GetSize().GetHeight()));
@@ -510,10 +510,10 @@ void MainDialog::init(const xmlAccess::XmlGuiConfig guiCfg,
 
     syncPreview.reset(new SyncPreview(this));
 
-    SetIcon(*GlobalResources::instance().programIcon); //set application icon
+    SetIcon(GlobalResources::instance().programIcon); //set application icon
 
     //notify about (logical) application main window => program won't quit, but stay on this dialog
-    zen::AppMainWindow::setMainWindow(this);
+    zen::setMainWindow(this);
 
     //init handling of first folder pair
     firstFolderPair.reset(new DirectoryPairFirst(*this));
@@ -596,13 +596,11 @@ void MainDialog::init(const xmlAccess::XmlGuiConfig guiCfg,
     m_panelTopLeft->Connect(wxEVT_SIZE, wxEventHandler(MainDialog::OnResizeFolderPairs), NULL, this);
 
     //dynamically change sizer direction depending on size
-    //m_panelTopButtons->Connect(wxEVT_SIZE, wxEventHandler(MainDialog::OnResizeTopButtons),      NULL, this);
     m_panelConfig    ->Connect(wxEVT_SIZE, wxEventHandler(MainDialog::OnResizeConfigPanel),     NULL, this);
     m_panelViewFilter->Connect(wxEVT_SIZE, wxEventHandler(MainDialog::OnResizeViewPanel),       NULL, this);
     m_panelStatistics->Connect(wxEVT_SIZE, wxEventHandler(MainDialog::OnResizeStatisticsPanel), NULL, this);
     wxSizeEvent dummy3;
-    //OnResizeTopButtons     (dummy3); //call once on window creation
-    OnResizeConfigPanel    (dummy3); //
+    OnResizeConfigPanel    (dummy3); //call once on window creation
     OnResizeViewPanel      (dummy3); //
     OnResizeStatisticsPanel(dummy3); //
 
@@ -630,17 +628,41 @@ void MainDialog::init(const xmlAccess::XmlGuiConfig guiCfg,
     OnResizeFolderPairs(evtDummy); //
 
     //----------------------------------------------------------------------------------------------------------------------------------------------------------------
-    //some convenience: if FFS is started with a *.ffs_gui file as commandline parameter AND all directories contained exist, comparison shall be started right off
+    //some convenience: if FFS is started with a *.ffs_gui file as commandline parameter AND all directories contained exist, comparison shall be started right away
     if (startComparison)
     {
         const zen::MainConfiguration currMainCfg = getConfig().mainCfg;
-        const bool allFoldersExist = !DirNotFound()(currMainCfg.firstPair) &&
-                                     std::find_if(currMainCfg.additionalPairs.begin(), currMainCfg.additionalPairs.end(),
-                                                  DirNotFound()) == currMainCfg.additionalPairs.end();
-        if (allFoldersExist)
+
+        //------------------------------------------------------------------------------------------
+        //check existence of all directories in parallel!
+        std::list<boost::unique_future<bool>> dirEx;
+
+        auto addDirCheck = [&dirEx](const FolderPairEnh& fp)
         {
-            wxCommandEvent dummy2(wxEVT_COMMAND_BUTTON_CLICKED);
-            m_buttonCompare->GetEventHandler()->AddPendingEvent(dummy2); //simulate button click on "compare"
+            const Zstring dirFmtLeft  = zen::getFormattedDirectoryName(fp.leftDirectory);
+            const Zstring dirFmtRight = zen::getFormattedDirectoryName(fp.rightDirectory);
+
+            if (dirFmtLeft.empty() && dirFmtRight.empty()) //only skip check if both sides are empty!
+                return;
+
+            dirEx.push_back(zen::async2<bool>([=]() { return !dirFmtLeft .empty() && zen::dirExists(dirFmtLeft); }));
+            dirEx.push_back(zen::async2<bool>([=]() { return !dirFmtRight.empty() && zen::dirExists(dirFmtRight); }));
+        };
+        addDirCheck(currMainCfg.firstPair);
+        std::for_each(currMainCfg.additionalPairs.begin(), currMainCfg.additionalPairs.end(), addDirCheck);
+        if (!dirEx.empty())
+        {
+            //potentially slow network access: give all checks 500ms to finish
+            wait_for_all_timed(dirEx.begin(), dirEx.end(), boost::posix_time::milliseconds(500));
+            //------------------------------------------------------------------------------------------
+
+            const bool allFoldersExist = std::find_if(dirEx.begin(), dirEx.end(), [](boost::unique_future<bool>& ft) { return !ft.is_ready() || !ft.get(); }) == dirEx.end();
+
+            if (allFoldersExist)
+            {
+                wxCommandEvent dummy2(wxEVT_COMMAND_BUTTON_CLICKED);
+                m_buttonCompare->GetEventHandler()->AddPendingEvent(dummy2); //simulate button click on "compare"
+            }
         }
     }
     //----------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -964,8 +986,8 @@ public:
 
         if (updateUiIsAllowed())  //test if specific time span between ui updates is over
         {
-            wxString statusMessage = _P("Object deleted successfully!", "%x objects deleted successfully!", deletionCount);
-            statusMessage.Replace(wxT("%x"), zen::toStringSep(deletionCount), false);
+            wxString statusMessage = replaceCpy(_P("Object deleted successfully!", "%x objects deleted successfully!", deletionCount),
+                                                L"%x", zen::toStringSep(deletionCount), false);
 
             if (mainDlg->m_staticTextStatusMiddle->GetLabel() != statusMessage)
             {
@@ -1288,12 +1310,6 @@ void updateSizerOrientation(wxBoxSizer& sizer, wxWindow& window)
 }
 
 
-/*void MainDialog::OnResizeTopButtons(wxEvent& event)
-{
-    updateSizerOrientation(*bSizerTopButtons, *m_panelTopButtons);
-    event.Skip();
-}*/
-
 void MainDialog::OnResizeConfigPanel(wxEvent& event)
 {
     updateSizerOrientation(*bSizerConfig, *m_panelConfig);
@@ -1816,10 +1832,10 @@ void MainDialog::OnContextRim(wxGridEvent& event)
     //CONTEXT_EXCLUDE_EXT
     if (exFilterCandidateObj.size() > 0 && !exFilterCandidateObj.begin()->second) //non empty && no directory
     {
-        const Zstring filename = exFilterCandidateObj.begin()->first.AfterLast(FILE_NAME_SEPARATOR);
+        const Zstring filename = afterLast(exFilterCandidateObj.begin()->first, FILE_NAME_SEPARATOR);
         if (filename.find(Zchar('.')) !=  Zstring::npos) //be careful: AfterLast would return the whole string if '.' were not found!
         {
-            const Zstring extension = filename.AfterLast(Zchar('.'));
+            const Zstring extension = afterLast(filename, Zchar('.'));
 
             //add context menu item
             wxMenuItem* menuItemExclExt = new wxMenuItem(contextMenu.get(), wxID_ANY, wxString(_("Exclude via filter:")) + " " + "*." + extension);
@@ -1839,7 +1855,7 @@ void MainDialog::OnContextRim(wxGridEvent& event)
     //CONTEXT_EXCLUDE_OBJ
     wxMenuItem* menuItemExclObj = NULL;
     if (exFilterCandidateObj.size() == 1)
-        menuItemExclObj = new wxMenuItem(contextMenu.get(), wxID_ANY, wxString(_("Exclude via filter:")) + " " + exFilterCandidateObj.begin()->first.AfterLast(FILE_NAME_SEPARATOR));
+        menuItemExclObj = new wxMenuItem(contextMenu.get(), wxID_ANY, wxString(_("Exclude via filter:")) + " " + afterLast(exFilterCandidateObj.begin()->first, FILE_NAME_SEPARATOR));
     else if (exFilterCandidateObj.size() > 1)
         menuItemExclObj = new wxMenuItem(contextMenu.get(), wxID_ANY, wxString(_("Exclude via filter:")) + " " + _("<multiple selection>"));
 
@@ -1871,7 +1887,7 @@ void MainDialog::OnContextRim(wxGridEvent& event)
         {
             //some trick to translate default external apps on the fly: 1. "open in explorer" 2. "start directly"
             //wxString description = wxGetTranslation(i->first);
-            wxString description = zen::translate(i->first.c_str());
+            wxString description = zen::implementation::translate(i->first.c_str());
             if (description.empty())
                 description = wxT(" "); //wxWidgets doesn't like empty items
 
@@ -1920,7 +1936,7 @@ void MainDialog::OnContextExcludeExtension(wxCommandEvent& event)
 
         //add to filter config
         Zstring& excludeFilter = currentCfg.mainCfg.globalFilter.excludeFilter;
-        if (!excludeFilter.empty() && !excludeFilter.EndsWith(Zstr(";")))
+        if (!excludeFilter.empty() && !endsWith(excludeFilter, Zstr(";")))
             excludeFilter += Zstr("\n");
         excludeFilter += newExclude + Zstr(";"); //';' is appended to 'mark' that next exclude extension entry won't write to new line
 
@@ -1963,7 +1979,7 @@ void MainDialog::OnContextExcludeObject(wxCommandEvent& event)
 
             //add to filter config
             Zstring& excludeFilter = currentCfg.mainCfg.globalFilter.excludeFilter;
-            if (!excludeFilter.empty() && !excludeFilter.EndsWith(Zstr("\n")))
+            if (!excludeFilter.empty() && !endsWith(excludeFilter, Zstr("\n")))
                 excludeFilter += Zstr("\n");
             excludeFilter += newExclude;
 
@@ -2488,14 +2504,31 @@ wxString getFormattedHistoryElement(const wxString& filename)
 
 void MainDialog::addFileToCfgHistory(const std::vector<wxString>& filenames)
 {
+    //check existence of all config files in parallel!
+    std::list<boost::unique_future<bool>> fileEx;
+    std::for_each(filenames.begin(), filenames.end(),
+                  [&](const wxString& filename)
+    {
+        const Zstring file = toZ(filename); //convert to Zstring first: we don't want to pass wxString by value and risk MT issues!
+        fileEx.push_back(zen::async2<bool>([=]() { return zen::fileExists(file); }));
+    });
+
+    //potentially slow network access: give all checks 500ms to finish
+    wait_for_all_timed(fileEx.begin(), fileEx.end(), boost::posix_time::milliseconds(500));
+    //------------------------------------------------------------------------------------------
+
+
     std::deque<bool> selections(m_listBoxHistory->GetCount());
 
-    std::for_each(filenames.begin(), filenames.end(),
-                  [&](wxString filename)
+    auto futIter = fileEx.begin();
+    for (auto iter = filenames.begin(); iter != filenames.end(); ++iter, ++futIter)
     {
         //only (still) existing files should be included in the list
-        if (util::fileExists(toZ(filename), 200) == util::EXISTING_FALSE) //potentially slow network access: wait 200ms
-            return;
+        if (futIter->is_ready() && !futIter->get())
+            continue;
+
+        const wxString& filename = *iter;
+        const Zstring file = toZ(filename);
 
         int posFound = -1;
 
@@ -2507,7 +2540,7 @@ void MainDialog::addFileToCfgHistory(const std::vector<wxString>& filenames)
                 const wxString& filenameTmp = cData->name_;
 
                 //tests if the same filenames are specified, even if they are relative to the current working directory/include symlinks or \\?\ prefix
-                if (util::sameFileSpecified(toZ(filename), toZ(filenameTmp)))
+                if (zen::samePhysicalFile(toZ(filename), toZ(filenameTmp)))
                 {
                     posFound = i;
                     break;
@@ -2521,14 +2554,14 @@ void MainDialog::addFileToCfgHistory(const std::vector<wxString>& filenames)
         {
             int newPos = -1;
             //the default config file should receive a different name on GUI
-            if (util::sameFileSpecified(toZ(lastRunConfigName()), toZ(filename)))
+            if (zen::samePhysicalFile(toZ(lastRunConfigName()), toZ(filename)))
                 newPos = m_listBoxHistory->Append(_("<Last session>"), new wxClientDataString(filename));
             else
                 newPos = m_listBoxHistory->Append(getFormattedHistoryElement(filename), new wxClientDataString(filename));
 
             selections.insert(selections.begin() + newPos, true);
         }
-    });
+    }
 
     assert(selections.size() == m_listBoxHistory->GetCount());
 
@@ -2835,7 +2868,8 @@ void MainDialog::setLastUsedConfig(const wxString& filename, const xmlAccess::Xm
 }
 
 
-void MainDialog::setLastUsedConfig(const std::vector<wxString>& filenames, const xmlAccess::XmlGuiConfig& guiConfig)
+void MainDialog::setLastUsedConfig(const std::vector<wxString>& filenames,
+                                   const xmlAccess::XmlGuiConfig& guiConfig)
 {
     activeConfigFiles = filenames;
     lastConfigurationSaved = guiConfig;
@@ -2875,8 +2909,8 @@ void MainDialog::setConfig(const xmlAccess::XmlGuiConfig& newGuiCfg)
                                currentCfg.mainCfg.firstPair.altSyncConfig,
                                currentCfg.mainCfg.firstPair.localFilter);
 
-    folderHistoryLeft->addItem(currentCfg.mainCfg.firstPair.leftDirectory);
-    folderHistoryRight->addItem(currentCfg.mainCfg.firstPair.rightDirectory);
+    //folderHistoryLeft->addItem(currentCfg.mainCfg.firstPair.leftDirectory);
+    //folderHistoryRight->addItem(currentCfg.mainCfg.firstPair.rightDirectory);
 
     //clear existing additional folder pairs
     clearAddFolderPairs();
@@ -3275,7 +3309,7 @@ void MainDialog::OnCompare(wxCommandEvent& event)
         const std::vector<zen::FolderPairCfg> cmpConfig = zen::extractCompareCfg(getConfig().mainCfg);
 
         //GUI mode: place directory locks on directories isolated(!) during both comparison and synchronization
-        LockHolder dummy2;
+        LockHolder dummy2(true); //allow pw prompt
         for (std::vector<FolderPairCfg>::const_iterator i = cmpConfig.begin(); i != cmpConfig.end(); ++i)
         {
             dummy2.addDir(i->leftDirectoryFmt,  statusHandler);
@@ -3285,6 +3319,7 @@ void MainDialog::OnCompare(wxCommandEvent& event)
         //begin comparison
         zen::CompareProcess compProc(globalSettings->fileTimeTolerance,
                                      globalSettings->optDialogs,
+                                     true, //allow pw prompt
                                      statusHandler);
 
         //technical representation of comparison data
@@ -3373,7 +3408,7 @@ void MainDialog::updateStatistics()
     const wxString toCreate = zen::toStringSep(st.getCreate());
     const wxString toUpdate = zen::toStringSep(st.getOverwrite());
     const wxString toDelete = zen::toStringSep(st.getDelete());
-    const wxString data     = zen::formatFilesizeToShortString(st.getDataToProcess());
+    const wxString data     = zen::filesizeToShortString(st.getDataToProcess());
 
     m_textCtrlCreate->SetValue(toCreate);
     m_textCtrlUpdate->SetValue(toUpdate);
@@ -3487,12 +3522,12 @@ void MainDialog::OnStartSync(wxCommandEvent& event)
         wxString activeFileName = activeConfigFiles.size() == 1 && activeConfigFiles[0] != lastRunConfigName() ? activeConfigFiles[0] : wxString();
 
         //class handling status updates and error messages
-        SyncStatusHandler statusHandler(this, currentCfg.handleError, zen::extractJobName(activeFileName));
+        SyncStatusHandler statusHandler(this, currentCfg.handleError, xmlAccess::extractJobName(activeFileName));
 
         FolderComparison& dataToSync = gridDataView->getDataTentative();
 
         //GUI mode: place directory locks on directories isolated(!) during both comparison and synchronization
-        LockHolder dummy2;
+        LockHolder dummy2(true); //allow pw prompt
 
         for (auto i = begin(dataToSync); i != end(dataToSync); ++i)
         {
@@ -3879,9 +3914,7 @@ void MainDialog::updateGridViewData()
     //show status information on "root" level.
     if (foldersOnLeftView)
     {
-        wxString tmp = _P("1 directory", "%x directories", foldersOnLeftView);
-        tmp.Replace(wxT("%x"), zen::toStringSep(foldersOnLeftView), false);
-        statusLeftNew += tmp;
+        statusLeftNew += replaceCpy(_P("1 directory", "%x directories", foldersOnLeftView), L"%x", zen::toStringSep(foldersOnLeftView), false);
 
         if (filesOnLeftView)
             statusLeftNew += wxT(" - ");
@@ -3889,26 +3922,21 @@ void MainDialog::updateGridViewData()
 
     if (filesOnLeftView)
     {
-        wxString tmp = _P("1 file", "%x files", filesOnLeftView);
-        tmp.Replace(wxT("%x"), zen::toStringSep(filesOnLeftView), false);
-        statusLeftNew += tmp;
-
+        statusLeftNew += replaceCpy(_P("1 file", "%x files", filesOnLeftView), L"%x", zen::toStringSep(filesOnLeftView), false);
         statusLeftNew += wxT(" - ");
-        statusLeftNew += zen::formatFilesizeToShortString(filesizeLeftView);
+        statusLeftNew += zen::filesizeToShortString(filesizeLeftView);
     }
 
     {
         wxString tmp = _P("%x of 1 row in view", "%x of %y rows in view", gridDataView->rowsTotal());
-        tmp.Replace(wxT("%x"), toStringSep(gridDataView->rowsOnView()), false);
-        tmp.Replace(wxT("%y"), toStringSep(gridDataView->rowsTotal()), false);
+        replace(tmp, L"%x", toStringSep(gridDataView->rowsOnView()), false);
+        replace(tmp, L"%y", toStringSep(gridDataView->rowsTotal()), false);
         statusMiddleNew = tmp;
     }
 
     if (foldersOnRightView)
     {
-        wxString tmp = _P("1 directory", "%x directories", foldersOnRightView);
-        tmp.Replace(wxT("%x"), zen::toStringSep(foldersOnRightView), false);
-        statusRightNew += tmp;
+        statusRightNew += replaceCpy(_P("1 directory", "%x directories", foldersOnRightView), L"%x", zen::toStringSep(foldersOnRightView), false);
 
         if (filesOnRightView)
             statusRightNew += wxT(" - ");
@@ -3916,12 +3944,9 @@ void MainDialog::updateGridViewData()
 
     if (filesOnRightView)
     {
-        wxString tmp = _P("1 file", "%x files", filesOnRightView);
-        tmp.Replace(wxT("%x"), zen::toStringSep(filesOnRightView), false);
-        statusRightNew += tmp;
-
+        statusRightNew += replaceCpy(_P("1 file", "%x files", filesOnRightView), L"%x", zen::toStringSep(filesOnRightView), false);
         statusRightNew += wxT(" - ");
-        statusRightNew += zen::formatFilesizeToShortString(filesizeRightView);
+        statusRightNew += zen::filesizeToShortString(filesizeRightView);
     }
 
 
@@ -4104,52 +4129,42 @@ void MainDialog::addFolderPair(const std::vector<FolderPairEnh>& newPairs, bool
     wxWindowUpdateLocker dummy(m_panelDirectoryPairs); //avoid display distortion
     wxWindowUpdateLocker dummy2(m_panelGrids);         //
 
-    if (!newPairs.empty())
+    std::for_each(newPairs.begin(), newPairs.end(),
+                  [&](const FolderPairEnh& enhPair)
     {
-        for (std::vector<FolderPairEnh>::const_iterator i = newPairs.begin(); i != newPairs.end(); ++i)
-        {
-            //add new folder pair
-            DirectoryPair* newPair = new DirectoryPair(m_scrolledWindowFolderPairs, *this);
-
-            //init dropdown history
-            newPair->m_directoryLeft ->init(folderHistoryLeft);
-            newPair->m_directoryRight->init(folderHistoryRight);
-
-            //set width of left folder panel
-            const int width = m_panelTopLeft->GetSize().GetWidth();
-            newPair->m_panelLeft->SetMinSize(wxSize(width, -1));
+        //add new folder pair
+        DirectoryPair* newPair = new DirectoryPair(m_scrolledWindowFolderPairs, *this);
 
+        //init dropdown history
+        newPair->m_directoryLeft ->init(folderHistoryLeft);
+        newPair->m_directoryRight->init(folderHistoryRight);
 
-            if (addFront)
-            {
-                bSizerAddFolderPairs->Insert(0, newPair, 0, wxEXPAND, 5);
-                additionalFolderPairs.insert(additionalFolderPairs.begin(), newPair);
-            }
-            else
-            {
-                bSizerAddFolderPairs->Add(newPair, 0, wxEXPAND, 5);
-                additionalFolderPairs.push_back(newPair);
-            }
+        //set width of left folder panel
+        const int width = m_panelTopLeft->GetSize().GetWidth();
+        newPair->m_panelLeft->SetMinSize(wxSize(width, -1));
 
-            //register events
-            newPair->m_bpButtonRemovePair->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(MainDialog::OnRemoveFolderPair), NULL, this);
 
-            //set alternate configuration
-            newPair->setValues(toWx(i->leftDirectory),
-                               toWx(i->rightDirectory),
-                               i->altCmpConfig,
-                               i->altSyncConfig,
-                               i->localFilter);
+        if (addFront)
+        {
+            bSizerAddFolderPairs->Insert(0, newPair, 0, wxEXPAND, 5);
+            additionalFolderPairs.insert(additionalFolderPairs.begin(), newPair);
+        }
+        else
+        {
+            bSizerAddFolderPairs->Add(newPair, 0, wxEXPAND, 5);
+            additionalFolderPairs.push_back(newPair);
         }
 
-        //set size of scrolled window
-        //m_scrolledWindowFolderPairs->SetMinSize(wxSize( -1, pairHeight * static_cast<int>(visiblePairs)));
+        //register events
+        newPair->m_bpButtonRemovePair->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(MainDialog::OnRemoveFolderPair), NULL, this);
 
-        //update controls
-        //        m_scrolledWindowFolderPairs->Fit();    //adjust scrolled window size
-        //      m_scrolledWindowFolderPairs->Layout(); //adjust stuff inside scrolled window
-        //bSizer1->Layout();
-    }
+        //set alternate configuration
+        newPair->setValues(toWx(enhPair.leftDirectory),
+                           toWx(enhPair.rightDirectory),
+                           enhPair.altCmpConfig,
+                           enhPair.altSyncConfig,
+                           enhPair.localFilter);
+    });
 
     updateGuiForFolderPair();
 
@@ -4422,11 +4437,12 @@ void MainDialog::switchProgramLanguage(const int langID)
     zen::setLanguage(langID); //language is a global attribute
 
     const xmlAccess::XmlGuiConfig currentGuiCfg = getConfig();
+    auto activeFiles = activeConfigFiles;
 
     cleanUp(false); //destructor's code: includes updating global settings
 
     //create new main window and delete old one
-    MainDialog* frame = new MainDialog(currentGuiCfg, *globalSettings, false);
+    MainDialog* frame = new MainDialog(activeFiles, currentGuiCfg, *globalSettings, false);
     frame->Show();
 
     Destroy();
diff --git a/ui/main_dlg.h b/ui/main_dlg.h
index 2179cdf5..94edbcce 100644
--- a/ui/main_dlg.h
+++ b/ui/main_dlg.h
@@ -7,14 +7,14 @@
 #ifndef MAINDIALOG_H
 #define MAINDIALOG_H
 
-#include "gui_generated.h"
-#include <stack>
-#include "../library/process_xml.h"
 #include <memory>
 #include <map>
 #include <set>
 #include <wx/aui/aui.h>
-#include "../shared/int64.h"
+#include <zen/int64.h>
+#include <stack>
+#include "gui_generated.h"
+#include "../lib/process_xml.h"
 
 class FolderHistory;
 class CustomGrid;
@@ -38,10 +38,11 @@ class GridView;
 class MainDialog : public MainDialogGenerated
 {
 public:
-    MainDialog(const wxString& cfgFileName,
+    MainDialog(const std::vector<wxString>& cfgFileNames, //default behavior, application start
                xmlAccess::XmlGlobalSettings& settings);
 
-    MainDialog(const xmlAccess::XmlGuiConfig& guiCfg,
+    MainDialog(const std::vector<wxString>& referenceFiles,
+               const xmlAccess::XmlGuiConfig& guiCfg,
                xmlAccess::XmlGlobalSettings& settings,
                bool startComparison);
 
@@ -204,7 +205,6 @@ private:
     void refreshGridAfterFilterChange(int delay);
 
     void OnResize(              wxSizeEvent& event);
-    //void OnResizeTopButtons(    wxEvent& event);
     void OnResizeFolderPairs(   wxEvent& event);
     void OnResizeConfigPanel(   wxEvent& event);
     void OnResizeViewPanel(     wxEvent& event);
diff --git a/ui/msg_popup.cpp b/ui/msg_popup.cpp
index 9e0e0111..a59c77ef 100644
--- a/ui/msg_popup.cpp
+++ b/ui/msg_popup.cpp
@@ -5,8 +5,8 @@
 // **************************************************************************
 
 #include "msg_popup.h"
-#include "../library/resources.h"
-#include "../shared/mouse_move_dlg.h"
+#include "../lib/resources.h"
+#include <wx+/mouse_move_dlg.h>
 #include "gui_generated.h"
 
 
@@ -265,7 +265,6 @@ void QuestionDlg::OnCheckBoxDontShowAgain(wxCommandEvent& event)
 }
 
 
-
 ReturnQuestionDlg::ButtonPressed zen::showQuestionDlg(int activeButtons, const wxString& messageText, bool* dontShowAgain)
 {
     QuestionDlg qtnDlg(NULL, activeButtons, messageText, dontShowAgain);
diff --git a/ui/msg_popup.h b/ui/msg_popup.h
index b6e1a1a7..f6e36f36 100644
--- a/ui/msg_popup.h
+++ b/ui/msg_popup.h
@@ -9,7 +9,6 @@
 
 #include <wx/string.h>
 
-
 namespace zen
 {
 struct ReturnErrorDlg
diff --git a/ui/progress_indicator.cpp b/ui/progress_indicator.cpp
index 7da143a1..4102db9d 100644
--- a/ui/progress_indicator.cpp
+++ b/ui/progress_indicator.cpp
@@ -8,19 +8,20 @@
 #include <memory>
 #include "gui_generated.h"
 #include <wx/stopwatch.h>
-#include "../library/resources.h"
-#include "../shared/string_conv.h"
-#include "../shared/util.h"
-#include "../library/statistics.h"
+#include "../lib/resources.h"
+#include <wx+/string_conv.h>
+#include <wx+/format_unit.h>
+#include "../lib/statistics.h"
 #include <wx/wupdlock.h>
-#include "../shared/global_func.h"
+#include <zen/basic_math.h>
 #include "tray_icon.h"
 #include <memory>
-#include "../shared/mouse_move_dlg.h"
-#include "../library/error_log.h"
-#include "../shared/toggle_button.h"
-#include "../shared/taskbar.h"
-#include "../shared/image_tools.h"
+#include <wx+/mouse_move_dlg.h>
+#include "../lib/error_log.h"
+#include <wx+/toggle_button.h>
+#include "taskbar.h"
+#include <wx+/image_tools.h>
+#include <wx+/graph.h>
 
 using namespace zen;
 
@@ -94,10 +95,11 @@ private:
 
     CurrentStatus status;
 
-    std::unique_ptr<util::Taskbar> taskbar_;
+    std::unique_ptr<Taskbar> taskbar_;
 
     //remaining time
     std::unique_ptr<Statistics> statistics;
+
     long lastStatCallSpeed;   //used for calculating intervals between statistics update
     long lastStatCallRemTime; //
 };
@@ -175,9 +177,9 @@ void CompareStatus::CompareStatusImpl::init()
 
     try //try to get access to Windows 7/Ubuntu taskbar
     {
-        taskbar_.reset(new util::Taskbar(parentWindow_));
+        taskbar_.reset(new Taskbar(parentWindow_));
     }
-    catch (const util::TaskbarNotAvailable&) {}
+    catch (const TaskbarNotAvailable&) {}
 
     status = SCANNING;
 
@@ -271,7 +273,6 @@ void CompareStatus::CompareStatusImpl::showProgressExternally(const wxString& pr
         parentWindow_.SetTitle(progressText);
 
     //show progress on Windows 7 taskbar
-    using namespace util;
 
     if (taskbar_.get())
         switch (status)
@@ -304,32 +305,32 @@ void CompareStatus::CompareStatusImpl::updateStatusPanelNow()
                 showProgressExternally(toStringSep(scannedObjects) + wxT(" - ") + _("Scanning..."));
                 break;
             case COMPARING_CONTENT:
-                showProgressExternally(formatPercentage(fraction) + wxT(" - ") + _("Comparing content..."), fraction);
+                showProgressExternally(percentageToShortString(fraction) + wxT(" - ") + _("Comparing content..."), fraction);
                 break;
         }
 
         bool updateLayout = false; //avoid screen flicker by calling layout() only if necessary
 
         //remove linebreaks from currentStatusText
-        wxString formattedStatusText = currentStatusText;
-        replace(formattedStatusText, L'\n', L' ');
+        wxString statusTextFmt = currentStatusText;
+        replace(statusTextFmt, L'\n', L' ');
 
         //status texts
-        if (m_textCtrlStatus->GetValue() != formattedStatusText) //no layout update for status texts!
-            m_textCtrlStatus->ChangeValue(formattedStatusText);
+        if (m_textCtrlStatus->GetValue() != statusTextFmt) //no layout update for status texts!
+            m_textCtrlStatus->ChangeValue(statusTextFmt);
 
         //nr of scanned objects
         setNewText(toStringSep(scannedObjects), *m_staticTextScanned, updateLayout);
 
         //progress indicator for "compare file content"
-        m_gauge2->SetValue(common::round(fraction * GAUGE_FULL_RANGE));
+        m_gauge2->SetValue(numeric::round(fraction * GAUGE_FULL_RANGE));
 
         //remaining files left for file comparison
         const wxString filesToCompareTmp = toStringSep(totalObjects - currentObjects);
         setNewText(filesToCompareTmp, *m_staticTextFilesRemaining, updateLayout);
 
         //remaining bytes left for file comparison
-        const wxString remainingBytesTmp = zen::formatFilesizeToShortString(to<zen::UInt64>(totalData - currentData));
+        const wxString remainingBytesTmp = zen::filesizeToShortString(to<zen::UInt64>(totalData - currentData));
         setNewText(remainingBytesTmp, *m_staticTextDataRemaining, updateLayout);
 
         if (statistics.get())
@@ -348,7 +349,7 @@ void CompareStatus::CompareStatusImpl::updateStatusPanelNow()
                     lastStatCallRemTime = timeElapsed.Time();
 
                     //remaining time
-                    setNewText(statistics->getRemainingTime(), *m_staticTextTimeRemaining, updateLayout);
+                    setNewText(statistics->getRemainingTime(), *m_staticTextRemTime, updateLayout);
                 }
             }
         }
@@ -479,6 +480,110 @@ private:
 
 //########################################################################################
 
+namespace
+{
+class GraphDataBytes : public GraphData
+{
+public:
+    void addCurrentValue(double dataCurrent)
+    {
+        data.insert(data.end(), std::make_pair(timer.Time(), dataCurrent));
+        //documentation differs about whether "hint" should be before or after the to be inserted element!
+        //however "std::map<>::end()" is interpreted correctly by GCC and VS2010
+
+        if (data.size() > MAX_BUFFER_SIZE) //guard against too large a buffer
+            data.erase(data.begin());
+    }
+
+    void pauseTimer () { timer.Pause();  }
+    void resumeTimer() { timer.Resume(); }
+
+private:
+    static const size_t MAX_BUFFER_SIZE = 2500000; //sizeof(single node) worst case ~ 3 * 8 byte ptr + 16 byte key/value = 40 byte
+
+    virtual double getValue(double x) const //x: seconds since begin
+    {
+        auto iter = data.lower_bound(x * 1000);
+        if (iter == data.end())
+            return data.empty() ? 0 : (--data.end())->second;
+        return iter->second;
+    }
+    virtual double getXBegin() const { return 0; } //{ return data.empty() ? 0 : data.begin()->first / 1000.0; }
+    virtual double getXEnd  () const { return data.empty() ? 0 : (--data.end())->first / 1000.0; }
+    //example: two-element range is accessible within [0, 2)
+
+    wxStopWatch timer;
+    std::map<long, double> data;
+};
+
+
+struct LabelFormatterBytes : public LabelFormatter
+{
+    virtual double getOptimalBlockSize(double bytesProposed) const
+    {
+        //round to next number which is a convenient to read block size
+        if (bytesProposed <= 0)
+            return 0;
+
+        const double k = std::floor(std::log(bytesProposed) / std::log(2.0));
+        const double e = std::pow(2.0, k);
+        const double a = bytesProposed / e; //bytesProposed = a * 2^k with a in (1, 2)
+        return (a < 1.5 ? 1 : 2) * e;
+    }
+
+    virtual wxString formatText(double value, double optimalBlockSize) const { return filesizeToShortString(UInt64(value)); };
+};
+
+
+inline
+double bestFit(double val, double low, double high) { return val < (high + low) / 2 ? low : high; }
+
+
+struct LabelFormatterTimeElapsed : public LabelFormatter
+{
+    virtual double getOptimalBlockSize(double secProposed) const
+    {
+        if (secProposed <= 5)
+            return 5; //minimum block size
+
+        //for seconds and minutes: nice numbers are 1, 5, 10, 15, 20, 30
+        auto calcBlock = [](double val) -> double
+        {
+            if (val <= 5)
+                return bestFit(val, 1, 5); //
+            if (val <= 10)
+                return bestFit(val, 5, 10); // a good candidate for a variadic template!
+            if (val <= 15)
+                return bestFit(val, 10, 15); //
+            if (val <= 20)
+                return bestFit(val, 15, 20);
+            if (val <= 30)
+                return bestFit(val, 20, 30);
+            return bestFit(val, 30, 60);
+        };
+
+        if (secProposed <= 60)
+            return calcBlock(secProposed);
+        else if (secProposed <= 3600)
+            return calcBlock(secProposed / 60) * 60;
+        else if (secProposed <= 3600 * 24)
+            return nextNiceNumber(secProposed / 3600) * 3600;
+        else
+            return nextNiceNumber(secProposed / (24 * 3600)) * 24 * 3600; //round up to full days
+    }
+
+    virtual wxString formatText(double timeElapsed, double optimalBlockSize) const
+    {
+        return timeElapsed < 60 ?
+               remainingTimeToShortString(timeElapsed) :
+               timeElapsed < 3600 ?
+               wxTimeSpan::Seconds(timeElapsed).Format(   L"%M:%S") :
+               wxTimeSpan::Seconds(timeElapsed).Format(L"%H:%M:%S");
+    }
+};
+}
+
+
 class SyncStatus::SyncStatusImpl : public SyncStatusDlgGenerated
 {
 public:
@@ -529,13 +634,15 @@ private:
     bool processPaused;
     SyncStatus::SyncStatusID currentStatus;
 
-    std::unique_ptr<util::Taskbar> taskbar_;
+    std::unique_ptr<Taskbar> taskbar_;
 
     //remaining time
     std::unique_ptr<Statistics> statistics;
     long lastStatCallSpeed;   //used for calculating intervals between statistics update
     long lastStatCallRemTime; //
 
+    std::shared_ptr<GraphDataBytes> graphDataBytes;
+
     wxString titelTextBackup;
 
     std::unique_ptr<FfsTrayIcon> trayIcon; //optional: if filled all other windows should be hidden and conversely
@@ -610,6 +717,19 @@ void SyncStatus::processHasFinished(SyncStatusID id, const ErrorLogging& log)
 }
 //########################################################################################
 
+namespace
+{
+void fitHeight(wxTopLevelWindow& wnd)
+{
+    if (wnd.IsMaximized())
+        return;
+    //Fit() height only:
+    int width = wnd.GetSize().GetWidth();
+    wnd.Fit();
+    int height = wnd.GetSize().GetHeight();
+    wnd.SetSize(wxSize(width, height));
+}
+}
 
 SyncStatus::SyncStatusImpl::SyncStatusImpl(AbortCallback& abortCb,
                                            MainDialog* parentWindow,
@@ -618,7 +738,7 @@ SyncStatus::SyncStatusImpl::SyncStatusImpl(AbortCallback& abortCb,
     SyncStatusDlgGenerated(parentWindow,
                            wxID_ANY,
                            parentWindow ? wxString(wxEmptyString) : (wxString(wxT("FreeFileSync - ")) + _("Folder Comparison and Synchronization")),
-                           wxDefaultPosition, wxSize(638, 350),
+                           wxDefaultPosition, wxSize(620, 330),
                            parentWindow ?
                            wxDEFAULT_FRAME_STYLE | wxTAB_TRAVERSAL | wxFRAME_NO_TASKBAR | wxFRAME_FLOAT_ON_PARENT : //wxTAB_TRAVERSAL is needed for standard button handling: wxID_OK/wxID_CANCEL
                            wxDEFAULT_FRAME_STYLE | wxTAB_TRAVERSAL),
@@ -642,11 +762,11 @@ SyncStatus::SyncStatusImpl::SyncStatusImpl(AbortCallback& abortCb,
     if (mainDialog) //save old title (will be used as progress indicator)
         titelTextBackup = mainDialog->GetTitle();
 
-    m_animationControl1->SetAnimation(*GlobalResources::instance().animationSync);
+    m_animationControl1->SetAnimation(GlobalResources::instance().animationSync);
     m_animationControl1->Play();
 
     m_staticTextSpeed->SetLabel(wxT("-"));
-    m_staticTextTimeRemaining->SetLabel(wxT("-"));
+    m_staticTextRemTime->SetLabel(wxT("-"));
 
     //initialize gauge
     m_gauge1->SetRange(GAUGE_FULL_RANGE);
@@ -665,20 +785,29 @@ SyncStatus::SyncStatusImpl::SyncStatusImpl(AbortCallback& abortCb,
 
     try //try to get access to Windows 7/Ubuntu taskbar
     {
-        taskbar_.reset(new util::Taskbar(mainDialog != NULL ? *static_cast<wxTopLevelWindow*>(mainDialog) : *this));
+        taskbar_.reset(new Taskbar(mainDialog != NULL ? *static_cast<wxTopLevelWindow*>(mainDialog) : *this));
     }
-    catch (const util::TaskbarNotAvailable&) {}
+    catch (const TaskbarNotAvailable&) {}
 
     //hide "processed" statistics until end of process
-    bSizerObjectsProcessed->Show(false);
-    //bSizerDataProcessed->Show(false);
+    bSizerFinalStat->Show(false);
 
-    SetIcon(*GlobalResources::instance().programIcon); //set application icon
+    SetIcon(GlobalResources::instance().programIcon); //set application icon
 
     //register key event
     Connect(wxEVT_CHAR_HOOK, wxKeyEventHandler(SyncStatusImpl::OnKeyPressed), NULL, this);
 
     setCurrentStatus(startStatus); //first state: will be shown while waiting for dir locks (if at all)
+
+    //init graph
+    graphDataBytes = std::make_shared<GraphDataBytes>();
+    m_panelGraph->setAttributes(Graph2D::GraphAttributes().
+                                setLabelX(Graph2D::X_LABEL_BOTTOM, 20, std::make_shared<LabelFormatterTimeElapsed>()).
+                                setLabelY(Graph2D::Y_LABEL_RIGHT,  60, std::make_shared<LabelFormatterBytes>()));
+    m_panelGraph->setData(graphDataBytes, Graph2D::LineAttributes().setLineWidth(2).setColor(wxColor(0, 192, 0))); //medium green
+
+    //Fit() height only:
+    //fitHeight(*this);
 }
 
 
@@ -747,6 +876,9 @@ void SyncStatus::SyncStatusImpl::incProgressIndicator_NoUpdate(int objectsProces
 
     currentData    +=    dataProcessed;
     currentObjects += objectsProcessed;
+
+    //update graph data
+    graphDataBytes->addCurrentValue(to<double>(currentData));
 }
 
 
@@ -782,7 +914,6 @@ void SyncStatus::SyncStatusImpl::showProgressExternally(const wxString& progress
             this->SetTitle(progressTextFmt);
     }
 
-    using namespace util;
 
     //show progress on Windows 7 taskbar
     if (taskbar_.get())
@@ -811,6 +942,7 @@ void SyncStatus::SyncStatusImpl::showProgressExternally(const wxString& progress
     }
 }
 
+
 #ifdef FFS_WIN
 namespace
 {
@@ -818,7 +950,7 @@ enum Zorder
 {
     ZORDER_CORRECT,
     ZORDER_WRONG,
-    ZORDER_INDEFIINTE,
+    ZORDER_INDEFINITE,
 };
 
 Zorder validateZorder(const wxWindow& top, const wxWindow& bottom)
@@ -835,11 +967,12 @@ Zorder validateZorder(const wxWindow& top, const wxWindow& bottom)
         if (hAbove == hBottom)
             return ZORDER_WRONG;
 
-    return ZORDER_INDEFIINTE;
+    return ZORDER_INDEFINITE;
 }
 }
 #endif
 
+
 void SyncStatus::SyncStatusImpl::updateStatusDialogNow(bool allowYield)
 {
     //static RetrieveStatistics statistic;
@@ -857,13 +990,13 @@ void SyncStatus::SyncStatusImpl::updateStatusDialogNow(bool allowYield)
             showProgressExternally(toStringSep(scannedObjects) + wxT(" - ") + _("Scanning...") + postFix);
             break;
         case SyncStatus::COMPARING_CONTENT:
-            showProgressExternally(formatPercentage(fraction) + wxT(" - ") + _("Comparing content...") + postFix, fraction);
+            showProgressExternally(percentageToShortString(fraction) + wxT(" - ") + _("Comparing content...") + postFix, fraction);
             break;
         case SyncStatus::SYNCHRONIZING:
-            showProgressExternally(formatPercentage(fraction) + wxT(" - ") + _("Synchronizing...") + postFix, fraction);
+            showProgressExternally(percentageToShortString(fraction) + wxT(" - ") + _("Synchronizing...") + postFix, fraction);
             break;
         case SyncStatus::PAUSE:
-            showProgressExternally(formatPercentage(fraction) + wxT(" - ") + _("Paused") + postFix, fraction);
+            showProgressExternally(percentageToShortString(fraction) + wxT(" - ") + _("Paused") + postFix, fraction);
             break;
         case SyncStatus::ABORTED:
             showProgressExternally(_("Aborted") + postFix, fraction);
@@ -891,24 +1024,29 @@ void SyncStatus::SyncStatusImpl::updateStatusDialogNow(bool allowYield)
             case SyncStatus::FINISHED_WITH_SUCCESS:
             case SyncStatus::FINISHED_WITH_ERROR:
             case SyncStatus::ABORTED:
-                m_gauge1->SetValue(common::round(fraction * GAUGE_FULL_RANGE));
+                m_gauge1->SetValue(numeric::round(fraction * GAUGE_FULL_RANGE));
                 break;
             case SyncStatus::PAUSE: //no change to gauge: don't switch between indeterminate/determinate modus
                 break;
         }
 
+
+        wxString statusTextFmt = currentStatusText;  //remove linebreaks
+        replace(statusTextFmt, L'\n', L' ');         //
+
         //status text
-        if (m_textCtrlInfo->GetValue() != currentStatusText) //no layout update for status texts!
-            m_textCtrlInfo->ChangeValue(currentStatusText);
+        if (m_textCtrlInfo->GetValue() != statusTextFmt) //no layout update for status texts!
+            m_textCtrlInfo->ChangeValue(statusTextFmt);
 
         //remaining objects
         const wxString remainingObjTmp = toStringSep(totalObjects - currentObjects);
         setNewText(remainingObjTmp, *m_staticTextRemainingObj, updateLayout);
 
         //remaining bytes left for copy
-        const wxString remainingBytesTmp = zen::formatFilesizeToShortString(to<zen::UInt64>(totalData - currentData));
+        const wxString remainingBytesTmp = zen::filesizeToShortString(to<zen::UInt64>(totalData - currentData));
         setNewText(remainingBytesTmp, *m_staticTextDataRemaining, updateLayout);
 
+        //statistics
         if (statistics.get())
         {
             if (timeElapsed.Time() - lastStatCallSpeed >= 500) //call method every 500 ms
@@ -925,19 +1063,24 @@ void SyncStatus::SyncStatusImpl::updateStatusDialogNow(bool allowYield)
                     lastStatCallRemTime = timeElapsed.Time();
 
                     //remaining time
-                    setNewText(statistics->getRemainingTime(), *m_staticTextTimeRemaining, updateLayout);
+                    setNewText(statistics->getRemainingTime(), *m_staticTextRemTime, updateLayout);
                 }
             }
         }
 
+        m_panelGraph->Refresh();
+
         //time elapsed
-        setNewText(wxTimeSpan::Milliseconds(timeElapsed.Time()).Format(), *m_staticTextTimeElapsed, updateLayout);
+        const int timeElapSec = timeElapsed.Time() / 1000;
+        setNewText(timeElapSec < 3600 ?
+                   wxTimeSpan::Seconds(timeElapSec).Format(   L"%M:%S") :
+                   wxTimeSpan::Seconds(timeElapSec).Format(L"%H:%M:%S"), *m_staticTextTimeElapsed, updateLayout);
 
         //do the ui update
         if (updateLayout)
         {
-            bSizer28->Layout();
-            bSizer31->Layout();
+            bSizerProgressStat->Layout();
+            bSizerProgressMain->Layout();
         }
     }
 
@@ -962,6 +1105,7 @@ void SyncStatus::SyncStatusImpl::updateStatusDialogNow(bool allowYield)
         if (processPaused)
         {
             if (statistics.get()) statistics->pauseTimer();
+            graphDataBytes->pauseTimer();
 
             while (processPaused && currentProcessIsRunning())
             {
@@ -970,6 +1114,7 @@ void SyncStatus::SyncStatusImpl::updateStatusDialogNow(bool allowYield)
             }
 
             if (statistics.get()) statistics->resumeTimer();
+            graphDataBytes->resumeTimer();
         }
 
         /*
@@ -1059,30 +1204,38 @@ void SyncStatus::SyncStatusImpl::processHasFinished(SyncStatus::SyncStatusID id,
     m_animationControl1->Stop();
     m_animationControl1->Hide();
 
-    //hide speed and remaining time
-    bSizerSpeed  ->Show(false);
-    bSizerRemTime->Show(false);
+    //hide current operation status
+    bSizerCurrentOperation->Show(false);
 
-    //if everything was processed successfully, hide remaining statistics (is 0 anyway)
-    if (totalObjects == currentObjects &&
-        totalData    == currentData)
-    {
-        bSizerObjectsRemaining->Show(false);
+    //hide progress statistics
+    bSizerProgressMain->Show(false);
 
-        bSizerObjectsProcessed->Show(true);
+    //show and prepare final statistics
+    bSizerFinalStat->Show(true);
+    m_staticTextProcessedObj->SetLabel(toStringSep(currentObjects));
+    m_staticTextDataProcessed->SetLabel(zen::filesizeToShortString(to<zen::UInt64>(currentData)));
 
-        m_staticTextProcessedObj->SetLabel(toStringSep(currentObjects));
-        m_staticTextDataProcessed->SetLabel(zen::formatFilesizeToShortString(to<zen::UInt64>(currentData)));
-    }
+    m_staticTextTimeTotal->SetLabel(m_staticTextTimeElapsed->GetLabel());
+
+    //    if (totalObjects == currentObjects &&  ->if everything was processed successfully
+    //        totalData    == currentData)
+    //        ;
 
     updateStatusDialogNow(false); //keep this sequence to avoid display distortion, if e.g. only 1 item is sync'ed
 
-    //hide progress text control and show log control instead
-    m_textCtrlInfo->Hide();
-    LogControl* logControl = new LogControl(this, log);
-    bSizerProgressText->Add(logControl, 3, wxEXPAND | wxALL, 5);
+    //fill result listbox:
+    //1. log file
+    LogControl* logControl = new LogControl(m_listbookResult, log);
+    m_listbookResult->AddPage(logControl, _("Logging"), true);
+    //bSizerHoldStretch->Insert(0, logControl, 1, wxEXPAND);
+
+    //2. re-arrange graph into results listbook
+    bSizerProgressMain->Detach(m_panelGraph);
+    m_panelGraph->Reparent(m_listbookResult);
+    m_listbookResult->AddPage(m_panelGraph, _("Statistics"), false);
 
-    Layout();                               //
+    //fitHeight(*this);
+    Layout();
 
     //Raise(); -> don't! user may be watching a movie in the meantime ;)
 }
diff --git a/ui/progress_indicator.h b/ui/progress_indicator.h
index 71a975f6..a9e5f64b 100644
--- a/ui/progress_indicator.h
+++ b/ui/progress_indicator.h
@@ -7,9 +7,9 @@
 #ifndef PROGRESSINDICATOR_H_INCLUDED
 #define PROGRESSINDICATOR_H_INCLUDED
 
-#include "../shared/zstring.h"
+#include <zen/zstring.h>
 #include <wx/toplevel.h>
-#include "../library/status_handler.h"
+#include "../lib/status_handler.h"
 #include "main_dlg.h"
 
 namespace zen
diff --git a/ui/search.cpp b/ui/search.cpp
index d0b24299..2b33bc64 100644
--- a/ui/search.cpp
+++ b/ui/search.cpp
@@ -9,7 +9,7 @@
 #include <wx/msgdlg.h>
 #include <wx/utils.h>
 #include <utility>
-#include "../shared/mouse_move_dlg.h"
+#include <wx+/mouse_move_dlg.h>
 
 
 class SearchDlg : public SearchDialogGenerated
diff --git a/ui/small_dlgs.cpp b/ui/small_dlgs.cpp
index f57f8324..ac949132 100644
--- a/ui/small_dlgs.cpp
+++ b/ui/small_dlgs.cpp
@@ -7,23 +7,21 @@
 #include "gui_generated.h"
 #include "small_dlgs.h"
 #include "msg_popup.h"
-#include "../library/resources.h"
+#include "../lib/resources.h"
 #include "../algorithm.h"
-#include "../shared/string_conv.h"
-#include "../shared/util.h"
-#include "../shared/wx_choice_enum.h"
+#include <wx+/string_conv.h>
+#include <wx+/format_unit.h>
+#include <wx+/choice_enum.h>
 #include "../synchronization.h"
-#include "../library/custom_grid.h"
-#include "../shared/custom_button.h"
-#include "../shared/i18n.h"
-#include "../shared/global_func.h"
-#include "../shared/build_info.h"
+#include "../lib/custom_grid.h"
+#include <wx+/button.h>
+#include <zen/build_info.h>
 #include <wx/wupdlock.h>
 #include <wx/msgdlg.h>
-#include "../shared/mouse_move_dlg.h"
-#include "../shared/help_provider.h"
-#include "../shared/image_tools.h"
-#include "../shared/stl_tools.h"
+#include <wx+/mouse_move_dlg.h>
+#include "../lib/help_provider.h"
+#include <wx+/image_tools.h>
+#include <zen/stl_tools.h>
 
 using namespace zen;
 
@@ -77,18 +75,18 @@ AboutDlg::AboutDlg(wxWindow* parent) : AboutDlgGenerated(parent)
 #endif //wxUSE_UNICODE
 
     //compile time info about 32/64-bit build
-    if (util::is64BitBuild)
+    if (zen::is64BitBuild)
         build += wxT(" x64");
     else
         build += wxT(" x86");
-    assert_static(util::is32BitBuild || util::is64BitBuild);
+    assert_static(zen::is32BitBuild || zen::is64BitBuild);
 
     wxString buildFormatted = _("(Build: %x)");
     buildFormatted.Replace(wxT("%x"), build);
 
     m_build->SetLabel(buildFormatted);
 
-    m_animationControl1->SetAnimation(*GlobalResources::instance().animationMoney);
+    m_animationControl1->SetAnimation(GlobalResources::instance().animationMoney);
     m_animationControl1->Play();
 
     m_buttonOkay->SetFocus();
@@ -384,7 +382,7 @@ void DeleteDialog::updateGui()
                     "Do you really want to delete the following %x objects?", delInfo.second);
         m_bitmap12->SetBitmap(GlobalResources::getImage(wxT("deleteFile")));
     }
-    header.Replace(wxT("%x"), toStringSep(delInfo.second));
+    replace(header, L"%x", toStringSep(delInfo.second));
     m_staticTextHeader->SetLabel(header);
 
     const wxString& filesToDelete = delInfo.first;
@@ -607,7 +605,7 @@ SyncPreviewDlg::SyncPreviewDlg(wxWindow* parent,
     m_bitmapData->SetBitmap(GlobalResources::getImage(wxT("data")));
 
     m_staticTextVariant->SetLabel(variantName);
-    m_textCtrlData->SetValue(zen::formatFilesizeToShortString(statistics.getDataToProcess()));
+    m_textCtrlData->SetValue(zen::filesizeToShortString(statistics.getDataToProcess()));
 
     m_textCtrlCreateL->SetValue(toStringSep(statistics.getCreate   <LEFT_SIDE>()));
     m_textCtrlUpdateL->SetValue(toStringSep(statistics.getOverwrite<LEFT_SIDE>()));
diff --git a/ui/small_dlgs.h b/ui/small_dlgs.h
index ca497bfb..9abcba6c 100644
--- a/ui/small_dlgs.h
+++ b/ui/small_dlgs.h
@@ -8,7 +8,7 @@
 #define SMALLDIALOGS_H_INCLUDED
 
 #include "../file_hierarchy.h"
-#include "../library/process_xml.h"
+#include "../lib/process_xml.h"
 #include "../synchronization.h"
 
 namespace zen
diff --git a/ui/sorting.h b/ui/sorting.h
index 719934d8..596dfd53 100644
--- a/ui/sorting.h
+++ b/ui/sorting.h
@@ -9,7 +9,7 @@
 
 #include "../file_hierarchy.h"
 #include "../synchronization.h"
-#include "../shared/assert_static.h"
+#include <zen/assert_static.h>
 
 
 namespace zen
@@ -87,12 +87,12 @@ bool lessRelativeName(const FileSystemObject& a, const FileSystemObject& b)
     const bool isDirectoryA = isDirectoryMapping(a);
     const Zstring& relDirNameA = isDirectoryA ?
                                  a.getObjRelativeName() : //directory
-                                 a.getObjRelativeName().BeforeLast(FILE_NAME_SEPARATOR); //returns empty string if ch not found
+                                 beforeLast(a.getObjRelativeName(), FILE_NAME_SEPARATOR); //returns empty string if ch not found
 
     const bool isDirectoryB = isDirectoryMapping(b);
     const Zstring& relDirNameB = isDirectoryB ?
                                  b.getObjRelativeName() : //directory
-                                 b.getObjRelativeName().BeforeLast(FILE_NAME_SEPARATOR); //returns empty string if ch not found
+                                 beforeLast(b.getObjRelativeName(), FILE_NAME_SEPARATOR); //returns empty string if ch not found
 
     //compare relative names without filenames first
     const int rv = cmpFileName(relDirNameA, relDirNameB);
diff --git a/ui/switch_to_gui.cpp b/ui/switch_to_gui.cpp
deleted file mode 100644
index 76e5b282..00000000
--- a/ui/switch_to_gui.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-// **************************************************************************
-// * This file is part of the FreeFileSync project. It is distributed under *
-// * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
-// * Copyright (C) 2008-2011 ZenJu (zhnmju123 AT gmx.de)                    *
-// **************************************************************************
-
-#include "switch_to_gui.h"
-#include "main_dlg.h"
-
-using zen::SwitchToGui;
-
-
-SwitchToGui::SwitchToGui(const xmlAccess::XmlBatchConfig& batchCfg,
-                         xmlAccess::XmlGlobalSettings& globalSettings) : //prepare
-    globalSettings_(globalSettings),
-    guiCfg(xmlAccess::convertBatchToGui(batchCfg)) {}
-
-
-void SwitchToGui::execute() const //throw()
-{
-    try
-    {
-        MainDialog* frame = new MainDialog(guiCfg, globalSettings_, true); //toplevel window
-        frame->Show();
-    }
-    catch (...) {}
-}
diff --git a/ui/switch_to_gui.h b/ui/switch_to_gui.h
index cbbff20c..70ef90d3 100644
--- a/ui/switch_to_gui.h
+++ b/ui/switch_to_gui.h
@@ -7,22 +7,35 @@
 #ifndef SWITCHTOGUI_H_INCLUDED
 #define SWITCHTOGUI_H_INCLUDED
 
-#include "../library/process_xml.h"
-
+#include "../lib/process_xml.h"
+#include "main_dlg.h" //in "application.cpp" we have this dependency anyway!
 
 namespace zen
 {
-
 //switch from FreeFileSync Batch to GUI modus: opens a new FreeFileSync GUI session asynchronously
 class SwitchToGui
 {
 public:
-    SwitchToGui(const xmlAccess::XmlBatchConfig& batchCfg, xmlAccess::XmlGlobalSettings& globalSettings); //prepare
-    void execute() const; //throw()
+    SwitchToGui(const wxString& referenceFile,
+                const xmlAccess::XmlBatchConfig& batchCfg,
+                xmlAccess::XmlGlobalSettings& globalSettings) :
+        guiCfg(xmlAccess::convertBatchToGui(batchCfg)),
+        globalSettings_(globalSettings)
+    {
+        referenceFiles.push_back(referenceFile);
+    }
+
+    void execute() const
+    {
+
+        MainDialog* frame = new MainDialog(referenceFiles, guiCfg, globalSettings_, true); //toplevel window
+        frame->Show();
+    }
 
 private:
-    xmlAccess::XmlGlobalSettings& globalSettings_;
+    std::vector<wxString> referenceFiles;
     const xmlAccess::XmlGuiConfig guiCfg;
+    xmlAccess::XmlGlobalSettings& globalSettings_;
 };
 }
 
diff --git a/ui/sync_cfg.cpp b/ui/sync_cfg.cpp
index d85e2bcf..d19520be 100644
--- a/ui/sync_cfg.cpp
+++ b/ui/sync_cfg.cpp
@@ -5,17 +5,17 @@
 // **************************************************************************
 
 #include "sync_cfg.h"
-#include "../library/resources.h"
-#include "../shared/dir_name.h"
+#include "../lib/resources.h"
+#include "../lib/dir_name.h"
 #include <wx/wupdlock.h>
-#include "../shared/mouse_move_dlg.h"
-#include "../shared/string_conv.h"
-#include "../shared/dir_picker_i18n.h"
+#include <wx+/mouse_move_dlg.h>
+#include <wx+/string_conv.h>
+#include <wx+/dir_picker.h>
 #include "gui_generated.h"
 #include <memory>
-#include "../shared/wx_choice_enum.h"
-#include "../shared/dir_name.h"
-#include "../shared/image_tools.h"
+#include <wx+/choice_enum.h>
+#include "../lib/dir_name.h"
+#include <wx+/image_tools.h>
 
 using namespace zen;
 using namespace xmlAccess;
diff --git a/ui/sync_cfg.h b/ui/sync_cfg.h
index 1b95f53b..5e93c64d 100644
--- a/ui/sync_cfg.h
+++ b/ui/sync_cfg.h
@@ -7,7 +7,7 @@
 #ifndef SYNCCONFIG_H_INCLUDED
 #define SYNCCONFIG_H_INCLUDED
 
-#include "../library/process_xml.h"
+#include "../lib/process_xml.h"
 
 namespace zen
 {
diff --git a/ui/taskbar.cpp b/ui/taskbar.cpp
new file mode 100644
index 00000000..caab300c
--- /dev/null
+++ b/ui/taskbar.cpp
@@ -0,0 +1,151 @@
+// **************************************************************************
+// * This file is part of the FreeFileSync project. It is distributed under *
+// * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
+// * Copyright (C) 2008-2011 ZenJu (zhnmju123 AT gmx.de)                    *
+// **************************************************************************
+//
+#include "taskbar.h"
+
+#ifdef FFS_WIN
+#include <zen/win.h> //includes "windows.h"
+#include <zen/dll.h>
+#include <zen/assert_static.h>
+#include <zen/win_ver.h>
+#include "Taskbar_Seven/taskbar.h"
+
+#elif defined HAVE_UBUNTU_UNITY
+#include <unity/unity/unity.h>
+#endif
+
+using namespace zen;
+
+
+#ifdef FFS_WIN
+using namespace tbseven;
+
+
+class Taskbar::Pimpl //throw (TaskbarNotAvailable)
+{
+public:
+    Pimpl(const wxTopLevelWindow& window) :
+        assocWindow(window.GetHWND()),
+        setStatus_  (getDllName(), setStatusFctName),
+        setProgress_(getDllName(), setProgressFctName)
+    {
+        if (!assocWindow || !setProgress_ || !setStatus_)
+            throw TaskbarNotAvailable();
+
+        if (!zen::win7OrLater())
+            throw TaskbarNotAvailable();
+    }
+
+    ~Pimpl() { setStatus(STATUS_NOPROGRESS); }
+
+    void setStatus(Status status)
+    {
+        TaskBarStatus tbSevenStatus = tbseven::STATUS_NORMAL;
+        switch (status)
+        {
+            case Taskbar::STATUS_NOPROGRESS:
+                tbSevenStatus = tbseven::STATUS_NOPROGRESS;
+                break;
+            case Taskbar::STATUS_INDETERMINATE:
+                tbSevenStatus = tbseven::STATUS_INDETERMINATE;
+                break;
+            case Taskbar::STATUS_NORMAL:
+                tbSevenStatus = tbseven::STATUS_NORMAL;
+                break;
+            case Taskbar::STATUS_ERROR:
+                tbSevenStatus = tbseven::STATUS_ERROR;
+                break;
+            case Taskbar::STATUS_PAUSED:
+                tbSevenStatus = tbseven::STATUS_PAUSED;
+                break;
+        }
+
+        setStatus_(assocWindow, tbSevenStatus);
+    }
+
+    void setProgress(double fraction)
+    {
+        setProgress_(assocWindow, fraction * 100000, 100000);
+    }
+
+private:
+    void* assocWindow; //HWND
+    const DllFun<SetStatusFct>   setStatus_;
+    const DllFun<SetProgressFct> setProgress_;
+};
+
+#elif defined HAVE_UBUNTU_UNITY //Ubuntu unity
+namespace
+{
+const char FFS_DESKTOP_FILE[] = "freefilesync.desktop";
+}
+
+class Taskbar::Pimpl //throw (TaskbarNotAvailable)
+{
+public:
+    Pimpl(const wxTopLevelWindow& window) :
+        tbEntry(unity_launcher_entry_get_for_desktop_id(FFS_DESKTOP_FILE))
+        //tbEntry(unity_launcher_entry_get_for_app_uri("application://freefilesync.desktop"))
+    {
+        if (!tbEntry)
+            throw TaskbarNotAvailable();
+    }
+
+    ~Pimpl() { setStatus(STATUS_NOPROGRESS); } //it seems UnityLauncherEntry* does not need destruction
+
+    void setStatus(Status status)
+    {
+        switch (status)
+        {
+            case Taskbar::STATUS_ERROR:
+                unity_launcher_entry_set_urgent(tbEntry, true);
+                break;
+
+            case Taskbar::STATUS_NOPROGRESS:
+            case Taskbar::STATUS_INDETERMINATE:
+                unity_launcher_entry_set_urgent(tbEntry, false);
+                unity_launcher_entry_set_progress_visible(tbEntry, false);
+                break;
+
+            case Taskbar::STATUS_NORMAL:
+                unity_launcher_entry_set_urgent(tbEntry, false);
+                unity_launcher_entry_set_progress_visible(tbEntry, true);
+                break;
+
+            case Taskbar::STATUS_PAUSED:
+                unity_launcher_entry_set_urgent (tbEntry, false);
+                break;
+        }
+    }
+
+    void setProgress(double fraction)
+    {
+        unity_launcher_entry_set_progress(tbEntry, fraction);
+    }
+
+private:
+    UnityLauncherEntry* tbEntry;
+};
+
+
+#else //no taskbar support yet
+class Taskbar::Pimpl
+{
+public:
+    Pimpl(const wxTopLevelWindow& window) { throw TaskbarNotAvailable(); }
+    void setStatus(Status status) {}
+    void setProgress(double fraction) {}
+
+};
+#endif
+
+
+//########################################################################################################
+Taskbar::Taskbar(const wxTopLevelWindow& window) : pimpl_(new Pimpl(window)) {} //throw TaskbarNotAvailable
+Taskbar::~Taskbar() {} //std::unique_ptr ...
+
+void Taskbar::setStatus(Status status) { pimpl_->setStatus(status); }
+void Taskbar::setProgress(double fraction) { pimpl_->setProgress(fraction); }
diff --git a/ui/taskbar.h b/ui/taskbar.h
new file mode 100644
index 00000000..d34dae30
--- /dev/null
+++ b/ui/taskbar.h
@@ -0,0 +1,52 @@
+// **************************************************************************
+// * This file is part of the FreeFileSync project. It is distributed under *
+// * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
+// * Copyright (C) 2008-2011 ZenJu (zhnmju123 AT gmx.de)                    *
+// **************************************************************************
+
+#ifndef TASKBARPROGRESS_H_INCLUDED
+#define TASKBARPROGRESS_H_INCLUDED
+
+#include <memory>
+#include <wx/toplevel.h>
+
+/*
+Windows 7; show progress in windows superbar via ITaskbarList3 Interface (http://msdn.microsoft.com/en-us/library/dd391692(VS.85).aspx)
+
+Ubuntu: use Unity interface (optional)
+
+Define HAVE_UBUNTU_UNITY and set:
+    Compiler flag: `pkg-config --cflags unity`
+    Linker   flag: `pkg-config --libs unity`
+*/
+
+namespace zen
+{
+class TaskbarNotAvailable {};
+
+class Taskbar
+{
+public:
+    Taskbar(const wxTopLevelWindow& window); //throw TaskbarNotAvailable()
+    ~Taskbar();
+
+    enum Status
+    {
+        STATUS_NOPROGRESS,
+        STATUS_INDETERMINATE,
+        STATUS_NORMAL,
+        STATUS_ERROR,
+        STATUS_PAUSED
+    };
+
+    void setStatus(Status status);
+    void setProgress(double fraction); //between [0, 1]
+
+private:
+    class Pimpl;
+    std::unique_ptr<Pimpl> pimpl_;
+};
+
+}
+
+#endif // TASKBARPROGRESS_H_INCLUDED
diff --git a/ui/tray_icon.cpp b/ui/tray_icon.cpp
index 96ae47e6..5e3fa5cb 100644
--- a/ui/tray_icon.cpp
+++ b/ui/tray_icon.cpp
@@ -5,15 +5,14 @@
 // **************************************************************************
 
 #include "tray_icon.h"
-#include "../library/resources.h"
+#include "../lib/resources.h"
 #include "small_dlgs.h"
-#include "../shared/i18n.h"
 #include <wx/taskbar.h>
 #include <cmath>
 #include <wx/image.h>
 #include <wx/menu.h>
 #include <wx/icon.h> //req. by Linux
-#include "../shared/image_tools.h"
+#include <wx+/image_tools.h>
 
 
 const wxEventType FFS_REQUEST_RESUME_TRAY_EVENT = wxNewEventType();
diff --git a/ui/wx_form_build_hide_warnings.h b/ui/wx_form_build_hide_warnings.h
new file mode 100644
index 00000000..277fa0e7
--- /dev/null
+++ b/ui/wx_form_build_hide_warnings.h
@@ -0,0 +1,16 @@
+// **************************************************************************
+// * This file is part of the FreeFileSync project. It is distributed under *
+// * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
+// * Copyright (C) 2008-2011 ZenJu (zhnmju123 AT gmx.de)                    *
+// **************************************************************************
+
+#ifndef WX_FORM_BUILD_230948324234234
+#define WX_FORM_BUILD_230948324234234
+
+//hide compiler warnings in generated code
+
+#ifdef __GNUC__
+#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
+#endif
+
+#endif //WX_FORM_BUILD_230948324234234