3.16

27 files changed, 6137 insertions, 5484 deletions

diff --git a/BUILD/Changelog.txt b/BUILD/Changelog.txt
index 241f7a11..48e4ccf2 100644
--- a/BUILD/Changelog.txt
+++ b/BUILD/Changelog.txt
@@ -2,6 +2,12 @@
 |FreeFileSync|
 --------------
 
+Changelog v3.16
+---------------
+Fixed file copy issues on SAMBA shares
+Small GUI fixes
+
+
 Changelog v3.15
 ---------------
 Overwriting a file as fully transactional operation
@@ -12,7 +18,7 @@ Copy NTFS compressed and encrypted directory attributes
 Copy NTFS alternate data stream
 Improved performance: CSV export, copy to clipboard, sync log display
 Improved color theme support
-Fixed crash on certain system text colors settings
+Fixed crash on certain system text color settings
 Fixed progress numbers for manual deletion
 Allow aborting manual deletion via escape key
 Use relative name for file tooltip
diff --git a/BUILD/Help/html/advanced/VariableDrive.html b/BUILD/Help/html/advanced/VariableDrive.html
index 136b727f..c9232acb 100644
--- a/BUILD/Help/html/advanced/VariableDrive.html
+++ b/BUILD/Help/html/advanced/VariableDrive.html
@@ -5,7 +5,7 @@
 	<TITLE></TITLE>
 	<META NAME="GENERATOR" CONTENT="OpenOffice.org 3.2  (Win32)">
 	<META NAME="CREATED" CONTENT="20091206;16574000">
-	<META NAME="CHANGED" CONTENT="20110417;19142800">
+	<META NAME="CHANGED" CONTENT="20110419;15293700">
 	<STYLE TYPE="text/css">
 	<!--
 		@page { margin: 2cm }
@@ -29,34 +29,45 @@ distinct computers. FreeFileSync offers two solutions to handle this
 issue:</FONT></P>
 <P STYLE="margin-bottom: 0cm"><BR>
 </P>
-<OL>
-	<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Specify
-	a directory via volume name: Syntax: [&lt;volume name&gt;]\&lt;path&gt;</FONT></P>
-	<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Example:
-	Use &quot;</FONT><FONT FACE="Courier New, monospace">[ZenJu-USB]\directory</FONT><FONT FACE="Tahoma, sans-serif">&quot;
-	instead of &quot;</FONT><FONT FACE="Courier New, monospace">E:\directory</FONT><FONT FACE="Tahoma, sans-serif">&quot;
-	where &quot;</FONT><FONT FACE="Courier New, monospace">ZenJu-USB</FONT><FONT FACE="Tahoma, sans-serif">&quot;
-	is the name of the USB stick.</FONT></P>
-</OL>
+<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Option
+1</B><B>: </B>Specify a directory via volume name: Syntax: [&lt;volume
+name&gt;]\&lt;path&gt;</FONT></P>
+<UL>
+	<P><SPAN ID="Rahmen1" DIR="LTR" STYLE="float: left; width: 80%; height: 0.14cm; border: none; padding: 0cm; background: #e6e6e6">
+		<UL>
+			<P ALIGN=LEFT STYLE="margin-right: 0.98cm; margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Use
+			&quot;<FONT FACE="Courier New, monospace">[ZenJu-USB]\directory</FONT>&quot;
+			instead of &quot;<FONT FACE="Courier New, monospace">E:\directory</FONT>&quot;
+			where &quot;<FONT FACE="Courier New, monospace">ZenJu-USB</FONT>&quot;
+			is the name of the USB stick.</FONT></P>
+		</UL>
+	</SPAN><BR CLEAR=LEFT>
+	</P>
+</UL>
 <P STYLE="margin-bottom: 0cm"><BR>
 </P>
-<OL START=2>
-	<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Use
-	a relative directory name:</FONT></P>
-</OL>
+<P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif"><B>Option
+2</B></FONT><FONT FACE="Tahoma, sans-serif"><B>: </B></FONT><FONT FACE="Tahoma, sans-serif">Use
+a relative directory name:</FONT></P>
 <UL>
-	<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Example:
-	Use &quot;</FONT><FONT FACE="Courier New, monospace">\directory</FONT><FONT FACE="Tahoma, sans-serif">&quot;
-	instead of &quot;</FONT><FONT FACE="Courier New, monospace">E:\directory</FONT><FONT FACE="Tahoma, sans-serif">&quot;</FONT></P>
-	<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Save
-	and copy synchronization settings to the USB stick:
-	&quot;</FONT><FONT COLOR="#000000"><FONT FACE="Courier New, monospace"><FONT SIZE=3>E:\settings.ffs_gui&quot;</FONT></FONT></FONT></P>
-	<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Start
-	FreeFileSync by double-clicking on &quot;</FONT><FONT FACE="Courier New, monospace">E:\settings.ffs_gui</FONT><FONT FACE="Tahoma, sans-serif">&quot;<BR>=&gt;
-	Working directory is automatically set to &quot;</FONT><FONT FACE="Courier New, monospace">E:\</FONT><FONT FACE="Tahoma, sans-serif">&quot;
-	by the operating system so that &quot;</FONT><FONT FACE="Courier New, monospace">\directory</FONT><FONT FACE="Tahoma, sans-serif">&quot;
-	is resolved  as &quot;</FONT><FONT FACE="Courier New, monospace">E:\directory</FONT><FONT FACE="Tahoma, sans-serif">&quot;
-	during synchronization.</FONT></P>
+	<P><SPAN ID="Rahmen2" DIR="LTR" STYLE="float: left; width: 80%; height: 0.14cm; border: none; padding: 0cm; background: #e6e6e6">
+		<UL>
+			<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Use
+			&quot;</FONT><FONT FACE="Courier New, monospace">\directory</FONT><FONT FACE="Tahoma, sans-serif">&quot;
+			instead of &quot;</FONT><FONT FACE="Courier New, monospace">E:\directory</FONT><FONT FACE="Tahoma, sans-serif">&quot;</FONT></P>
+			<LI><P STYLE="margin-bottom: 0cm"><FONT FACE="Tahoma, sans-serif">Save
+			and copy synchronization settings to the USB stick:
+			&quot;</FONT><FONT COLOR="#000000"><FONT FACE="Courier New, monospace"><FONT SIZE=3>E:\settings.ffs_gui&quot;</FONT></FONT></FONT></P>
+			<LI><P ALIGN=LEFT STYLE="margin-right: 0.98cm; margin-bottom: 0cm">
+			<FONT FACE="Tahoma, sans-serif">Start FreeFileSync by
+			double-clicking on &quot;<FONT FACE="Courier New, monospace">E:\settings.ffs_gui</FONT>&quot;<BR>&rarr;
+			Working directory is automatically set to &quot;<FONT FACE="Courier New, monospace">E:\</FONT>&quot;
+			by the operating system so that &quot;<FONT FACE="Courier New, monospace">\directory</FONT>&quot;
+			is resolved as &quot;<FONT FACE="Courier New, monospace">E:\directory</FONT>&quot;
+			during synchronization.</FONT></P>
+		</UL>
+	</SPAN><BR CLEAR=LEFT>
+	</P>
 </UL>
 </BODY>
 </HTML>
\ No newline at end of file
diff --git a/BUILD/Resources.dat b/BUILD/Resources.dat
index 9382ac74..45661da2 100644
--- a/BUILD/Resources.dat
+++ b/BUILD/Resources.dat
diff --git a/RealtimeSync/gui_generated.cpp b/RealtimeSync/gui_generated.cpp
index 5a4f7f13..13f789f7 100644
--- a/RealtimeSync/gui_generated.cpp
+++ b/RealtimeSync/gui_generated.cpp
@@ -14,228 +14,228 @@
 
 MainDlgGenerated::MainDlgGenerated( 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( 420,440 ), wxDefaultSize );
-	
-	m_menubar1 = new wxMenuBar( 0 );
-	m_menuFile = new wxMenu();
-	wxMenuItem* m_menuItem14;
-	m_menuItem14 = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("S&ave configuration...") ) + wxT('\t') + wxT("CTRL-S"), wxEmptyString, wxITEM_NORMAL );
-	m_menuFile->Append( m_menuItem14 );
-	
-	wxMenuItem* m_menuItem13;
-	m_menuItem13 = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("&Load configuration...") ) + wxT('\t') + wxT("CTRL-L"), wxEmptyString, wxITEM_NORMAL );
-	m_menuFile->Append( m_menuItem13 );
-	
-	wxMenuItem* m_separator1;
-	m_separator1 = m_menuFile->AppendSeparator();
-	
-	wxMenuItem* m_menuItem4;
-	m_menuItem4 = new wxMenuItem( m_menuFile, wxID_EXIT, wxString( _("&Quit") ) + wxT('\t') + wxT("CTRL-Q"), wxEmptyString, wxITEM_NORMAL );
-	m_menuFile->Append( m_menuItem4 );
-	
-	m_menubar1->Append( m_menuFile, _("&File") ); 
-	
-	m_menuHelp = new wxMenu();
-	wxMenuItem* m_menuItemContent;
-	m_menuItemContent = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("&Content") ) + wxT('\t') + wxT("F1"), wxEmptyString, wxITEM_NORMAL );
-	m_menuHelp->Append( m_menuItemContent );
-	
-	wxMenuItem* m_separator2;
-	m_separator2 = 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 );
-	
-	bSizerMain = new wxBoxSizer( wxVERTICAL );
-	
-	m_panelMain = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer1;
-	bSizer1 = new wxBoxSizer( wxVERTICAL );
-	
-	
-	bSizer1->Add( 0, 10, 0, 0, 5 );
-	
-	wxStaticBoxSizer* sbSizer41;
-	sbSizer41 = new wxStaticBoxSizer( new wxStaticBox( m_panelMain, wxID_ANY, wxEmptyString ), wxVERTICAL );
-	
-	m_staticText2 = new wxStaticText( m_panelMain, wxID_ANY, _("Usage:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText2->Wrap( -1 );
-	m_staticText2->SetFont( wxFont( 10, 74, 90, 90, true, wxEmptyString ) );
-	
-	sbSizer41->Add( m_staticText2, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	m_staticText3 = new wxStaticText( m_panelMain, wxID_ANY, _("1. Select directories to monitor."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText3->Wrap( -1 );
-	sbSizer41->Add( m_staticText3, 0, wxLEFT, 10 );
-	
-	m_staticText4 = new wxStaticText( m_panelMain, wxID_ANY, _("2. Enter a command line."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText4->Wrap( -1 );
-	sbSizer41->Add( m_staticText4, 0, wxLEFT, 10 );
-	
-	m_staticText5 = new wxStaticText( m_panelMain, wxID_ANY, _("3. Press 'Start'."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText5->Wrap( -1 );
-	sbSizer41->Add( m_staticText5, 0, wxLEFT, 10 );
-	
-	m_staticline3 = new wxStaticLine( m_panelMain, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	sbSizer41->Add( m_staticline3, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
-	
-	m_staticText21 = new wxStaticText( m_panelMain, wxID_ANY, _("The command line is executed each time:\n- all directories become available (e.g. USB stick insert)\n- files within these directories or subdirectories are modified"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText21->Wrap( -1 );
-	sbSizer41->Add( m_staticText21, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 );
-	
-	bSizer1->Add( sbSizer41, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT|wxEXPAND, 40 );
-	
-	m_staticline2 = new wxStaticLine( m_panelMain, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer1->Add( m_staticline2, 0, wxTOP|wxBOTTOM|wxEXPAND, 10 );
-	
-	wxBoxSizer* bSizer8;
-	bSizer8 = new wxBoxSizer( wxVERTICAL );
-	
-	sbSizerDirToWatch = new wxStaticBoxSizer( new wxStaticBox( m_panelMain, wxID_ANY, _("Directories to watch") ), wxVERTICAL );
-	
-	m_panelMainFolder = new wxPanel( m_panelMain, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer114;
-	bSizer114 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer781;
-	bSizer781 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bpButtonAddFolder = new wxBitmapButton( m_panelMainFolder, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
-	m_bpButtonAddFolder->SetToolTip( _("Add folder") );
-	
-	bSizer781->Add( m_bpButtonAddFolder, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonRemoveTopFolder = new wxBitmapButton( m_panelMainFolder, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
-	m_bpButtonRemoveTopFolder->SetToolTip( _("Remove folder") );
-	
-	bSizer781->Add( m_bpButtonRemoveTopFolder, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer114->Add( bSizer781, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_txtCtrlDirectoryMain = new wxTextCtrl( m_panelMainFolder, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer114->Add( m_txtCtrlDirectoryMain, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_dirPickerMain = new FfsDirPickerCtrl( m_panelMainFolder, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_dirPickerMain->SetToolTip( _("Select a folder") );
-	
-	bSizer114->Add( m_dirPickerMain, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_panelMainFolder->SetSizer( bSizer114 );
-	m_panelMainFolder->Layout();
-	bSizer114->Fit( m_panelMainFolder );
-	sbSizerDirToWatch->Add( m_panelMainFolder, 0, wxEXPAND, 5 );
-	
-	m_scrolledWinFolders = new wxScrolledWindow( m_panelMain, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
-	m_scrolledWinFolders->SetScrollRate( 5, 5 );
-	bSizerFolders = new wxBoxSizer( wxVERTICAL );
-	
-	m_scrolledWinFolders->SetSizer( bSizerFolders );
-	m_scrolledWinFolders->Layout();
-	bSizerFolders->Fit( m_scrolledWinFolders );
-	sbSizerDirToWatch->Add( m_scrolledWinFolders, 0, wxEXPAND, 5 );
-	
-	bSizer8->Add( sbSizerDirToWatch, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	bSizer1->Add( bSizer8, 1, wxEXPAND, 5 );
-	
-	wxStaticBoxSizer* sbSizer3;
-	sbSizer3 = new wxStaticBoxSizer( new wxStaticBox( m_panelMain, wxID_ANY, _("Command line") ), wxVERTICAL );
-	
-	m_textCtrlCommand = new wxTextCtrl( m_panelMain, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	sbSizer3->Add( m_textCtrlCommand, 0, wxEXPAND|wxBOTTOM, 5 );
-	
-	bSizer1->Add( sbSizer3, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
-	
-	wxStaticBoxSizer* sbSizer4;
-	sbSizer4 = new wxStaticBoxSizer( new wxStaticBox( m_panelMain, wxID_ANY, _("Minimum Idle Time [seconds]") ), wxVERTICAL );
-	
-	m_spinCtrlDelay = new wxSpinCtrl( m_panelMain, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
-	m_spinCtrlDelay->SetToolTip( _("Idle time between detection of last change and execution of command line in seconds") );
-	
-	sbSizer4->Add( m_spinCtrlDelay, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	bSizer1->Add( sbSizer4, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
-	
-	m_staticline1 = new wxStaticLine( m_panelMain, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer1->Add( m_staticline1, 0, wxEXPAND|wxTOP|wxBOTTOM, 10 );
-	
-	m_buttonStart = new wxButtonWithImage( m_panelMain, wxID_ANY, _("Start"), wxDefaultPosition, wxSize( -1,40 ), 0 );
-	m_buttonStart->SetDefault(); 
-	m_buttonStart->SetFont( wxFont( 14, 74, 90, 92, false, wxT("Arial Black") ) );
-	
-	bSizer1->Add( m_buttonStart, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_buttonCancel = new wxButton( m_panelMain, wxID_CANCEL, _("dummy"), wxDefaultPosition, wxSize( 0,0 ), 0 );
-	bSizer1->Add( m_buttonCancel, 0, 0, 5 );
-	
-	m_panelMain->SetSizer( bSizer1 );
-	m_panelMain->Layout();
-	bSizer1->Fit( m_panelMain );
-	bSizerMain->Add( m_panelMain, 1, wxEXPAND, 5 );
-	
-	this->SetSizer( bSizerMain );
-	this->Layout();
-	bSizerMain->Fit( this );
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainDlgGenerated::OnClose ) );
-	this->Connect( m_menuItem14->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDlgGenerated::OnSaveConfig ) );
-	this->Connect( m_menuItem13->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDlgGenerated::OnLoadConfig ) );
-	this->Connect( m_menuItem4->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDlgGenerated::OnQuit ) );
-	this->Connect( m_menuItemContent->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDlgGenerated::OnShowHelp ) );
-	this->Connect( m_menuItemAbout->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDlgGenerated::OnMenuAbout ) );
-	m_bpButtonAddFolder->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDlgGenerated::OnAddFolder ), NULL, this );
-	m_bpButtonRemoveTopFolder->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDlgGenerated::OnRemoveTopFolder ), NULL, this );
-	m_buttonStart->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDlgGenerated::OnStart ), NULL, this );
-	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDlgGenerated::OnQuit ), NULL, this );
+    this->SetSizeHints( wxSize( 420,440 ), wxDefaultSize );
+
+    m_menubar1 = new wxMenuBar( 0 );
+    m_menuFile = new wxMenu();
+    wxMenuItem* m_menuItem14;
+    m_menuItem14 = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("S&ave configuration...") ) + wxT('\t') + wxT("CTRL-S"), wxEmptyString, wxITEM_NORMAL );
+    m_menuFile->Append( m_menuItem14 );
+
+    wxMenuItem* m_menuItem13;
+    m_menuItem13 = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("&Load configuration...") ) + wxT('\t') + wxT("CTRL-L"), wxEmptyString, wxITEM_NORMAL );
+    m_menuFile->Append( m_menuItem13 );
+
+    wxMenuItem* m_separator1;
+    m_separator1 = m_menuFile->AppendSeparator();
+
+    wxMenuItem* m_menuItem4;
+    m_menuItem4 = new wxMenuItem( m_menuFile, wxID_EXIT, wxString( _("&Quit") ) + wxT('\t') + wxT("CTRL-Q"), wxEmptyString, wxITEM_NORMAL );
+    m_menuFile->Append( m_menuItem4 );
+
+    m_menubar1->Append( m_menuFile, _("&File") );
+
+    m_menuHelp = new wxMenu();
+    wxMenuItem* m_menuItemContent;
+    m_menuItemContent = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("&Content") ) + wxT('\t') + wxT("F1"), wxEmptyString, wxITEM_NORMAL );
+    m_menuHelp->Append( m_menuItemContent );
+
+    wxMenuItem* m_separator2;
+    m_separator2 = 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 );
+
+    bSizerMain = new wxBoxSizer( wxVERTICAL );
+
+    m_panelMain = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer1;
+    bSizer1 = new wxBoxSizer( wxVERTICAL );
+
+
+    bSizer1->Add( 0, 10, 0, 0, 5 );
+
+    wxStaticBoxSizer* sbSizer41;
+    sbSizer41 = new wxStaticBoxSizer( new wxStaticBox( m_panelMain, wxID_ANY, wxEmptyString ), wxVERTICAL );
+
+    m_staticText2 = new wxStaticText( m_panelMain, wxID_ANY, _("Usage:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText2->Wrap( -1 );
+    m_staticText2->SetFont( wxFont( 10, 74, 90, 90, true, wxEmptyString ) );
+
+    sbSizer41->Add( m_staticText2, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+    m_staticText3 = new wxStaticText( m_panelMain, wxID_ANY, _("1. Select directories to monitor."), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText3->Wrap( -1 );
+    sbSizer41->Add( m_staticText3, 0, wxLEFT, 10 );
+
+    m_staticText4 = new wxStaticText( m_panelMain, wxID_ANY, _("2. Enter a command line."), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText4->Wrap( -1 );
+    sbSizer41->Add( m_staticText4, 0, wxLEFT, 10 );
+
+    m_staticText5 = new wxStaticText( m_panelMain, wxID_ANY, _("3. Press 'Start'."), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText5->Wrap( -1 );
+    sbSizer41->Add( m_staticText5, 0, wxLEFT, 10 );
+
+    m_staticline3 = new wxStaticLine( m_panelMain, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    sbSizer41->Add( m_staticline3, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
+
+    m_staticText21 = new wxStaticText( m_panelMain, wxID_ANY, _("The command line is executed each time:\n- all directories become available (e.g. USB stick insert)\n- files within these directories or subdirectories are modified"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText21->Wrap( -1 );
+    sbSizer41->Add( m_staticText21, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 );
+
+    bSizer1->Add( sbSizer41, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT|wxEXPAND, 40 );
+
+    m_staticline2 = new wxStaticLine( m_panelMain, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer1->Add( m_staticline2, 0, wxTOP|wxBOTTOM|wxEXPAND, 10 );
+
+    wxBoxSizer* bSizer8;
+    bSizer8 = new wxBoxSizer( wxVERTICAL );
+
+    sbSizerDirToWatch = new wxStaticBoxSizer( new wxStaticBox( m_panelMain, wxID_ANY, _("Directories to watch") ), wxVERTICAL );
+
+    m_panelMainFolder = new wxPanel( m_panelMain, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer114;
+    bSizer114 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer781;
+    bSizer781 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bpButtonAddFolder = new wxBitmapButton( m_panelMainFolder, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
+    m_bpButtonAddFolder->SetToolTip( _("Add folder") );
+
+    bSizer781->Add( m_bpButtonAddFolder, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonRemoveTopFolder = new wxBitmapButton( m_panelMainFolder, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
+    m_bpButtonRemoveTopFolder->SetToolTip( _("Remove folder") );
+
+    bSizer781->Add( m_bpButtonRemoveTopFolder, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer114->Add( bSizer781, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_txtCtrlDirectoryMain = new wxTextCtrl( m_panelMainFolder, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer114->Add( m_txtCtrlDirectoryMain, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_dirPickerMain = new FfsDirPickerCtrl( m_panelMainFolder, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_dirPickerMain->SetToolTip( _("Select a folder") );
+
+    bSizer114->Add( m_dirPickerMain, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_panelMainFolder->SetSizer( bSizer114 );
+    m_panelMainFolder->Layout();
+    bSizer114->Fit( m_panelMainFolder );
+    sbSizerDirToWatch->Add( m_panelMainFolder, 0, wxEXPAND, 5 );
+
+    m_scrolledWinFolders = new wxScrolledWindow( m_panelMain, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
+    m_scrolledWinFolders->SetScrollRate( 5, 5 );
+    bSizerFolders = new wxBoxSizer( wxVERTICAL );
+
+    m_scrolledWinFolders->SetSizer( bSizerFolders );
+    m_scrolledWinFolders->Layout();
+    bSizerFolders->Fit( m_scrolledWinFolders );
+    sbSizerDirToWatch->Add( m_scrolledWinFolders, 0, wxEXPAND, 5 );
+
+    bSizer8->Add( sbSizerDirToWatch, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+    bSizer1->Add( bSizer8, 1, wxEXPAND, 5 );
+
+    wxStaticBoxSizer* sbSizer3;
+    sbSizer3 = new wxStaticBoxSizer( new wxStaticBox( m_panelMain, wxID_ANY, _("Command line") ), wxVERTICAL );
+
+    m_textCtrlCommand = new wxTextCtrl( m_panelMain, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    sbSizer3->Add( m_textCtrlCommand, 0, wxEXPAND|wxBOTTOM, 5 );
+
+    bSizer1->Add( sbSizer3, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
+
+    wxStaticBoxSizer* sbSizer4;
+    sbSizer4 = new wxStaticBoxSizer( new wxStaticBox( m_panelMain, wxID_ANY, _("Minimum Idle Time [seconds]") ), wxVERTICAL );
+
+    m_spinCtrlDelay = new wxSpinCtrl( m_panelMain, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
+    m_spinCtrlDelay->SetToolTip( _("Idle time between detection of last change and execution of command line in seconds") );
+
+    sbSizer4->Add( m_spinCtrlDelay, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    bSizer1->Add( sbSizer4, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
+
+    m_staticline1 = new wxStaticLine( m_panelMain, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer1->Add( m_staticline1, 0, wxEXPAND|wxTOP|wxBOTTOM, 10 );
+
+    m_buttonStart = new wxButtonWithImage( m_panelMain, wxID_ANY, _("Start"), wxDefaultPosition, wxSize( -1,40 ), 0 );
+    m_buttonStart->SetDefault();
+    m_buttonStart->SetFont( wxFont( 14, 74, 90, 92, false, wxT("Arial Black") ) );
+
+    bSizer1->Add( m_buttonStart, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_buttonCancel = new wxButton( m_panelMain, wxID_CANCEL, _("dummy"), wxDefaultPosition, wxSize( 0,0 ), 0 );
+    bSizer1->Add( m_buttonCancel, 0, 0, 5 );
+
+    m_panelMain->SetSizer( bSizer1 );
+    m_panelMain->Layout();
+    bSizer1->Fit( m_panelMain );
+    bSizerMain->Add( m_panelMain, 1, wxEXPAND, 5 );
+
+    this->SetSizer( bSizerMain );
+    this->Layout();
+    bSizerMain->Fit( this );
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainDlgGenerated::OnClose ) );
+    this->Connect( m_menuItem14->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDlgGenerated::OnSaveConfig ) );
+    this->Connect( m_menuItem13->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDlgGenerated::OnLoadConfig ) );
+    this->Connect( m_menuItem4->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDlgGenerated::OnQuit ) );
+    this->Connect( m_menuItemContent->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDlgGenerated::OnShowHelp ) );
+    this->Connect( m_menuItemAbout->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDlgGenerated::OnMenuAbout ) );
+    m_bpButtonAddFolder->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDlgGenerated::OnAddFolder ), NULL, this );
+    m_bpButtonRemoveTopFolder->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDlgGenerated::OnRemoveTopFolder ), NULL, this );
+    m_buttonStart->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDlgGenerated::OnStart ), NULL, this );
+    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDlgGenerated::OnQuit ), NULL, this );
 }
 
 MainDlgGenerated::~MainDlgGenerated()
 {
-	// Disconnect Events
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainDlgGenerated::OnClose ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDlgGenerated::OnSaveConfig ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDlgGenerated::OnLoadConfig ) );
-	this->Disconnect( wxID_EXIT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDlgGenerated::OnQuit ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDlgGenerated::OnShowHelp ) );
-	this->Disconnect( wxID_ABOUT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDlgGenerated::OnMenuAbout ) );
-	m_bpButtonAddFolder->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDlgGenerated::OnAddFolder ), NULL, this );
-	m_bpButtonRemoveTopFolder->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDlgGenerated::OnRemoveTopFolder ), NULL, this );
-	m_buttonStart->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDlgGenerated::OnStart ), NULL, this );
-	m_buttonCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDlgGenerated::OnQuit ), NULL, this );
-	
+    // Disconnect Events
+    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainDlgGenerated::OnClose ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDlgGenerated::OnSaveConfig ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDlgGenerated::OnLoadConfig ) );
+    this->Disconnect( wxID_EXIT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDlgGenerated::OnQuit ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDlgGenerated::OnShowHelp ) );
+    this->Disconnect( wxID_ABOUT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDlgGenerated::OnMenuAbout ) );
+    m_bpButtonAddFolder->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDlgGenerated::OnAddFolder ), NULL, this );
+    m_bpButtonRemoveTopFolder->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDlgGenerated::OnRemoveTopFolder ), NULL, this );
+    m_buttonStart->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDlgGenerated::OnStart ), NULL, this );
+    m_buttonCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDlgGenerated::OnQuit ), NULL, this );
+
 }
 
 FolderGenerated::FolderGenerated( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
 {
-	wxBoxSizer* bSizer114;
-	bSizer114 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bpButtonRemoveFolder = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
-	m_bpButtonRemoveFolder->SetToolTip( _("Remove folder") );
-	
-	bSizer114->Add( m_bpButtonRemoveFolder, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	wxBoxSizer* bSizer20;
-	bSizer20 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_txtCtrlDirectory = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer20->Add( m_txtCtrlDirectory, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_dirPicker = new FfsDirPickerCtrl( this, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_dirPicker->SetToolTip( _("Select a folder") );
-	
-	bSizer20->Add( m_dirPicker, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer114->Add( bSizer20, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	this->SetSizer( bSizer114 );
-	this->Layout();
-	bSizer114->Fit( this );
+    wxBoxSizer* bSizer114;
+    bSizer114 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bpButtonRemoveFolder = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
+    m_bpButtonRemoveFolder->SetToolTip( _("Remove folder") );
+
+    bSizer114->Add( m_bpButtonRemoveFolder, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    wxBoxSizer* bSizer20;
+    bSizer20 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_txtCtrlDirectory = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer20->Add( m_txtCtrlDirectory, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_dirPicker = new FfsDirPickerCtrl( this, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_dirPicker->SetToolTip( _("Select a folder") );
+
+    bSizer20->Add( m_dirPicker, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer114->Add( bSizer20, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    this->SetSizer( bSizer114 );
+    this->Layout();
+    bSizer114->Fit( this );
 }
 
 FolderGenerated::~FolderGenerated()
diff --git a/RealtimeSync/gui_generated.h b/RealtimeSync/gui_generated.h
index 75457f31..aee6a5e8 100644
--- a/RealtimeSync/gui_generated.h
+++ b/RealtimeSync/gui_generated.h
@@ -42,76 +42,76 @@ class wxButtonWithImage;
 ///////////////////////////////////////////////////////////////////////////////
 /// Class MainDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class MainDlgGenerated : public wxFrame 
+class MainDlgGenerated : public wxFrame
 {
-	private:
-	
-	protected:
-		wxMenuBar* m_menubar1;
-		wxMenu* m_menuFile;
-		wxMenu* m_menuHelp;
-		wxMenuItem* m_menuItemAbout;
-		wxBoxSizer* bSizerMain;
-		wxPanel* m_panelMain;
-		
-		wxStaticText* m_staticText2;
-		wxStaticText* m_staticText3;
-		wxStaticText* m_staticText4;
-		wxStaticText* m_staticText5;
-		wxStaticLine* m_staticline3;
-		wxStaticText* m_staticText21;
-		wxStaticLine* m_staticline2;
-		wxStaticBoxSizer* sbSizerDirToWatch;
-		wxPanel* m_panelMainFolder;
-		wxBitmapButton* m_bpButtonAddFolder;
-		wxBitmapButton* m_bpButtonRemoveTopFolder;
-		wxTextCtrl* m_txtCtrlDirectoryMain;
-		wxScrolledWindow* m_scrolledWinFolders;
-		wxBoxSizer* bSizerFolders;
-		wxTextCtrl* m_textCtrlCommand;
-		wxSpinCtrl* m_spinCtrlDelay;
-		wxStaticLine* m_staticline1;
-		wxButtonWithImage* m_buttonStart;
-		wxButton* m_buttonCancel;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnSaveConfig( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnLoadConfig( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnQuit( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnShowHelp( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnMenuAbout( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnAddFolder( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnRemoveTopFolder( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnStart( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		FfsDirPickerCtrl* m_dirPickerMain;
-		
-		MainDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("RealtimeSync - Automated Synchronization"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
-		
-		~MainDlgGenerated();
-	
+private:
+
+protected:
+    wxMenuBar* m_menubar1;
+    wxMenu* m_menuFile;
+    wxMenu* m_menuHelp;
+    wxMenuItem* m_menuItemAbout;
+    wxBoxSizer* bSizerMain;
+    wxPanel* m_panelMain;
+
+    wxStaticText* m_staticText2;
+    wxStaticText* m_staticText3;
+    wxStaticText* m_staticText4;
+    wxStaticText* m_staticText5;
+    wxStaticLine* m_staticline3;
+    wxStaticText* m_staticText21;
+    wxStaticLine* m_staticline2;
+    wxStaticBoxSizer* sbSizerDirToWatch;
+    wxPanel* m_panelMainFolder;
+    wxBitmapButton* m_bpButtonAddFolder;
+    wxBitmapButton* m_bpButtonRemoveTopFolder;
+    wxTextCtrl* m_txtCtrlDirectoryMain;
+    wxScrolledWindow* m_scrolledWinFolders;
+    wxBoxSizer* bSizerFolders;
+    wxTextCtrl* m_textCtrlCommand;
+    wxSpinCtrl* m_spinCtrlDelay;
+    wxStaticLine* m_staticline1;
+    wxButtonWithImage* m_buttonStart;
+    wxButton* m_buttonCancel;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void OnSaveConfig( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnLoadConfig( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnQuit( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnShowHelp( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnMenuAbout( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnAddFolder( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnRemoveTopFolder( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnStart( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+    FfsDirPickerCtrl* m_dirPickerMain;
+
+    MainDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("RealtimeSync - Automated Synchronization"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
+
+    ~MainDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class FolderGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class FolderGenerated : public wxPanel 
+class FolderGenerated : public wxPanel
 {
-	private:
-	
-	protected:
-	
-	public:
-		wxBitmapButton* m_bpButtonRemoveFolder;
-		wxTextCtrl* m_txtCtrlDirectory;
-		FfsDirPickerCtrl* m_dirPicker;
-		
-		FolderGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL ); 
-		~FolderGenerated();
-	
+private:
+
+protected:
+
+public:
+    wxBitmapButton* m_bpButtonRemoveFolder;
+    wxTextCtrl* m_txtCtrlDirectory;
+    FfsDirPickerCtrl* m_dirPicker;
+
+    FolderGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );
+    ~FolderGenerated();
+
 };
 
 #endif //__gui_generated__
diff --git a/RealtimeSync/notify.cpp b/RealtimeSync/notify.cpp
index 9f1398ed..62c80940 100644
--- a/RealtimeSync/notify.cpp
+++ b/RealtimeSync/notify.cpp
@@ -198,7 +198,7 @@ public:
                 if (hNotfication == NULL)
                 {
                     const DWORD lastError = ::GetLastError();
-                    if (lastError != ERROR_CALL_NOT_IMPLEMENTED && //fail on SAMBA share: this shouldn't be a showstopper!
+                    if (lastError != ERROR_CALL_NOT_IMPLEMENTED   && //fail on SAMBA share: this shouldn't be a showstopper!
                         lastError != ERROR_SERVICE_SPECIFIC_ERROR && //neither should be fail for "Pogoplug" mapped network drives
                         lastError != ERROR_INVALID_DATA)             //this seems to happen for a NetDrive-mapped FTP server
                         throw ffs3::FileError(wxString(wxT("Could not register device removal notifications:")) + wxT("\n\n") + ffs3::getLastErrorFormatted(lastError));
diff --git a/RealtimeSync/watcher.cpp b/RealtimeSync/watcher.cpp
index ef43d8d9..a8b703a6 100644
--- a/RealtimeSync/watcher.cpp
+++ b/RealtimeSync/watcher.cpp
@@ -181,7 +181,7 @@ rts::WaitResult rts::waitForChanges(const std::vector<Zstring>& dirNames, WaitCa
 
 
     if (dirNames.empty()) //pathological case, but check is needed nevertheless
-        throw ffs3::FileError(_("At least one directory input field is empty."));
+        throw ffs3::FileError(_("A directory input field is empty."));
 
     //detect when volumes are removed/are not available anymore
     WatchDirectories dirWatcher;
@@ -195,7 +195,7 @@ rts::WaitResult rts::waitForChanges(const std::vector<Zstring>& dirNames, WaitCa
         const Zstring formattedDir = ffs3::getFormattedDirectoryName(*i);
 
         if (formattedDir.empty())
-            throw ffs3::FileError(_("At least one directory input field is empty."));
+            throw ffs3::FileError(_("A directory input field is empty."));
 
         dirWatcher.addForMonitoring(formattedDir);
 
@@ -222,7 +222,7 @@ rts::WaitResult rts::waitForChanges(const std::vector<Zstring>& dirNames, WaitCa
     }
 
     if (changeNotifications->size() == 0)
-        throw ffs3::FileError(_("At least one directory input field is empty."));
+        throw ffs3::FileError(_("A directory input field is empty."));
 
 
     //detect user request for device removal (e.g. usb stick)
@@ -302,7 +302,7 @@ rts::WaitResult rts::waitForChanges(const std::vector<Zstring>& dirNames, WaitCa
         const Zstring formattedDir = ffs3::getFormattedDirectoryName(*i);
 
         if (formattedDir.empty())
-            throw ffs3::FileError(_("At least one directory input field is empty."));
+            throw ffs3::FileError(_("A directory input field is empty."));
 
         dirWatcher.addForMonitoring(formattedDir);
 
@@ -357,7 +357,7 @@ rts::WaitResult rts::waitForChanges(const std::vector<Zstring>& dirNames, WaitCa
 
 
         if (notifications.GetWatchCount() == 0)
-            throw ffs3::FileError(_("At least one directory input field is empty."));
+            throw ffs3::FileError(_("A directory input field is empty."));
 
         while (true)
         {
@@ -402,11 +402,11 @@ void rts::waitForMissingDirs(const std::vector<Zstring>& dirNames, WaitCallback*
             bool allExisting = true;
             for (std::vector<Zstring>::const_iterator i = dirNames.begin(); i != dirNames.end(); ++i)
             {
-    //support specifying volume by name => call getFormattedDirectoryName() repeatedly
+                //support specifying volume by name => call getFormattedDirectoryName() repeatedly
                 const Zstring formattedDir = ffs3::getFormattedDirectoryName(*i);
 
                 if (formattedDir.empty())
-                    throw ffs3::FileError(_("At least one directory input field is empty."));
+                    throw ffs3::FileError(_("A directory input field is empty."));
 
                 if (!ffs3::dirExists(formattedDir))
                 {
diff --git a/algorithm.cpp b/algorithm.cpp
index 3248f726..e705e075 100644
--- a/algorithm.cpp
+++ b/algorithm.cpp
@@ -1057,22 +1057,22 @@ void ffs3::setActiveStatus(bool newStatus, ffs3::FileSystemObject& fsObj)
     fsObj.setActive(newStatus);
 
     //process subdirectories also!
-        struct Recurse: public FSObjectVisitor
+    struct Recurse: public FSObjectVisitor
+    {
+        Recurse(bool newStat) : newStatus_(newStat) {}
+        virtual void visit(const FileMapping& fileObj) {}
+        virtual void visit(const SymLinkMapping& linkObj) {}
+        virtual void visit(const DirMapping& dirObj)
         {
-            Recurse(bool newStat) : newStatus_(newStat) {}
-            virtual void visit(const FileMapping& fileObj) {}
-            virtual void visit(const SymLinkMapping& linkObj) {}
-            virtual void visit(const DirMapping& dirObj)
-            {
-                if (newStatus_)
-                    InOrExcludeAllRows<true>().execute(const_cast<DirMapping&>(dirObj)); //object is not physically const here anyway
-                else
-                    InOrExcludeAllRows<false>().execute(const_cast<DirMapping&>(dirObj)); //
-            }
-        private:
-            const bool newStatus_;
-        } recurse(newStatus);
-        fsObj.accept(recurse);
+            if (newStatus_)
+                InOrExcludeAllRows<true>().execute(const_cast<DirMapping&>(dirObj)); //object is not physically const here anyway
+            else
+                InOrExcludeAllRows<false>().execute(const_cast<DirMapping&>(dirObj)); //
+        }
+    private:
+        const bool newStatus_;
+    } recurse(newStatus);
+    fsObj.accept(recurse);
 }
 
 namespace
@@ -1260,9 +1260,9 @@ struct RemoveCallbackImpl : public ffs3::CallbackRemoveDir
 {
     RemoveCallbackImpl(DeleteFilesHandler& deleteCallback) : deleteCallback_(deleteCallback) {}
 
-    virtual void requestUiRefresh(const Zstring& currentObject)
+    virtual void notifyDeletion(const Zstring& currentObject)
     {
-        deleteCallback_.deletionSuccessful(0);
+        deleteCallback_.notifyDeletion(currentObject);
     }
 
 private:
@@ -1286,7 +1286,10 @@ void deleteFromGridAndHDOneSide(InputIterator first, InputIterator last,
                 if (!fsObj->isEmpty<side>()) //element may become implicitly delted, e.g. if parent folder was deleted first
                 {
                     if (useRecycleBin)
-                        ffs3::moveToRecycleBin(fsObj->getFullName<side>());  //throw (FileError)
+                    {
+                        if (ffs3::moveToRecycleBin(fsObj->getFullName<side>()))  //throw (FileError)
+                            statusHandler.notifyDeletion(fsObj->getFullName<side>());
+                    }
                     else
                     {
                         RemoveCallbackImpl removeCallback(statusHandler);
@@ -1294,11 +1297,12 @@ void deleteFromGridAndHDOneSide(InputIterator first, InputIterator last,
                         //del directories and symlinks
                         struct DeletePermanently : public FSObjectVisitor
                         {
-                            DeletePermanently(RemoveCallbackImpl* remCallback) : remCallback_(remCallback) {}
+                            DeletePermanently(RemoveCallbackImpl& remCallback) : remCallback_(remCallback) {}
 
                             virtual void visit(const FileMapping& fileObj)
                             {
-                                ffs3::removeFile(fileObj.getFullName<side>());
+                                if (ffs3::removeFile(fileObj.getFullName<side>()))
+                                    remCallback_.notifyDeletion(fileObj.getFullName<side>());
                             }
 
                             virtual void visit(const SymLinkMapping& linkObj)
@@ -1306,22 +1310,23 @@ void deleteFromGridAndHDOneSide(InputIterator first, InputIterator last,
                                 switch (linkObj.getLinkType<side>())
                                 {
                                     case LinkDescriptor::TYPE_DIR:
-                                        ffs3::removeDirectory(linkObj.getFullName<side>(), NULL);
+                                        ffs3::removeDirectory(linkObj.getFullName<side>(), &remCallback_);
                                         break;
                                     case LinkDescriptor::TYPE_FILE:
-                                        ffs3::removeFile(linkObj.getFullName<side>());
+                                        if (ffs3::removeFile(linkObj.getFullName<side>()))
+                                            remCallback_.notifyDeletion(linkObj.getFullName<side>());
                                         break;
                                 }
                             }
 
                             virtual void visit(const DirMapping& dirObj)
                             {
-                                ffs3::removeDirectory(dirObj.getFullName<side>(), remCallback_);
+                                ffs3::removeDirectory(dirObj.getFullName<side>(), &remCallback_);
                             }
 
                         private:
-                            RemoveCallbackImpl* remCallback_;
-                        } delPerm(&removeCallback);
+                            RemoveCallbackImpl& remCallback_;
+                        } delPerm(removeCallback);
                         fsObj->accept(delPerm);
                     }
 
@@ -1333,9 +1338,6 @@ void deleteFromGridAndHDOneSide(InputIterator first, InputIterator last,
                     else
                         setSyncDirectionRec(SYNC_DIR_LEFT, *fsObj);
                 }
-
-                //notify successful file/folder deletion: make sure [first, last) contains to be deleted entries only, to avoid miscalculation
-                statusHandler.deletionSuccessful(1);
                 break;
             }
             catch (const FileError& error)
diff --git a/algorithm.h b/algorithm.h
index 2e642f63..1d01f2b5 100644
--- a/algorithm.h
+++ b/algorithm.h
@@ -37,7 +37,7 @@ void setActiveStatus(bool newStatus, FileSystemObject& fsObj);     //activate or
 
 
 //manual deletion of files on main grid
-std::pair<wxString, int> deleteFromGridAndHDPreview(           //returns wxString with elements to be deleted and total count
+std::pair<wxString, int> deleteFromGridAndHDPreview(           //returns wxString with elements to be deleted and total count of selected(!) objects, NOT total files/dirs!
     const std::vector<FileSystemObject*>& rowsToDeleteOnLeft,  //all pointers need to be bound!
     const std::vector<FileSystemObject*>& rowsToDeleteOnRight, //
     const bool deleteOnBothSides);
@@ -56,8 +56,7 @@ public:
     virtual Response reportError(const wxString& errorMessage) = 0;
 
     //virtual void totalFilesToDelete(int objectsTotal) = 0; //informs about the total number of files to be deleted
-    virtual void deletionSuccessful(size_t deletedItems) = 0;  //called for each file/folder that has been deleted
-
+    virtual void notifyDeletion(const Zstring& currentObject) = 0; //called for each file/folder that has been deleted
 };
 void deleteFromGridAndHD(FolderComparison& folderCmp,                        //attention: rows will be physically deleted!
                          std::vector<FileSystemObject*>& rowsToDeleteOnLeft,  //refresh GUI grid after deletion to remove invalid rows
diff --git a/library/process_xml.h b/library/process_xml.h
index 589865a2..d627fc18 100644
--- a/library/process_xml.h
+++ b/library/process_xml.h
@@ -161,7 +161,7 @@ struct XmlGlobalSettings
         {
             //default external apps will be translated "on the fly"!!!
 #ifdef FFS_WIN
-            externelApplications.push_back(std::make_pair(wxT("Open with Explorer"), //mark for extraction: _("Open with Explorer")
+            externelApplications.push_back(std::make_pair(wxT("Show in Explorer"), //mark for extraction: _("Show in Explorer")
                                                           wxT("explorer /select, \"%name\"")));
             externelApplications.push_back(std::make_pair(wxT("Open with default application"), //mark for extraction: _("Open with default application")
                                                           wxT("cmd /c start \"\" \"%name\"")));
diff --git a/library/statistics.cpp b/library/statistics.cpp
index cb68d1de..d5cce670 100644
--- a/library/statistics.cpp
+++ b/library/statistics.cpp
@@ -144,7 +144,10 @@ void Statistics::addMeasurement(int objectsCurrent, double dataCurrent)
 
     //insert new record
     if (!measurements.empty())
-        measurements.insert(--measurements.end(), newEntry); //use fact that time is monotonously ascending
+        {
+			//assert(dataCurrent >= (--measurements.end())->second.data);
+			measurements.insert(--measurements.end(), newEntry); //use fact that time is monotonously ascending
+	}
     else
         measurements.insert(newEntry);
 
diff --git a/shared/dir_name.cpp b/shared/dir_name.cpp
index 3b0c3e82..977751f5 100644
--- a/shared/dir_name.cpp
+++ b/shared/dir_name.cpp
@@ -134,10 +134,10 @@ private:
 using ffs3::DirectoryNameMainDlg;
 
 DirectoryNameMainDlg::DirectoryNameMainDlg(wxWindow&         dropWindow1,
-    wxWindow&         dropWindow2,
-    wxDirPickerCtrl&  dirPicker,
-    wxComboBox&       dirName,
-    wxStaticBoxSizer& staticBox) :
+                                           wxWindow&         dropWindow2,
+                                           wxDirPickerCtrl&  dirPicker,
+                                           wxComboBox&       dirName,
+                                           wxStaticBoxSizer& staticBox) :
     dropWindow1_(dropWindow1),
     dropWindow2_(dropWindow2),
     dirPicker_(dirPicker),
@@ -216,7 +216,7 @@ using ffs3::DirectoryName;
 DirectoryName::DirectoryName(wxWindow&        dropWindow,
                              wxDirPickerCtrl& dirPicker,
                              wxTextCtrl&      dirName,
-                  wxStaticBoxSizer* staticBox) :
+                             wxStaticBoxSizer* staticBox) :
     dropWindow_(dropWindow),
     dirPicker_(dirPicker),
     dirName_(dirName),
diff --git a/shared/file_handling.cpp b/shared/file_handling.cpp
index 97c4d077..178fe26f 100644
--- a/shared/file_handling.cpp
+++ b/shared/file_handling.cpp
@@ -241,7 +241,7 @@ ffs3::ResponseSameVol ffs3::onSameVolume(const Zstring& folderLeft, const Zstrin
 }
 
 
-void ffs3::removeFile(const Zstring& filename) //throw (FileError);
+bool ffs3::removeFile(const Zstring& filename) //throw (FileError);
 {
 #ifdef FFS_WIN
     //remove file, support for \\?\-prefix
@@ -260,7 +260,7 @@ void ffs3::removeFile(const Zstring& filename) //throw (FileError);
 
             //now try again...
             if (::DeleteFile(filenameFmt.c_str()))
-                return;
+                return true;
         }
 #endif
         //eval error code before next call
@@ -270,10 +270,11 @@ void ffs3::removeFile(const Zstring& filename) //throw (FileError);
         //perf: place check in error handling block
         //warning: this call changes error code!!
         if (!somethingExists(filename))
-            return; //neither file nor any other object (e.g. broken symlink) with that name existing
+            return false; //neither file nor any other object (e.g. broken symlink) with that name existing
 
         throw FileError(errorMessage);
     }
+    return true;
 }
 
 
@@ -593,7 +594,7 @@ struct RemoveCallbackImpl : public ffs3::CallbackRemoveDir
         targetDir_(targetDir),
         moveCallback_(moveCallback) {}
 
-    virtual void requestUiRefresh(const Zstring& currentObject)
+    virtual void notifyDeletion(const Zstring& currentObject)
     {
         switch (moveCallback_.requestUiRefresh(sourceDir_))
         {
@@ -765,6 +766,7 @@ void ffs3::removeDirectory(const Zstring& directory, CallbackRemoveDir* callback
             wxString errorMessage = wxString(_("Error deleting directory:")) + wxT("\n\"") + zToWx(directory) + wxT("\"");
             throw FileError(errorMessage + wxT("\n\n") + ffs3::getLastErrorFormatted());
         }
+        if (callback) callback->notifyDeletion(directory); //once per symlink
         return;
     }
 
@@ -775,21 +777,16 @@ void ffs3::removeDirectory(const Zstring& directory, CallbackRemoveDir* callback
     FilesDirsOnlyTraverser traverser(fileList, dirList);
     ffs3::traverseFolder(directory, false, traverser); //don't follow symlinks
 
-
     //delete files
     for (std::vector<Zstring>::const_iterator i = fileList.begin(); i != fileList.end(); ++i)
     {
-        if (callback) callback->requestUiRefresh(*i); //call once per file
-        removeFile(*i);
+        const bool workDone = removeFile(*i);
+        if (callback && workDone) callback->notifyDeletion(*i); //call once per file
     }
 
     //delete directories recursively
     for (std::vector<Zstring>::const_iterator i = dirList.begin(); i != dirList.end(); ++i)
-    {
-        if (callback) callback->requestUiRefresh(*i); //and once per folder
         removeDirectory(*i, callback); //call recursively to correctly handle symbolic links
-    }
-
 
     //parent directory is deleted last
 #ifdef FFS_WIN
@@ -801,6 +798,7 @@ void ffs3::removeDirectory(const Zstring& directory, CallbackRemoveDir* callback
         wxString errorMessage = wxString(_("Error deleting directory:")) + wxT("\n\"") + zToWx(directory) + wxT("\"");
         throw FileError(errorMessage + wxT("\n\n") + ffs3::getLastErrorFormatted());
     }
+    if (callback) callback->notifyDeletion(directory); //and once per folder
 }
 
 
@@ -1557,7 +1555,10 @@ void rawCopyWinApi(const Zstring& sourceFile,
         }
 
         if (lastError == ERROR_PATH_NOT_FOUND)
+        {
+            guardTarget.Dismiss(); //not relevant
             throw ErrorTargetPathMissing(errorMessage);
+        }
 
         try //add more meaningful message
         {
@@ -1579,360 +1580,343 @@ void rawCopyWinApi(const Zstring& sourceFile,
 }
 
 
-void rawCopyWinOptimized(const Zstring& sourceFile,
-                         const Zstring& targetFile,
-                         CallbackCopyFile* callback) //throw (FileError: ErrorTargetPathMissing, ErrorTargetExisting, ErrorFileLocked)
-{
-    /*
-                BackupRead()	FileRead()		CopyFileEx()
-    			--------------------------------------------
-    Attributes  NO			    NO              YES
-    create time NO              NO              NO
-    ADS			YES				NO				YES
-    Encrypted	NO(silent fail)	NO				YES
-    Compressed	NO				NO				NO
-    Sparse		YES				NO				NO
-    PERF		    6% faster		            -
-
-    Mark stream as compressed: FSCTL_SET_COMPRESSION
-        compatible with: BackupRead() FileRead()
-    */
-
-    //open sourceFile for reading
-    HANDLE hFileIn = ::CreateFile(ffs3::applyLongPathPrefix(sourceFile).c_str(),
-                                  GENERIC_READ,
-                                  FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, //all shared modes are required to read files that are open in other applications
-                                  NULL,
-                                  OPEN_EXISTING,
-                                  FILE_FLAG_SEQUENTIAL_SCAN,
-                                  NULL);
-    if (hFileIn == INVALID_HANDLE_VALUE)
-    {
-        const DWORD lastError = ::GetLastError();
-        const wxString& errorMessage = wxString(_("Error opening file:")) + wxT("\n\"") + zToWx(sourceFile) + wxT("\"") + wxT("\n\n") + ffs3::getLastErrorFormatted(lastError);
-
-        //if file is locked (try to) use Windows Volume Shadow Copy Service
-        if (lastError == ERROR_SHARING_VIOLATION ||
-            lastError == ERROR_LOCK_VIOLATION)
-            throw ErrorFileLocked(errorMessage);
-
-        throw FileError(errorMessage);
-    }
-    Loki::ScopeGuard dummy1 = Loki::MakeGuard(::CloseHandle, hFileIn);
-    (void)dummy1; //silence warning "unused variable"
-
-
-    BY_HANDLE_FILE_INFORMATION infoFileIn = {};
-    if (!::GetFileInformationByHandle(hFileIn, &infoFileIn))
-    {
-        const wxString errorMessage = wxString(_("Error reading file attributes:")) + wxT("\n\"") + zToWx(sourceFile) + wxT("\"");
-        throw FileError(errorMessage + wxT("\n\n") + ffs3::getLastErrorFormatted());
-    }
-
-    const bool sourceIsCompressed = (infoFileIn.dwFileAttributes & FILE_ATTRIBUTE_COMPRESSED)  != 0;
-    const bool sourceIsSparse     = (infoFileIn.dwFileAttributes & FILE_ATTRIBUTE_SPARSE_FILE) != 0;
-    const bool sourceIsEncrypted  = (infoFileIn.dwFileAttributes & FILE_ATTRIBUTE_ENCRYPTED)   != 0;
-
-    bool targetSupportSparse     = false;
-    bool targetSupportCompressed = false;
-    bool targetSupportEncryption = false;
-
-    if (sourceIsCompressed || sourceIsSparse || sourceIsEncrypted)
-    {
-        DWORD fsFlags = 0;
-
-        {
-            const size_t bufferSize = std::max(targetFile.size(), static_cast<size_t>(10000));
-            boost::scoped_array<wchar_t> buffer(new wchar_t[bufferSize]);
-
-            //suprisingly slow: ca. 1.5 ms per call!
-            if (!::GetVolumePathName(targetFile.c_str(), //__in   LPCTSTR lpszFileName, -> seems to be no need for path prefix (check passed)
-                                     buffer.get(),       //__out  LPTSTR lpszVolumePathName,
-                                     static_cast<DWORD>(bufferSize))) //__in   DWORD cchBufferLength
-                throw FileError(wxString(_("Error reading file attributes:")) + wxT("\n\"") + zToWx(targetFile) + wxT("\"") +
-                                wxT("\n\n") + ffs3::getLastErrorFormatted() +
-                                wxT("\nFailed to determine volume name!"));
-
-            Zstring volumePath = buffer.get();
-            if (!volumePath.EndsWith(common::FILE_NAME_SEPARATOR))
-                volumePath += common::FILE_NAME_SEPARATOR;
-
-            //suprisingly fast: ca. 0.03 ms per call!
-            if (!::GetVolumeInformation(volumePath.c_str(), //__in_opt   LPCTSTR lpRootPathName,
-                                        NULL,               //__out      LPTSTR lpVolumeNameBuffer,
-                                        0,                  //__in       DWORD nVolumeNameSize,
-                                        NULL,               //__out_opt  LPDWORD lpVolumeSerialNumber,
-                                        NULL,               //__out_opt  LPDWORD lpMaximumComponentLength,
-                                        &fsFlags,           //__out_opt  LPDWORD lpFileSystemFlags,
-                                        NULL,               //__out      LPTSTR lpFileSystemNameBuffer,
-                                        0))                 //__in       DWORD nFileSystemNameSize
-                throw FileError(wxString(_("Error reading file attributes:")) + wxT("\n\"") + zToWx(volumePath) + wxT("\"") +
-                                wxT("\n\n") + ffs3::getLastErrorFormatted() +
-                                wxT("\nFailed to determine volume information!"));
-        }
-
-        targetSupportSparse     = (fsFlags & FILE_SUPPORTS_SPARSE_FILES) != 0;
-        targetSupportCompressed = (fsFlags & FILE_FILE_COMPRESSION     ) != 0;
-        targetSupportEncryption = (fsFlags & FILE_SUPPORTS_ENCRYPTION  ) != 0;
-    }
-
-    //####################################### DST hack ###########################################
-    if (dst::isFatDrive(sourceFile)) //throw()
-    {
-        const dst::RawTime rawTime(infoFileIn.ftCreationTime, infoFileIn.ftLastWriteTime);
-        if (dst::fatHasUtcEncoded(rawTime)) //throw (std::runtime_error)
-        {
-            infoFileIn.ftLastWriteTime = dst::fatDecodeUtcTime(rawTime); //return last write time in real UTC, throw (std::runtime_error)
-            ::GetSystemTimeAsFileTime(&infoFileIn.ftCreationTime);       //real creation time information is not available...
-        }
-    }
-
-    if (dst::isFatDrive(targetFile)) //throw()
-    {
-        const dst::RawTime encodedTime = dst::fatEncodeUtcTime(infoFileIn.ftLastWriteTime); //throw (std::runtime_error)
-        infoFileIn.ftCreationTime  = encodedTime.createTimeRaw;
-        infoFileIn.ftLastWriteTime = encodedTime.writeTimeRaw;
-    }
-    //####################################### DST hack ###########################################
-
-    const DWORD validAttribs = FILE_ATTRIBUTE_READONLY |
-                               FILE_ATTRIBUTE_HIDDEN   |
-                               FILE_ATTRIBUTE_SYSTEM   |
-                               FILE_ATTRIBUTE_ARCHIVE  |            //those two are not set properly (not worse than ::CopyFileEx())
-                               FILE_ATTRIBUTE_NOT_CONTENT_INDEXED | //
-                               (targetSupportEncryption ? FILE_ATTRIBUTE_ENCRYPTED : 0);
-
-    //create targetFile and open it for writing
-    HANDLE hFileOut = ::CreateFile(ffs3::applyLongPathPrefix(targetFile).c_str(),
-                                   GENERIC_READ | GENERIC_WRITE, //read access required for FSCTL_SET_COMPRESSION
-                                   FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
-                                   NULL,
-                                   CREATE_NEW,
-                                   (infoFileIn.dwFileAttributes & validAttribs) | FILE_FLAG_SEQUENTIAL_SCAN,
-                                   NULL);
-    if (hFileOut == INVALID_HANDLE_VALUE)
-    {
-        const DWORD lastError = ::GetLastError();
-        const wxString& errorMessage = wxString(_("Error writing file:")) + wxT("\n\"") + zToWx(targetFile) + wxT("\"") +
-                                       wxT("\n\n") + ffs3::getLastErrorFormatted(lastError);
-
-        if (lastError == ERROR_FILE_EXISTS)
-            throw ErrorTargetExisting(errorMessage);
-
-        if (lastError == ERROR_PATH_NOT_FOUND)
-            throw ErrorTargetPathMissing(errorMessage);
-
-        throw FileError(errorMessage);
-    }
-    Loki::ScopeGuard guardTarget = Loki::MakeGuard(&removeFile, targetFile); //transactional behavior: guard just after opening target and before managing hFileOut
-
-    Loki::ScopeGuard dummy = Loki::MakeGuard(::CloseHandle, hFileOut);
-    (void)dummy; //silence warning "unused variable"
-
-
-    const bool useBackupFun = !sourceIsEncrypted; //http://msdn.microsoft.com/en-us/library/aa362509(v=VS.85).aspx
-
-    if (sourceIsCompressed && targetSupportCompressed)
-    {
-        USHORT cmpState = COMPRESSION_FORMAT_DEFAULT;
-
-        DWORD bytesReturned = 0;
-        if (!DeviceIoControl(hFileOut,              //handle to file or directory
-                             FSCTL_SET_COMPRESSION, //dwIoControlCode
-                             &cmpState,             //input buffer
-                             sizeof(cmpState),      //size of input buffer
-                             NULL,                  //lpOutBuffer
-                             0,                     //OutBufferSize
-                             &bytesReturned,        //number of bytes returned
-                             NULL))                 //OVERLAPPED structure
-            throw FileError(wxString(_("Error writing file:")) + wxT("\n\"") + zToWx(targetFile) + wxT("\"") +
-                            wxT("\n\n") + ffs3::getLastErrorFormatted() +
-                            wxT("\nFailed to write NTFS compressed attribute!"));
-    }
-
-    //although it seems the sparse attribute is set automatically by BackupWrite, we are required to do this manually: http://support.microsoft.com/kb/271398/en-us
-    if (sourceIsSparse && targetSupportSparse)
-    {
-        if (useBackupFun)
-        {
-            DWORD bytesReturned = 0;
-            if (!DeviceIoControl(hFileOut,         //handle to file
-                                 FSCTL_SET_SPARSE, //dwIoControlCode
-                                 NULL,             //input buffer
-                                 0,                //size of input buffer
-                                 NULL,             //lpOutBuffer
-                                 0,                //OutBufferSize
-                                 &bytesReturned,   //number of bytes returned
-                                 NULL))            //OVERLAPPED structure
-                throw FileError(wxString(_("Error writing file:")) + wxT("\n\"") + zToWx(targetFile) + wxT("\"") +
-                                wxT("\n\n") + ffs3::getLastErrorFormatted() +
-                                wxT("\nFailed to write NTFS sparse attribute!"));
-        }
-    }
-
-
-    const DWORD BUFFER_SIZE = 512 * 1024; //512 kb seems to be a reasonable buffer size
-    static const boost::scoped_array<BYTE> memory(new BYTE[BUFFER_SIZE]);
-
-    struct ManageCtxt //manage context for BackupRead()/BackupWrite()
-    {
-        ManageCtxt() : read(NULL), write(NULL) {}
-        ~ManageCtxt()
-        {
-            if (read != NULL)
-                ::BackupRead (0, NULL, 0, NULL, true, false, &read);
-            if (write != NULL)
-                ::BackupWrite(0, NULL, 0, NULL, true, false, &write);
-        }
-
-        LPVOID read;
-        LPVOID write;
-    } context;
-
-    //copy contents of sourceFile to targetFile
-    wxULongLong totalBytesTransferred;
-
-    bool eof = false;
-    do
-    {
-        DWORD bytesRead = 0;
-
-        if (useBackupFun)
-        {
-            if (!::BackupRead(hFileIn,        //__in   HANDLE hFile,
-                              memory.get(),   //__out  LPBYTE lpBuffer,
-                              BUFFER_SIZE,    //__in   DWORD nNumberOfBytesToRead,
-                              &bytesRead,     //__out  LPDWORD lpNumberOfBytesRead,
-                              false,          //__in   BOOL bAbort,
-                              false,          //__in   BOOL bProcessSecurity,
-                              &context.read)) //__out  LPVOID *lpContext
-                throw FileError(wxString(_("Error reading file:")) + wxT("\n\"") + zToWx(sourceFile) + wxT("\"") +
-                                wxT("\n\n") + ffs3::getLastErrorFormatted());
-        }
-        else if (!::ReadFile(hFileIn,      //__in         HANDLE hFile,
-                             memory.get(), //__out        LPVOID lpBuffer,
-                             BUFFER_SIZE,  //__in         DWORD nNumberOfBytesToRead,
-                             &bytesRead,   //__out_opt    LPDWORD lpNumberOfBytesRead,
-                             NULL))        //__inout_opt  LPOVERLAPPED lpOverlapped
-            throw FileError(wxString(_("Error reading file:")) + wxT("\n\"") + zToWx(sourceFile) + wxT("\"") +
-                            wxT("\n\n") + ffs3::getLastErrorFormatted());
-
-        if (bytesRead > BUFFER_SIZE)
-            throw FileError(wxString(_("Error reading file:")) + wxT("\n\"") + zToWx(sourceFile) + wxT("\"") +
-                            wxT("\n\n") + wxT("buffer overflow"));
-
-        if (bytesRead < BUFFER_SIZE)
-            eof = true;
-
-        DWORD bytesWritten = 0;
-
-        if (useBackupFun)
-        {
-            if (!::BackupWrite(hFileOut,        //__in   HANDLE hFile,
-                               memory.get(),    //__in   LPBYTE lpBuffer,
-                               bytesRead,       //__in   DWORD nNumberOfBytesToWrite,
-                               &bytesWritten,   //__out  LPDWORD lpNumberOfBytesWritten,
-                               false,           //__in   BOOL bAbort,
-                               false,           //__in   BOOL bProcessSecurity,
-                               &context.write)) //__out  LPVOID *lpContext
-                throw FileError(wxString(_("Error writing file:")) + wxT("\n\"") + zToWx(targetFile) + wxT("\"") +
-                                wxT("\n\n") + ffs3::getLastErrorFormatted() + wxT(" (w)")); //w -> distinguish from fopen error message!
-        }
-        else if (!::WriteFile(hFileOut,      //__in         HANDLE hFile,
-                              memory.get(),  //__out        LPVOID lpBuffer,
-                              bytesRead,     //__in         DWORD nNumberOfBytesToWrite,
-                              &bytesWritten, //__out_opt    LPDWORD lpNumberOfBytesWritten,
-                              NULL))         //__inout_opt  LPOVERLAPPED lpOverlapped
-            throw FileError(wxString(_("Error writing file:")) + wxT("\n\"") + zToWx(targetFile) + wxT("\"") +
-                            wxT("\n\n") + ffs3::getLastErrorFormatted() + wxT(" (w)")); //w -> distinguish from fopen error message!
-
-        if (bytesWritten != bytesRead)
-            throw FileError(wxString(_("Error writing file:")) + wxT("\n\"") + zToWx(targetFile) + wxT("\"") +
-                            wxT("\n\n") + wxT("incomplete write"));
-
-        totalBytesTransferred += bytesRead;
-
-        //invoke callback method to update progress indicators
-        if (callback != NULL)
-            switch (callback->updateCopyStatus(totalBytesTransferred))
-            {
-                case CallbackCopyFile::CONTINUE:
-                    break;
-
-                case CallbackCopyFile::CANCEL: //a user aborted operation IS an error condition!
-                    throw FileError(wxString(_("Error copying file:")) + wxT("\n\"") + zToWx(sourceFile) +  wxT("\" ->\n\"") +
-                                    zToWx(targetFile) + wxT("\"\n\n") + _("Operation aborted!"));
-            }
-    }
-    while (!eof);
-
-
-    if (totalBytesTransferred == 0) //BackupRead silently fails reading encrypted files -> double check!
-    {
-        LARGE_INTEGER inputSize = {};
-        if (!::GetFileSizeEx(hFileIn, &inputSize))
-            throw FileError(wxString(_("Error reading file attributes:")) + wxT("\n\"") + zToWx(sourceFile) + wxT("\"") +
-                            wxT("\n\n") + ffs3::getLastErrorFormatted());
-
-        if (inputSize.QuadPart != 0)
-            throw FileError(wxString(_("Error reading file:")) + wxT("\n\"") + zToWx(sourceFile) + wxT("\"") +
-                            wxT("\n\n") + wxT("unknown error"));
-    }
-
-    //time needs to be set at the end: BackupWrite() changes file time
-    if (!::SetFileTime(hFileOut,
-                       &infoFileIn.ftCreationTime,
-                       NULL,
-                       &infoFileIn.ftLastWriteTime))
-        throw FileError(wxString(_("Error changing modification time:")) + wxT("\n\"") + zToWx(targetFile) + wxT("\"") +
-                        wxT("\n\n") + ffs3::getLastErrorFormatted());
-
-
-#ifndef NDEBUG //dst hack: verify data written
-    if (dst::isFatDrive(targetFile)) //throw()
-    {
-        WIN32_FILE_ATTRIBUTE_DATA debugeAttr = {};
-        assert(::GetFileAttributesEx(applyLongPathPrefix(targetFile).c_str(), //__in   LPCTSTR lpFileName,
-                                     GetFileExInfoStandard,                   //__in   GET_FILEEX_INFO_LEVELS fInfoLevelId,
-                                     &debugeAttr));                           //__out  LPVOID lpFileInformation
-
-        assert(::CompareFileTime(&debugeAttr.ftCreationTime,  &infoFileIn.ftCreationTime)  == 0);
-        assert(::CompareFileTime(&debugeAttr.ftLastWriteTime, &infoFileIn.ftLastWriteTime) == 0);
-    }
-#endif
-
-    guardTarget.Dismiss();
-
-    /*
-        //create test sparse file
-        size_t sparseSize = 50 * 1024 * 1024;
-        HANDLE hSparse = ::CreateFile(L"C:\\sparse.file",
-                                      GENERIC_READ | GENERIC_WRITE, //read access required for FSCTL_SET_COMPRESSION
-                                      FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
-                                      NULL,
-                                      CREATE_NEW,
-                                      FILE_FLAG_SEQUENTIAL_SCAN,
-                                      NULL);
-        DWORD br = 0;
-        if (!::DeviceIoControl(hSparse, FSCTL_SET_SPARSE, NULL, 0, NULL, 0, &br,NULL))
-            throw 1;
-
-        LARGE_INTEGER liDistanceToMove =  {};
-        liDistanceToMove.QuadPart = sparseSize;
-        if (!::SetFilePointerEx(hSparse, liDistanceToMove, NULL, FILE_BEGIN))
-            throw 1;
-
-        if (!SetEndOfFile(hSparse))
-            throw 1;
-
-        FILE_ZERO_DATA_INFORMATION zeroInfo = {};
-        zeroInfo.BeyondFinalZero.QuadPart = sparseSize;
-        if (!::DeviceIoControl(hSparse, FSCTL_SET_ZERO_DATA, &zeroInfo, sizeof(zeroInfo), NULL, 0, &br, NULL))
-            throw 1;
-
-        ::CloseHandle(hSparse);
-        */
-}
+//void rawCopyWinOptimized(const Zstring& sourceFile,
+//                         const Zstring& targetFile,
+//                         CallbackCopyFile* callback) //throw (FileError: ErrorTargetPathMissing, ErrorTargetExisting, ErrorFileLocked)
+//{
+//    /*
+//                BackupRead()	FileRead()		CopyFileEx()
+//    			--------------------------------------------
+//    Attributes  NO			    NO              YES
+//    create time NO              NO              NO
+//    ADS			YES				NO				YES
+//    Encrypted	NO(silent fail)	NO				YES
+//    Compressed	NO				NO				NO
+//    Sparse		YES				NO				NO
+//    PERF		    6% faster		            -
+//
+//    Mark stream as compressed: FSCTL_SET_COMPRESSION
+//        compatible with: BackupRead() FileRead()
+//    */
+//
+//    //open sourceFile for reading
+//    HANDLE hFileIn = ::CreateFile(ffs3::applyLongPathPrefix(sourceFile).c_str(),
+//                                  GENERIC_READ,
+//                                  FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, //all shared modes are required to read files that are open in other applications
+//                                  NULL,
+//                                  OPEN_EXISTING,
+//                                  FILE_FLAG_SEQUENTIAL_SCAN,
+//                                  NULL);
+//    if (hFileIn == INVALID_HANDLE_VALUE)
+//    {
+//        const DWORD lastError = ::GetLastError();
+//        const wxString& errorMessage = wxString(_("Error opening file:")) + wxT("\n\"") + zToWx(sourceFile) + wxT("\"") + wxT("\n\n") + ffs3::getLastErrorFormatted(lastError);
+//
+//        //if file is locked (try to) use Windows Volume Shadow Copy Service
+//        if (lastError == ERROR_SHARING_VIOLATION ||
+//            lastError == ERROR_LOCK_VIOLATION)
+//            throw ErrorFileLocked(errorMessage);
+//
+//        throw FileError(errorMessage);
+//    }
+//    Loki::ScopeGuard dummy1 = Loki::MakeGuard(::CloseHandle, hFileIn);
+//    (void)dummy1; //silence warning "unused variable"
+//
+//
+//    BY_HANDLE_FILE_INFORMATION infoFileIn = {};
+//    if (!::GetFileInformationByHandle(hFileIn, &infoFileIn))
+//    {
+//        const wxString errorMessage = wxString(_("Error reading file attributes:")) + wxT("\n\"") + zToWx(sourceFile) + wxT("\"");
+//        throw FileError(errorMessage + wxT("\n\n") + ffs3::getLastErrorFormatted());
+//    }
+//
+//    //####################################### DST hack ###########################################
+//    if (dst::isFatDrive(sourceFile)) //throw()
+//    {
+//        const dst::RawTime rawTime(infoFileIn.ftCreationTime, infoFileIn.ftLastWriteTime);
+//        if (dst::fatHasUtcEncoded(rawTime)) //throw (std::runtime_error)
+//        {
+//            infoFileIn.ftLastWriteTime = dst::fatDecodeUtcTime(rawTime); //return last write time in real UTC, throw (std::runtime_error)
+//            ::GetSystemTimeAsFileTime(&infoFileIn.ftCreationTime);       //real creation time information is not available...
+//        }
+//    }
+//
+//    if (dst::isFatDrive(targetFile)) //throw()
+//    {
+//        const dst::RawTime encodedTime = dst::fatEncodeUtcTime(infoFileIn.ftLastWriteTime); //throw (std::runtime_error)
+//        infoFileIn.ftCreationTime  = encodedTime.createTimeRaw;
+//        infoFileIn.ftLastWriteTime = encodedTime.writeTimeRaw;
+//    }
+//    //####################################### DST hack ###########################################
+//
+//    const DWORD validAttribs = FILE_ATTRIBUTE_READONLY |
+//                               FILE_ATTRIBUTE_HIDDEN   |
+//                               FILE_ATTRIBUTE_SYSTEM   |
+//                               FILE_ATTRIBUTE_ARCHIVE  |            //those two are not set properly (not worse than ::CopyFileEx())
+//                               FILE_ATTRIBUTE_NOT_CONTENT_INDEXED | //
+//                               FILE_ATTRIBUTE_ENCRYPTED;
+//
+//    //create targetFile and open it for writing
+//    HANDLE hFileOut = ::CreateFile(ffs3::applyLongPathPrefix(targetFile).c_str(),
+//                                   GENERIC_READ | GENERIC_WRITE, //read access required for FSCTL_SET_COMPRESSION
+//                                   FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
+//                                   NULL,
+//                                   CREATE_NEW,
+//                                   (infoFileIn.dwFileAttributes & validAttribs) | FILE_FLAG_SEQUENTIAL_SCAN,
+//                                   NULL);
+//    if (hFileOut == INVALID_HANDLE_VALUE)
+//    {
+//        const DWORD lastError = ::GetLastError();
+//        const wxString& errorMessage = wxString(_("Error writing file:")) + wxT("\n\"") + zToWx(targetFile) + wxT("\"") +
+//                                       wxT("\n\n") + ffs3::getLastErrorFormatted(lastError);
+//
+//        if (lastError == ERROR_FILE_EXISTS)
+//            throw ErrorTargetExisting(errorMessage);
+//
+//        if (lastError == ERROR_PATH_NOT_FOUND)
+//            throw ErrorTargetPathMissing(errorMessage);
+//
+//        throw FileError(errorMessage);
+//    }
+//    Loki::ScopeGuard guardTarget = Loki::MakeGuard(&removeFile, targetFile); //transactional behavior: guard just after opening target and before managing hFileOut
+//
+//    Loki::ScopeGuard dummy = Loki::MakeGuard(::CloseHandle, hFileOut);
+//    (void)dummy; //silence warning "unused variable"
+//
+//
+//#ifndef _MSC_VER
+//#warning teste perf von GetVolumeInformationByHandleW
+//#endif
+//    DWORD fsFlags = 0;
+//    if (!GetVolumeInformationByHandleW(hFileOut, //__in       HANDLE hFile,
+//            NULL,     //__out_opt  LPTSTR lpVolumeNameBuffer,
+//            0,        //__in       DWORD nVolumeNameSize,
+//            NULL,     //__out_opt  LPDWORD lpVolumeSerialNumber,
+//            NULL,     //__out_opt  LPDWORD lpMaximumComponentLength,
+//            &fsFlags, //__out_opt  LPDWORD lpFileSystemFlags,
+//            NULL,     //__out      LPTSTR lpFileSystemNameBuffer,
+//            0))       //__in       DWORD nFileSystemNameSize
+//    {
+//        const wxString errorMessage = wxString(_("Error reading file attributes:")) + wxT("\n\"") + zToWx(sourceFile) + wxT("\"");
+//        throw FileError(errorMessage + wxT("\n\n") + ffs3::getLastErrorFormatted());
+//    }
+//
+//	const bool sourceIsEncrypted  = (infoFileIn.dwFileAttributes & FILE_ATTRIBUTE_ENCRYPTED)   != 0;
+//	const bool sourceIsCompressed = (infoFileIn.dwFileAttributes & FILE_ATTRIBUTE_COMPRESSED)  != 0;
+//    const bool sourceIsSparse     = (infoFileIn.dwFileAttributes & FILE_ATTRIBUTE_SPARSE_FILE) != 0;
+//
+//    bool targetSupportSparse     = (fsFlags & FILE_SUPPORTS_SPARSE_FILES) != 0;
+//    bool targetSupportCompressed = (fsFlags & FILE_FILE_COMPRESSION     ) != 0;
+//	bool targetSupportStreams    = (fsFlags & FILE_NAMED_STREAMS        ) != 0;
+//
+//
+//    const bool useBackupFun = !sourceIsEncrypted; //http://msdn.microsoft.com/en-us/library/aa362509(v=VS.85).aspx
+//
+//    if (sourceIsCompressed && targetSupportCompressed)
+//    {
+//        USHORT cmpState = COMPRESSION_FORMAT_DEFAULT;
+//
+//        DWORD bytesReturned = 0;
+//        if (!DeviceIoControl(hFileOut,              //handle to file or directory
+//                             FSCTL_SET_COMPRESSION, //dwIoControlCode
+//                             &cmpState,             //input buffer
+//                             sizeof(cmpState),      //size of input buffer
+//                             NULL,                  //lpOutBuffer
+//                             0,                     //OutBufferSize
+//                             &bytesReturned,        //number of bytes returned
+//                             NULL))                 //OVERLAPPED structure
+//            throw FileError(wxString(_("Error writing file:")) + wxT("\n\"") + zToWx(targetFile) + wxT("\"") +
+//                            wxT("\n\n") + ffs3::getLastErrorFormatted() +
+//                            wxT("\nFailed to write NTFS compressed attribute!"));
+//    }
+//
+//    //although it seems the sparse attribute is set automatically by BackupWrite, we are required to do this manually: http://support.microsoft.com/kb/271398/en-us
+//    if (sourceIsSparse && targetSupportSparse)
+//    {
+//        if (useBackupFun)
+//        {
+//            DWORD bytesReturned = 0;
+//            if (!DeviceIoControl(hFileOut,         //handle to file
+//                                 FSCTL_SET_SPARSE, //dwIoControlCode
+//                                 NULL,             //input buffer
+//                                 0,                //size of input buffer
+//                                 NULL,             //lpOutBuffer
+//                                 0,                //OutBufferSize
+//                                 &bytesReturned,   //number of bytes returned
+//                                 NULL))            //OVERLAPPED structure
+//                throw FileError(wxString(_("Error writing file:")) + wxT("\n\"") + zToWx(targetFile) + wxT("\"") +
+//                                wxT("\n\n") + ffs3::getLastErrorFormatted() +
+//                                wxT("\nFailed to write NTFS sparse attribute!"));
+//        }
+//    }
+//
+//
+//    const DWORD BUFFER_SIZE = 512 * 1024; //512 kb seems to be a reasonable buffer size
+//    static const boost::scoped_array<BYTE> memory(new BYTE[BUFFER_SIZE]);
+//
+//    struct ManageCtxt //manage context for BackupRead()/BackupWrite()
+//    {
+//        ManageCtxt() : read(NULL), write(NULL) {}
+//        ~ManageCtxt()
+//        {
+//            if (read != NULL)
+//                ::BackupRead (0, NULL, 0, NULL, true, false, &read);
+//            if (write != NULL)
+//                ::BackupWrite(0, NULL, 0, NULL, true, false, &write);
+//        }
+//
+//        LPVOID read;
+//        LPVOID write;
+//    } context;
+//
+//    //copy contents of sourceFile to targetFile
+//    wxULongLong totalBytesTransferred;
+//
+//    bool eof = false;
+//    do
+//    {
+//        DWORD bytesRead = 0;
+//
+//        if (useBackupFun)
+//        {
+//            if (!::BackupRead(hFileIn,        //__in   HANDLE hFile,
+//                              memory.get(),   //__out  LPBYTE lpBuffer,
+//                              BUFFER_SIZE,    //__in   DWORD nNumberOfBytesToRead,
+//                              &bytesRead,     //__out  LPDWORD lpNumberOfBytesRead,
+//                              false,          //__in   BOOL bAbort,
+//                              false,          //__in   BOOL bProcessSecurity,
+//                              &context.read)) //__out  LPVOID *lpContext
+//                throw FileError(wxString(_("Error reading file:")) + wxT("\n\"") + zToWx(sourceFile) + wxT("\"") +
+//                                wxT("\n\n") + ffs3::getLastErrorFormatted());
+//        }
+//        else if (!::ReadFile(hFileIn,      //__in         HANDLE hFile,
+//                             memory.get(), //__out        LPVOID lpBuffer,
+//                             BUFFER_SIZE,  //__in         DWORD nNumberOfBytesToRead,
+//                             &bytesRead,   //__out_opt    LPDWORD lpNumberOfBytesRead,
+//                             NULL))        //__inout_opt  LPOVERLAPPED lpOverlapped
+//            throw FileError(wxString(_("Error reading file:")) + wxT("\n\"") + zToWx(sourceFile) + wxT("\"") +
+//                            wxT("\n\n") + ffs3::getLastErrorFormatted());
+//
+//        if (bytesRead > BUFFER_SIZE)
+//            throw FileError(wxString(_("Error reading file:")) + wxT("\n\"") + zToWx(sourceFile) + wxT("\"") +
+//                            wxT("\n\n") + wxT("buffer overflow"));
+//
+//        if (bytesRead < BUFFER_SIZE)
+//            eof = true;
+//
+//        DWORD bytesWritten = 0;
+//
+//        if (useBackupFun)
+//        {
+//            if (!::BackupWrite(hFileOut,        //__in   HANDLE hFile,
+//                               memory.get(),    //__in   LPBYTE lpBuffer,
+//                               bytesRead,       //__in   DWORD nNumberOfBytesToWrite,
+//                               &bytesWritten,   //__out  LPDWORD lpNumberOfBytesWritten,
+//                               false,           //__in   BOOL bAbort,
+//                               false,           //__in   BOOL bProcessSecurity,
+//                               &context.write)) //__out  LPVOID *lpContext
+//                throw FileError(wxString(_("Error writing file:")) + wxT("\n\"") + zToWx(targetFile) + wxT("\"") +
+//                                wxT("\n\n") + ffs3::getLastErrorFormatted() + wxT(" (w)")); //w -> distinguish from fopen error message!
+//        }
+//        else if (!::WriteFile(hFileOut,      //__in         HANDLE hFile,
+//                              memory.get(),  //__out        LPVOID lpBuffer,
+//                              bytesRead,     //__in         DWORD nNumberOfBytesToWrite,
+//                              &bytesWritten, //__out_opt    LPDWORD lpNumberOfBytesWritten,
+//                              NULL))         //__inout_opt  LPOVERLAPPED lpOverlapped
+//            throw FileError(wxString(_("Error writing file:")) + wxT("\n\"") + zToWx(targetFile) + wxT("\"") +
+//                            wxT("\n\n") + ffs3::getLastErrorFormatted() + wxT(" (w)")); //w -> distinguish from fopen error message!
+//
+//        if (bytesWritten != bytesRead)
+//            throw FileError(wxString(_("Error writing file:")) + wxT("\n\"") + zToWx(targetFile) + wxT("\"") +
+//                            wxT("\n\n") + wxT("incomplete write"));
+//
+//        totalBytesTransferred += bytesRead;
+//
+//#ifndef _MSC_VER
+//#warning totalBytesTransferred  kann größer als filesize sein!!
+//#endif
+//
+//        //invoke callback method to update progress indicators
+//        if (callback != NULL)
+//            switch (callback->updateCopyStatus(totalBytesTransferred))
+//            {
+//                case CallbackCopyFile::CONTINUE:
+//                    break;
+//
+//                case CallbackCopyFile::CANCEL: //a user aborted operation IS an error condition!
+//                    throw FileError(wxString(_("Error copying file:")) + wxT("\n\"") + zToWx(sourceFile) +  wxT("\" ->\n\"") +
+//                                    zToWx(targetFile) + wxT("\"\n\n") + _("Operation aborted!"));
+//            }
+//    }
+//    while (!eof);
+//
+//
+//    if (totalBytesTransferred == 0) //BackupRead silently fails reading encrypted files -> double check!
+//    {
+//        LARGE_INTEGER inputSize = {};
+//        if (!::GetFileSizeEx(hFileIn, &inputSize))
+//            throw FileError(wxString(_("Error reading file attributes:")) + wxT("\n\"") + zToWx(sourceFile) + wxT("\"") +
+//                            wxT("\n\n") + ffs3::getLastErrorFormatted());
+//
+//        if (inputSize.QuadPart != 0)
+//            throw FileError(wxString(_("Error reading file:")) + wxT("\n\"") + zToWx(sourceFile) + wxT("\"") +
+//                            wxT("\n\n") + wxT("unknown error"));
+//    }
+//
+//    //time needs to be set at the end: BackupWrite() changes file time
+//    if (!::SetFileTime(hFileOut,
+//                       &infoFileIn.ftCreationTime,
+//                       NULL,
+//                       &infoFileIn.ftLastWriteTime))
+//        throw FileError(wxString(_("Error changing modification time:")) + wxT("\n\"") + zToWx(targetFile) + wxT("\"") +
+//                        wxT("\n\n") + ffs3::getLastErrorFormatted());
+//
+//
+//#ifndef NDEBUG //dst hack: verify data written
+//    if (dst::isFatDrive(targetFile)) //throw()
+//    {
+//        WIN32_FILE_ATTRIBUTE_DATA debugeAttr = {};
+//        assert(::GetFileAttributesEx(applyLongPathPrefix(targetFile).c_str(), //__in   LPCTSTR lpFileName,
+//                                     GetFileExInfoStandard,                   //__in   GET_FILEEX_INFO_LEVELS fInfoLevelId,
+//                                     &debugeAttr));                           //__out  LPVOID lpFileInformation
+//
+//        assert(::CompareFileTime(&debugeAttr.ftCreationTime,  &infoFileIn.ftCreationTime)  == 0);
+//        assert(::CompareFileTime(&debugeAttr.ftLastWriteTime, &infoFileIn.ftLastWriteTime) == 0);
+//    }
+//#endif
+//
+//    guardTarget.Dismiss();
+//
+//    /*
+//        //create test sparse file
+//        size_t sparseSize = 50 * 1024 * 1024;
+//        HANDLE hSparse = ::CreateFile(L"C:\\sparse.file",
+//                                      GENERIC_READ | GENERIC_WRITE, //read access required for FSCTL_SET_COMPRESSION
+//                                      FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
+//                                      NULL,
+//                                      CREATE_NEW,
+//                                      FILE_FLAG_SEQUENTIAL_SCAN,
+//                                      NULL);
+//        DWORD br = 0;
+//        if (!::DeviceIoControl(hSparse, FSCTL_SET_SPARSE, NULL, 0, NULL, 0, &br,NULL))
+//            throw 1;
+//
+//        LARGE_INTEGER liDistanceToMove =  {};
+//        liDistanceToMove.QuadPart = sparseSize;
+//        if (!::SetFilePointerEx(hSparse, liDistanceToMove, NULL, FILE_BEGIN))
+//            throw 1;
+//
+//        if (!SetEndOfFile(hSparse))
+//            throw 1;
+//
+//        FILE_ZERO_DATA_INFORMATION zeroInfo = {};
+//        zeroInfo.BeyondFinalZero.QuadPart = sparseSize;
+//        if (!::DeviceIoControl(hSparse, FSCTL_SET_ZERO_DATA, &zeroInfo, sizeof(zeroInfo), NULL, 0, &br, NULL))
+//            throw 1;
+//
+//        ::CloseHandle(hSparse);
+//        */
+//}
 #endif
 
 
@@ -2005,10 +1989,11 @@ void copyFileImpl(const Zstring& sourceFile,
         Compressed	NO              YES
         Sparse		NO              YES
         PERF		-               6% faster
+        SAMBA, ect. YES            UNKNOWN!
     */
 
-    //rawCopyWinApi(sourceFile, targetFile, callback);     //throw (FileError: ErrorTargetPathMissing, ErrorTargetExisting, ErrorFileLocked)
-    rawCopyWinOptimized(sourceFile, targetFile, callback); //throw (FileError: ErrorTargetPathMissing, ErrorTargetExisting, ErrorFileLocked) ->about 8% faster
+    rawCopyWinApi(sourceFile, targetFile, callback);     //throw (FileError: ErrorTargetPathMissing, ErrorTargetExisting, ErrorFileLocked)
+    //rawCopyWinOptimized(sourceFile, targetFile, callback); //throw (FileError: ErrorTargetPathMissing, ErrorTargetExisting, ErrorFileLocked) ->about 8% faster
 
 #elif defined FFS_LINUX
     rawCopyStream(sourceFile, targetFile, callback); //throw (FileError: ErrorTargetPathMissing, ErrorTargetExisting)
diff --git a/shared/file_handling.h b/shared/file_handling.h
index 1d68c399..8867bb04 100644
--- a/shared/file_handling.h
+++ b/shared/file_handling.h
@@ -19,9 +19,9 @@ struct CallbackMoveFile;
 struct CallbackCopyFile;
 
 
-bool fileExists(     const Zstring& filename); //throw()       replaces wxFileExists()
-bool dirExists(      const Zstring& dirname);  //throw()       replaces wxDirExists()
-bool symlinkExists(  const Zstring& objname);  //throw()       check whether a symbolic link exists
+bool fileExists     (const Zstring& filename); //throw()       replaces wxFileExists()
+bool dirExists      (const Zstring& dirname);  //throw()       replaces wxDirExists()
+bool symlinkExists  (const Zstring& objname);  //throw()       check whether a symbolic link exists
 bool somethingExists(const Zstring& objname);  //throw()       check whether any object with this name exists
 
 //check whether two folders are located on the same (logical) volume
@@ -42,7 +42,7 @@ wxULongLong getFilesize(const Zstring& filename); //throw (FileError)
 
 
 //file handling
-void removeFile(const Zstring& filename);       //throw (FileError)
+bool removeFile(const Zstring& filename); //return "true" if file was actually deleted; throw (FileError)
 void removeDirectory(const Zstring& directory, CallbackRemoveDir* callback = NULL); //throw (FileError)
 
 
@@ -85,7 +85,7 @@ void copySymlink(const Zstring& sourceLink, const Zstring& targetLink, SymlinkTy
 struct CallbackRemoveDir
 {
     virtual ~CallbackRemoveDir() {}
-    virtual void requestUiRefresh(const Zstring& currentObject) = 0;
+    virtual void notifyDeletion(const Zstring& currentObject) = 0;
 };
 
 
diff --git a/shared/i18n.cpp b/shared/i18n.cpp
index 537d9fb4..8e0bc22c 100644
--- a/shared/i18n.cpp
+++ b/shared/i18n.cpp
@@ -16,6 +16,7 @@
 #include <boost/any.hpp>
 #include <boost/shared_ptr.hpp>
 #include <list>
+#include <iterator>
 
 using ffs3::LocalizationInfo;
 
@@ -552,51 +553,79 @@ int ffs3::retrieveSystemLanguage()
 
 
 
-
+//http://www.gnu.org/software/hello/manual/gettext/Plural-forms.html
+//http://translate.sourceforge.net/wiki/l10n/pluralforms
 /*
-typedef Zbase<wchar_t> Wstring;
+Plural forms parser: Grammar
+----------------------------
+expression:
+    conditional-expression
+
+conditional-expression:
+    logical-or-expression
+    logical-or-expression ? expression : expression
+
+logical-or-expression:
+    logical-and-expression
+    logical-or-expression || logical-and-expression
+
+logical-and-expression:
+    equality-expression
+    logical-and-expression && equality-expression
+
+equality-expression:
+    relational-expression
+    relational-expression == relational-expression
+    relational-expression != relational-expression
+
+relational-expression:
+    multiplicative-expression
+    multiplicative-expression >  multiplicative-expression
+    multiplicative-expression <  multiplicative-expression
+    multiplicative-expression >= multiplicative-expression
+    multiplicative-expression <= multiplicative-expression
+
+multiplicative-expression:
+    pm-expression
+    multiplicative-expression % pm-expression
+
+pm-expression:
+    N
+    Number
+    ( Expression )
+*/
 
-const Wstring TK_TERNARY_QUEST = L"?";
-const Wstring TK_TERNARY_COLON = L":";
-const Wstring TK_OR            = L"||";
-const Wstring TK_AND           = L"&&";
-const Wstring TK_EQUAL         = L"==";
-const Wstring TK_NOT_EQUAL     = L"!=";
-const Wstring TK_LESS          = L"<";
-const Wstring TK_LESS_EQUAL    = L"<=";
-const Wstring TK_GREATER       = L">";
-const Wstring TK_GREATER_EQUAL = L">=";
-const Wstring TK_MODULUS       = L"%";
-const Wstring TK_N             = L"n";
-const Wstring TK_BRACKET_LEFT  = L"(";
-const Wstring TK_BRACKET_RIGHT = L")";
-const Wstring TK_FORM_COUNT    = L"nplurals=";
-const Wstring TK_PHRASE_BEGIN  = L"plural=";
 
 
+//expression interface
+struct Expression { virtual ~Expression() {} };
+
 template <class T>
-struct Expr
+struct Expr : public Expression
 {
     typedef T ValueType;
     virtual ValueType eval() const = 0;
 };
 
-
-template <class In, class Out, class BiOp>
-struct GenericBiExp : public Out
+//specific binary expression based on STL function objects
+template <class StlOp>
+struct BinaryExp : public Expr<typename StlOp::result_type>
 {
-    GenericBiExp(const In& lhs, const In& rhs, BiOp biop) : lhs_(lhs), rhs_(rhs), biop_(biop) {}
-    virtual typename Out::ValueType eval() const { return biop_(lhs_.eval(), rhs_.eval()); }
-    const In& lhs_;
-    const In& rhs_;
-    BiOp biop_;
+    typedef const Expr<typename StlOp::first_argument_type> SourceExp;
+
+    BinaryExp(const SourceExp& lhs, const SourceExp& rhs, StlOp biop) : lhs_(lhs), rhs_(rhs), biop_(biop) {}
+    virtual typename StlOp::result_type eval() const { return biop_(lhs_.eval(), rhs_.eval()); }
+    const SourceExp& lhs_;
+    const SourceExp& rhs_;
+    StlOp biop_;
 };
 
-template <class Out, class In, class BiOp>
+template <class StlOp>
 inline
-GenericBiExp<In, Out, BiOp> makeBiExp(const In& lhs, const In& rhs, BiOp biop)
+BinaryExp<StlOp> makeBiExp(const Expression& lhs, const Expression& rhs, StlOp biop) //throw (std::bad_cast)
 {
-    return GenericBiExp<In, Out, BiOp>(lhs, rhs, biop);
+    return BinaryExp<StlOp>(dynamic_cast<const Expr<typename StlOp::first_argument_type >&>(lhs),
+                            dynamic_cast<const Expr<typename StlOp::second_argument_type>&>(rhs), biop);
 }
 
 template <class Out>
@@ -612,39 +641,33 @@ struct TernaryExp : public Out
 struct LiteralNumberEx : public Expr<int>
 {
     LiteralNumberEx(int n) : n_(n) {}
-    virtual ValueType eval() const { return n_; }
+    virtual int eval() const { return n_; }
     int n_;
 };
 
 struct NumberN : public Expr<int>
 {
     NumberN(int& n) : n_(n) {}
-    virtual ValueType eval() const { return n_; }
+    virtual int eval() const { return n_; }
     int& n_;
 };
 
 
+typedef Zbase<wchar_t> Wstring;
+
+
 class PluralForm
 {
 public:
-    struct ParserError {};
+    struct ParsingError {};
 
-    PluralForm(const Wstring& phrase) //.po format,e.g.: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)
+    PluralForm(const Wstring& phrase) : n_(0) //.po format,e.g.: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)
     {
-        Wstring tmp;
-        std::remove_copy_if(phrase.begin(), phrase.end(), std::back_inserter(tmp), std::iswspace);
-
-        size_t pos = tmp.find(TK_FORM_COUNT);
-        if (pos == Wstring::npos)
-            throw ParserError();
-
-        count = tmp.substr(pos + TK_FORM_COUNT.size()).toNumber<int>();
-
-        pos = tmp.find(TK_PHRASE_BEGIN);
-        if (pos == Wstring::npos)
-            throw ParserError();
-
-        expr = &parseNumber(tmp.substr(pos + TK_PHRASE_BEGIN.size()));
+        Parser(phrase, //in
+               expr,   //out
+               n_,     //
+               count,  //
+               dump);  //
     }
 
     int formCount() const { return count; }
@@ -652,95 +675,397 @@ public:
     int getForm(int n) const { n_ = n ; return expr->eval(); }
 
 private:
-    const Expr<bool>& parseBool(const Wstring& phrase)
-    {
-        Wstring part1, part2;
-        if (trySplit(phrase, TK_OR, part1, part2))
-            return manageObj(makeBiExp<Expr<bool> >(parseBool(part1), parseBool(part2), std::logical_or<bool>()));
-        else if (trySplit(phrase, TK_AND, part1, part2))
-            return manageObj(makeBiExp<Expr<bool> >(parseBool(part1), parseBool(part2), std::logical_and<bool>()));
-        else if (trySplit(phrase, TK_EQUAL, part1, part2))
-            return manageObj(makeBiExp<Expr<bool> >(parseNumber(part1), parseNumber(part2), std::equal_to<int>()));
-        else if (trySplit(phrase, TK_NOT_EQUAL, part1, part2))
-            return manageObj(makeBiExp<Expr<bool> >(parseNumber(part1), parseNumber(part2), std::not_equal_to<int>()));
-        else if (trySplit(phrase, TK_LESS, part1, part2))
-            return manageObj(makeBiExp<Expr<bool> >(parseNumber(part1), parseNumber(part2), std::less<int>()));
-        else if (trySplit(phrase, TK_LESS_EQUAL, part1, part2))
-            return manageObj(makeBiExp<Expr<bool> >(parseNumber(part1), parseNumber(part2), std::less_equal<int>()));
-        else if (trySplit(phrase, TK_GREATER, part1, part2))
-            return manageObj(makeBiExp<Expr<bool> >(parseNumber(part1), parseNumber(part2), std::greater<int>()));
-        else if (trySplit(phrase, TK_GREATER_EQUAL, part1, part2))
-            return manageObj(makeBiExp<Expr<bool> >(parseNumber(part1), parseNumber(part2), std::greater_equal<int>()));
-        else
-            throw ParserError();
-    }
+    typedef std::list<boost::shared_ptr<Expression> > DumpList;
 
-    const Expr<int>& parseNumber(const Wstring& phrase)
+    struct Token
     {
-        Wstring part1, part2;
-
+        enum Type
+        {
+            TK_FORM_COUNT,
+            TK_PHRASE_BEGIN,
+            TK_ASSIGN,
+            TK_SEMICOLON,
+            TK_TERNARY_QUEST,
+            TK_TERNARY_COLON,
+            TK_OR,
+            TK_AND,
+            TK_EQUAL,
+            TK_NOT_EQUAL,
+            TK_LESS,
+            TK_LESS_EQUAL,
+            TK_GREATER,
+            TK_GREATER_EQUAL,
+            TK_MODULUS,
+            TK_N,
+            TK_NUMBER,
+            TK_BRACKET_LEFT,
+            TK_BRACKET_RIGHT,
+            TK_END
+        };
+
+        Token(Type t) : type(t), number(0) {}
+
+        Type type;
+        int number; //if type == TK_NUMBER
+    };
 
-        if (trySplit(phrase, TK_TERNARY_QUEST, part1, part2, TO_LEFT))
+    class Scanner
+    {
+    public:
+        Scanner(const Wstring& phrase) : phrase_(phrase)
         {
-            Wstring part3;
-            if (!trySplit(Wstring(part2), TK_TERNARY_COLON, part2, part3, TO_LEFT))
-                throw ParserError();
-            return manageObj(TernaryExp<Expr<int> >(parseBool(part1), parseNumber(part2), parseNumber(part3)));
+            tokens.push_back(std::make_pair(L"nplurals", Token::TK_FORM_COUNT));
+            tokens.push_back(std::make_pair(L"plural"  , Token::TK_PHRASE_BEGIN));
+            tokens.push_back(std::make_pair(L";" , Token::TK_SEMICOLON    ));
+            tokens.push_back(std::make_pair(L"?" , Token::TK_TERNARY_QUEST));
+            tokens.push_back(std::make_pair(L":" , Token::TK_TERNARY_COLON));
+            tokens.push_back(std::make_pair(L"||", Token::TK_OR           ));
+            tokens.push_back(std::make_pair(L"&&", Token::TK_AND          ));
+            tokens.push_back(std::make_pair(L"==", Token::TK_EQUAL        ));
+            tokens.push_back(std::make_pair(L"=" , Token::TK_ASSIGN       ));
+            tokens.push_back(std::make_pair(L"!=", Token::TK_NOT_EQUAL    ));
+            tokens.push_back(std::make_pair(L"<=", Token::TK_LESS_EQUAL   ));
+            tokens.push_back(std::make_pair(L"<" , Token::TK_LESS         ));
+            tokens.push_back(std::make_pair(L">=", Token::TK_GREATER_EQUAL));
+            tokens.push_back(std::make_pair(L">" , Token::TK_GREATER      ));
+            tokens.push_back(std::make_pair(L"%" , Token::TK_MODULUS      ));
+            tokens.push_back(std::make_pair(L"n" , Token::TK_N            ));
+            tokens.push_back(std::make_pair(L"N" , Token::TK_N            ));
+            tokens.push_back(std::make_pair(L"(" , Token::TK_BRACKET_LEFT ));
+            tokens.push_back(std::make_pair(L")" , Token::TK_BRACKET_RIGHT));
         }
-        else if (trySplit(phrase, TK_MODULUS, part1, part2))
-            return manageObj(makeBiExp<Expr<int> >(parseNumber(part1), parseNumber(part2), std::modulus<int>()));
-        else if (phrase == TK_N)
-            return manageObj(NumberN(n_));
-        else //expect literal number
+
+        Token nextToken()
         {
-            if (std::find_if(phrase.begin(), phrase.end(), std::not1(std::ptr_fun(std::iswdigit))) != phrase.end())
-                throw ParserError();
-            return manageObj(LiteralNumberEx(phrase.toNumber<int>()));
+            phrase_.Trim(true, false); //remove whitespace
+
+            if (phrase_.empty()) return Token(Token::TK_END);
+
+            for (TokenList::const_iterator i = tokens.begin(); i != tokens.end(); ++i)
+                if (phrase_.StartsWith(i->first))
+                {
+                    phrase_ = phrase_.substr(i->first.size());
+                    return Token(i->second);
+                }
+
+            Wstring::iterator digitEnd = std::find_if(phrase_.begin(), phrase_.end(), std::not1(std::ptr_fun(std::iswdigit)));
+            int digitCount = digitEnd - phrase_.begin();
+            if (digitCount != 0)
+            {
+                Token out(Token::TK_NUMBER);
+                out.number = Wstring(phrase_.c_str(), digitCount).toNumber<int>();
+                phrase_ = phrase_.substr(digitCount);
+                return out;
+            }
+
+            throw ParsingError(); //unknown token
         }
-    }
 
-    enum Associativity
-    {
-        TO_LEFT,
-        TO_RIGHT
+    private:
+        typedef std::vector<std::pair<Wstring, Token::Type> > TokenList;
+        TokenList tokens;
+        Wstring phrase_;
     };
-    static bool trySplit(const Wstring& phrase, const Wstring& delimiter, Wstring& part1, Wstring& part2, Associativity assoc = TO_RIGHT)
-    {
-        size_t pos = assoc == TO_LEFT ?
-                     phrase.find(delimiter) : //reverse [!]
-                     phrase.rfind(delimiter);
-        if (pos == Wstring::npos)
-            return false;
-
-        part1 = phrase.substr(0, pos);
-        part2 = phrase.substr(pos + delimiter.size());
-        return true;
-    }
 
-    template <class T>
-    const T& manageObj(const T& obj)
+
+    class Parser
     {
-        dump.push_back(obj);
-        return *boost::any_cast<T>(&dump.back());
-    }
+    public:
+        Parser(const Wstring& phrase, //in
+               const Expr<int>*& expr, int& n, int& count, PluralForm::DumpList& dump) ://out
+            scn(phrase),
+            tk(scn.nextToken()),
+            n_(n),
+            dump_(dump)
+        {
+            consumeToken(Token::TK_FORM_COUNT);
+            consumeToken(Token::TK_ASSIGN);
+
+            count = token().number;
+            consumeToken(Token::TK_NUMBER);
+
+            consumeToken(Token::TK_SEMICOLON);
+            consumeToken(Token::TK_PHRASE_BEGIN);
+            consumeToken(Token::TK_ASSIGN);
+
+            try
+            {
+                const Expression& e = parse();
+                expr = &dynamic_cast<const Expr<int>&>(e);
+            }
+            catch(std::bad_cast&) { throw ParsingError(); }
+
+            consumeToken(Token::TK_END);
+        }
+
+    private:
+        void nextToken() { tk = scn.nextToken(); }
+        const Token& token() const { return tk; }
+
+        void consumeToken(Token::Type t)
+        {
+            if (token().type != t)
+                throw ParsingError();
+            nextToken();
+        }
+
+        const Expression& parse() { return parseConditional(); };
+
+        const Expression& parseConditional()
+        {
+            const Expression& e = parseLogicalOr();
+
+            if (token().type == Token::TK_TERNARY_QUEST)
+            {
+                nextToken();
+                const Expression& thenEx = parse(); //associativity: <-
+                consumeToken(Token::TK_TERNARY_COLON);
+                const Expression& elseEx = parse(); //
+
+                return manageObj(TernaryExp<Expr<int> >(dynamic_cast<const Expr<bool>&>(e),
+                                                        dynamic_cast<const Expr<int>&>(thenEx),
+                                                        dynamic_cast<const Expr<int>&>(elseEx)));
+            }
+            return e;
+        }
+
+        const Expression& parseLogicalOr()
+        {
+            const Expression* e = &parseLogicalAnd();
+            for (;;) //associativity: ->
+                if (token().type == Token::TK_OR)
+                {
+                    nextToken();
+                    const Expression& rhs = parseLogicalAnd();
+                    e = &manageObj(makeBiExp(*e, rhs, std::logical_or<bool>()));
+                }
+                else break;
+            return *e;
+        }
+
+        const Expression& parseLogicalAnd()
+        {
+            const Expression* e = &parseEquality();
+            for (;;) //associativity: ->
+                if (token().type == Token::TK_AND)
+                {
+                    nextToken();
+                    const Expression& rhs = parseEquality();
+
+                    e = &manageObj(makeBiExp(*e, rhs, std::logical_and<bool>()));
+                }
+                else break;
+            return *e;
+        }
+
+        const Expression& parseEquality()
+        {
+            const Expression& e = parseRelational();
+
+            Token::Type t = token().type;
+            if (t == Token::TK_EQUAL || t == Token::TK_NOT_EQUAL) //associativity: n/a
+            {
+                nextToken();
+                const Expression& rhs = parseRelational();
+
+                if (t == Token::TK_EQUAL)
+                    return manageObj(makeBiExp(e, rhs, std::equal_to<int>()));
+                else
+                    return manageObj(makeBiExp(e, rhs, std::not_equal_to<int>()));
+            }
+            return e;
+        }
+
+        const Expression& parseRelational()
+        {
+            const Expression& e = parseMultiplicative();
+
+            Token::Type t = token().type;
+            if (t == Token::TK_LESS      || //associativity: n/a
+                t == Token::TK_LESS_EQUAL||
+                t == Token::TK_GREATER   ||
+                t == Token::TK_GREATER_EQUAL)
+            {
+                nextToken();
+                const Expression& rhs = parseMultiplicative();
+
+                if (t == Token::TK_LESS)          return manageObj(makeBiExp(e, rhs, std::less         <int>()));
+                if (t == Token::TK_LESS_EQUAL)    return manageObj(makeBiExp(e, rhs, std::less_equal   <int>()));
+                if (t == Token::TK_GREATER)       return manageObj(makeBiExp(e, rhs, std::greater      <int>()));
+                if (t == Token::TK_GREATER_EQUAL) return manageObj(makeBiExp(e, rhs, std::greater_equal<int>()));
+            }
+            return e;
+        }
+
+        const Expression& parseMultiplicative()
+        {
+            const Expression* e = &parsePrimary();
+
+            for (;;) //associativity: ->
+                if (token().type == Token::TK_MODULUS)
+                {
+                    nextToken();
+                    const Expression& rhs = parsePrimary();
+
+                    //"compile-time" check: n % 0
+                    const LiteralNumberEx* literal = dynamic_cast<const LiteralNumberEx*>(&rhs);
+                    if (literal && literal->eval() == 0)
+                        throw ParsingError();
+
+                    e = &manageObj(makeBiExp(*e, rhs, std::modulus<int>()));
+                }
+                else break;
+            return *e;
+        }
+
+        const Expression& parsePrimary()
+        {
+            if (token().type == Token::TK_N)
+            {
+                nextToken();
+                return manageObj(NumberN(n_));
+            }
+            else if (token().type == Token::TK_NUMBER)
+            {
+                const int number = token().number;
+                nextToken();
+                return manageObj(LiteralNumberEx(number));
+            }
+            else if (token().type == Token::TK_BRACKET_LEFT)
+            {
+                nextToken();
+                const Expression& e = parse();
+
+                consumeToken(Token::TK_BRACKET_RIGHT);
+                return e;
+            }
+            else
+                throw ParsingError();
+        }
+
+        template <class T>
+        const T& manageObj(const T& obj)
+        {
+            boost::shared_ptr<Expression> newEntry(new T(obj));
+            dump_.push_back(newEntry);
+            return static_cast<T&>(*dump_.back());
+        }
+
+        Scanner scn;
+        Token tk;
+
+        int& n_;
+        DumpList& dump_; //manage polymorphc object lifetimes
+    };
 
-    int count;
     const Expr<int>* expr;
     mutable int n_;
+    int count;
 
-    std::list<boost::any> dump; //manage polymorphc object lifetimes
+    PluralForm::DumpList dump; //manage polymorphc object lifetimes
 };
 
 
-    PluralForm dummy(L"nplurals=3; plural=n == 1 ? 0 : n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 10 || n % 100 > 20) ? 1 : 2");
-    int ddf = dummy.formCount();
-    int kddf = dummy.getForm(0);
-*/
+const wchar_t formPol[] = L"nplurals=3; plural=n == 1 ? 0 : n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 10 || n % 100 > 20) ? 1 : 2";
+int tstPol(int n)
+{
+    return n == 1 ? 0 : n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 10 || n % 100 > 20) ? 1 : 2;
+}
 
+const wchar_t formRu[] = L"nplurals= 3; plural=n % 10 == 1 && n % 100 != 11 ? 0 : n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 10 || n % 100 > 20) ? 1 : 2";
+int tstRu(int n)
+{
+    return n % 10 == 1 && n % 100 != 11 ? 0 : n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 10 || n % 100 > 20) ? 1 : 2 ;
+}
+
+const wchar_t formLit[] = L"nplurals =3; plural=n% 10 == 1&& n % 100 != 11 ? 0 : n % 100 != 12&& n % 10 == 2 ? 1 : 0";
+int tstLit(int n)
+{
+    return n % 10 == 1&& n % 100 != 11 ? 0 : n % 100 != 12&& n % 10 == 2 ? 1 : 0;
+}
+
+const wchar_t formArab[] = L"nplurals = 6; plural = n == 0 ? 0 : n == 1 ? 1 : n == 2 ? 2 : (n % 100 >= 3 && n % 100 <= 10) ? 3 : (n % 100 >= 11 && n % 100 <= 99) || (n % 100 == 1) || (n % 100 ==2) ? 4 : 5";
+int tstArab(int n)
+{
+    return n == 0 ? 0 : n == 1 ? 1 : n == 2 ? 2 : (n % 100 >= 3 && n % 100 <= 10) ? 3 : (n % 100 >= 11 && n % 100 <= 99) || (n % 100 == 1) || (n % 100 ==2) ? 4 : 5;
+}
+
+const wchar_t formGerm[] = L"nplurals=2; plural= n == 1 ? 0 : 1";
+int tstGerm(int n)
+{
+    return n == 1 ? 0 : 1;
+}
+
+const wchar_t formFren[] = L"nplurals=2; plural= n <= 1 ? 0 : 1";
+int tstFren(int n)
+{
+    return n <= 1 ? 0 : 1;
+}
+
+const wchar_t formJap[] = L"nplurals=1; plural=0";
+int tstJap(int n)
+{
+    return 0;
+}
+
+const wchar_t formRom[] = L"nplurals=3; plural= n == 1 ? 0 : n == 0 || (n % 100 >= 1 && n % 100 <= 20) ? 1 : 2	";
+int tstRom(int n)
+{
+    return n == 1 ? 0 : n == 0 || (n % 100 >= 1 && n % 100 <= 20) ? 1 : 2	;
+}
+
+const wchar_t formCze[] = L" nplurals=3; plural= n % 100 == 1 ? 0 : n % 100 >= 2 && n % 100 <= 4 ? 1 : 2";
+int tstCze(int n)
+{
+    return n % 100 == 1 ? 0 : n % 100 >= 2 && n % 100 <= 4 ? 1 : 2;
+}
+
+const wchar_t formSlov[] = L" nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3 ";
+int tstSlov(int n)
+{
+    return n % 100 == 1 ? 0 : n % 100 == 2 ? 1 : n % 100 == 3 || n % 100 == 4 ? 2 : 3;
+}
+
+void unitTest()
+{
+    typedef int (*TestFun)(int);
+    typedef std::vector<std::pair<const wchar_t*, TestFun> > PhraseFunList;
+    PhraseFunList phrases;
+    phrases.push_back(std::make_pair(formPol,  &tstPol));
+    phrases.push_back(std::make_pair(formRu,   &tstRu));
+    phrases.push_back(std::make_pair(formLit,  &tstLit));
+    phrases.push_back(std::make_pair(formArab, &tstArab));
+    phrases.push_back(std::make_pair(formGerm, &tstGerm));
+    phrases.push_back(std::make_pair(formFren, &tstFren));
+    phrases.push_back(std::make_pair(formJap,  &tstJap));
+    phrases.push_back(std::make_pair(formRom,  &tstRom));
+    phrases.push_back(std::make_pair(formCze,  &tstCze));
+    phrases.push_back(std::make_pair(formSlov, &tstSlov));
+
+    for (PhraseFunList::const_iterator i = phrases.begin(); i != phrases.end(); ++i)
+    {
+        PluralForm pf(i->first);
+        for (int j = 0; j < 10000000; ++j)
+            assert((i->second)(j) == pf.getForm(j));
+    }
+}
 
 
 wxString ffs3::translate(const wxString& original) //translate into currently selected language
 {
+	/*
+    int ba = 3;
+
+    unitTest();
+
+#ifndef _MSC_VER
+#warning 3434
+#endif
+
+	*/
+
+
+
     //look for translation in buffer table
     const Translation::const_iterator i = activeTranslation.find(original);
     if (i != activeTranslation.end())
diff --git a/shared/i18n_no_BOM.cpp b/shared/i18n_no_BOM.cpp
index 78f2b230..b89d3221 100644
--- a/shared/i18n_no_BOM.cpp
+++ b/shared/i18n_no_BOM.cpp
@@ -16,6 +16,7 @@
 #include <boost/any.hpp>
 #include <boost/shared_ptr.hpp>
 #include <list>
+#include <iterator>
 
 using ffs3::LocalizationInfo;
 
@@ -552,51 +553,79 @@ int ffs3::retrieveSystemLanguage()
 
 
 
-
+//http://www.gnu.org/software/hello/manual/gettext/Plural-forms.html
+//http://translate.sourceforge.net/wiki/l10n/pluralforms
 /*
-typedef Zbase<wchar_t> Wstring;
+Plural forms parser: Grammar
+----------------------------
+expression:
+    conditional-expression
+
+conditional-expression:
+    logical-or-expression
+    logical-or-expression ? expression : expression
+
+logical-or-expression:
+    logical-and-expression
+    logical-or-expression || logical-and-expression
+
+logical-and-expression:
+    equality-expression
+    logical-and-expression && equality-expression
+
+equality-expression:
+    relational-expression
+    relational-expression == relational-expression
+    relational-expression != relational-expression
+
+relational-expression:
+    multiplicative-expression
+    multiplicative-expression >  multiplicative-expression
+    multiplicative-expression <  multiplicative-expression
+    multiplicative-expression >= multiplicative-expression
+    multiplicative-expression <= multiplicative-expression
+
+multiplicative-expression:
+    pm-expression
+    multiplicative-expression % pm-expression
+
+pm-expression:
+    N
+    Number
+    ( Expression )
+*/
 
-const Wstring TK_TERNARY_QUEST = L"?";
-const Wstring TK_TERNARY_COLON = L":";
-const Wstring TK_OR            = L"||";
-const Wstring TK_AND           = L"&&";
-const Wstring TK_EQUAL         = L"==";
-const Wstring TK_NOT_EQUAL     = L"!=";
-const Wstring TK_LESS          = L"<";
-const Wstring TK_LESS_EQUAL    = L"<=";
-const Wstring TK_GREATER       = L">";
-const Wstring TK_GREATER_EQUAL = L">=";
-const Wstring TK_MODULUS       = L"%";
-const Wstring TK_N             = L"n";
-const Wstring TK_BRACKET_LEFT  = L"(";
-const Wstring TK_BRACKET_RIGHT = L")";
-const Wstring TK_FORM_COUNT    = L"nplurals=";
-const Wstring TK_PHRASE_BEGIN  = L"plural=";
 
 
+//expression interface
+struct Expression { virtual ~Expression() {} };
+
 template <class T>
-struct Expr
+struct Expr : public Expression
 {
     typedef T ValueType;
     virtual ValueType eval() const = 0;
 };
 
-
-template <class In, class Out, class BiOp>
-struct GenericBiExp : public Out
+//specific binary expression based on STL function objects
+template <class StlOp>
+struct BinaryExp : public Expr<typename StlOp::result_type>
 {
-    GenericBiExp(const In& lhs, const In& rhs, BiOp biop) : lhs_(lhs), rhs_(rhs), biop_(biop) {}
-    virtual typename Out::ValueType eval() const { return biop_(lhs_.eval(), rhs_.eval()); }
-    const In& lhs_;
-    const In& rhs_;
-    BiOp biop_;
+    typedef const Expr<typename StlOp::first_argument_type> SourceExp;
+
+    BinaryExp(const SourceExp& lhs, const SourceExp& rhs, StlOp biop) : lhs_(lhs), rhs_(rhs), biop_(biop) {}
+    virtual typename StlOp::result_type eval() const { return biop_(lhs_.eval(), rhs_.eval()); }
+    const SourceExp& lhs_;
+    const SourceExp& rhs_;
+    StlOp biop_;
 };
 
-template <class Out, class In, class BiOp>
+template <class StlOp>
 inline
-GenericBiExp<In, Out, BiOp> makeBiExp(const In& lhs, const In& rhs, BiOp biop)
+BinaryExp<StlOp> makeBiExp(const Expression& lhs, const Expression& rhs, StlOp biop) //throw (std::bad_cast)
 {
-    return GenericBiExp<In, Out, BiOp>(lhs, rhs, biop);
+    return BinaryExp<StlOp>(dynamic_cast<const Expr<typename StlOp::first_argument_type >&>(lhs),
+                            dynamic_cast<const Expr<typename StlOp::second_argument_type>&>(rhs), biop);
 }
 
 template <class Out>
@@ -612,39 +641,33 @@ struct TernaryExp : public Out
 struct LiteralNumberEx : public Expr<int>
 {
     LiteralNumberEx(int n) : n_(n) {}
-    virtual ValueType eval() const { return n_; }
+    virtual int eval() const { return n_; }
     int n_;
 };
 
 struct NumberN : public Expr<int>
 {
     NumberN(int& n) : n_(n) {}
-    virtual ValueType eval() const { return n_; }
+    virtual int eval() const { return n_; }
     int& n_;
 };
 
 
+typedef Zbase<wchar_t> Wstring;
+
+
 class PluralForm
 {
 public:
-    struct ParserError {};
+    struct ParsingError {};
 
-    PluralForm(const Wstring& phrase) //.po format,e.g.: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)
+    PluralForm(const Wstring& phrase) : n_(0) //.po format,e.g.: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)
     {
-        Wstring tmp;
-        std::remove_copy_if(phrase.begin(), phrase.end(), std::back_inserter(tmp), std::iswspace);
-
-        size_t pos = tmp.find(TK_FORM_COUNT);
-        if (pos == Wstring::npos)
-            throw ParserError();
-
-        count = tmp.substr(pos + TK_FORM_COUNT.size()).toNumber<int>();
-
-        pos = tmp.find(TK_PHRASE_BEGIN);
-        if (pos == Wstring::npos)
-            throw ParserError();
-
-        expr = &parseNumber(tmp.substr(pos + TK_PHRASE_BEGIN.size()));
+        Parser(phrase, //in
+               expr,   //out
+               n_,     //
+               count,  //
+               dump);  //
     }
 
     int formCount() const { return count; }
@@ -652,95 +675,397 @@ public:
     int getForm(int n) const { n_ = n ; return expr->eval(); }
 
 private:
-    const Expr<bool>& parseBool(const Wstring& phrase)
-    {
-        Wstring part1, part2;
-        if (trySplit(phrase, TK_OR, part1, part2))
-            return manageObj(makeBiExp<Expr<bool> >(parseBool(part1), parseBool(part2), std::logical_or<bool>()));
-        else if (trySplit(phrase, TK_AND, part1, part2))
-            return manageObj(makeBiExp<Expr<bool> >(parseBool(part1), parseBool(part2), std::logical_and<bool>()));
-        else if (trySplit(phrase, TK_EQUAL, part1, part2))
-            return manageObj(makeBiExp<Expr<bool> >(parseNumber(part1), parseNumber(part2), std::equal_to<int>()));
-        else if (trySplit(phrase, TK_NOT_EQUAL, part1, part2))
-            return manageObj(makeBiExp<Expr<bool> >(parseNumber(part1), parseNumber(part2), std::not_equal_to<int>()));
-        else if (trySplit(phrase, TK_LESS, part1, part2))
-            return manageObj(makeBiExp<Expr<bool> >(parseNumber(part1), parseNumber(part2), std::less<int>()));
-        else if (trySplit(phrase, TK_LESS_EQUAL, part1, part2))
-            return manageObj(makeBiExp<Expr<bool> >(parseNumber(part1), parseNumber(part2), std::less_equal<int>()));
-        else if (trySplit(phrase, TK_GREATER, part1, part2))
-            return manageObj(makeBiExp<Expr<bool> >(parseNumber(part1), parseNumber(part2), std::greater<int>()));
-        else if (trySplit(phrase, TK_GREATER_EQUAL, part1, part2))
-            return manageObj(makeBiExp<Expr<bool> >(parseNumber(part1), parseNumber(part2), std::greater_equal<int>()));
-        else
-            throw ParserError();
-    }
+    typedef std::list<boost::shared_ptr<Expression> > DumpList;
 
-    const Expr<int>& parseNumber(const Wstring& phrase)
+    struct Token
     {
-        Wstring part1, part2;
-
+        enum Type
+        {
+            TK_FORM_COUNT,
+            TK_PHRASE_BEGIN,
+            TK_ASSIGN,
+            TK_SEMICOLON,
+            TK_TERNARY_QUEST,
+            TK_TERNARY_COLON,
+            TK_OR,
+            TK_AND,
+            TK_EQUAL,
+            TK_NOT_EQUAL,
+            TK_LESS,
+            TK_LESS_EQUAL,
+            TK_GREATER,
+            TK_GREATER_EQUAL,
+            TK_MODULUS,
+            TK_N,
+            TK_NUMBER,
+            TK_BRACKET_LEFT,
+            TK_BRACKET_RIGHT,
+            TK_END
+        };
+
+        Token(Type t) : type(t), number(0) {}
+
+        Type type;
+        int number; //if type == TK_NUMBER
+    };
 
-        if (trySplit(phrase, TK_TERNARY_QUEST, part1, part2, TO_LEFT))
+    class Scanner
+    {
+    public:
+        Scanner(const Wstring& phrase) : phrase_(phrase)
         {
-            Wstring part3;
-            if (!trySplit(Wstring(part2), TK_TERNARY_COLON, part2, part3, TO_LEFT))
-                throw ParserError();
-            return manageObj(TernaryExp<Expr<int> >(parseBool(part1), parseNumber(part2), parseNumber(part3)));
+            tokens.push_back(std::make_pair(L"nplurals", Token::TK_FORM_COUNT));
+            tokens.push_back(std::make_pair(L"plural"  , Token::TK_PHRASE_BEGIN));
+            tokens.push_back(std::make_pair(L";" , Token::TK_SEMICOLON    ));
+            tokens.push_back(std::make_pair(L"?" , Token::TK_TERNARY_QUEST));
+            tokens.push_back(std::make_pair(L":" , Token::TK_TERNARY_COLON));
+            tokens.push_back(std::make_pair(L"||", Token::TK_OR           ));
+            tokens.push_back(std::make_pair(L"&&", Token::TK_AND          ));
+            tokens.push_back(std::make_pair(L"==", Token::TK_EQUAL        ));
+            tokens.push_back(std::make_pair(L"=" , Token::TK_ASSIGN       ));
+            tokens.push_back(std::make_pair(L"!=", Token::TK_NOT_EQUAL    ));
+            tokens.push_back(std::make_pair(L"<=", Token::TK_LESS_EQUAL   ));
+            tokens.push_back(std::make_pair(L"<" , Token::TK_LESS         ));
+            tokens.push_back(std::make_pair(L">=", Token::TK_GREATER_EQUAL));
+            tokens.push_back(std::make_pair(L">" , Token::TK_GREATER      ));
+            tokens.push_back(std::make_pair(L"%" , Token::TK_MODULUS      ));
+            tokens.push_back(std::make_pair(L"n" , Token::TK_N            ));
+            tokens.push_back(std::make_pair(L"N" , Token::TK_N            ));
+            tokens.push_back(std::make_pair(L"(" , Token::TK_BRACKET_LEFT ));
+            tokens.push_back(std::make_pair(L")" , Token::TK_BRACKET_RIGHT));
         }
-        else if (trySplit(phrase, TK_MODULUS, part1, part2))
-            return manageObj(makeBiExp<Expr<int> >(parseNumber(part1), parseNumber(part2), std::modulus<int>()));
-        else if (phrase == TK_N)
-            return manageObj(NumberN(n_));
-        else //expect literal number
+
+        Token nextToken()
         {
-            if (std::find_if(phrase.begin(), phrase.end(), std::not1(std::ptr_fun(std::iswdigit))) != phrase.end())
-                throw ParserError();
-            return manageObj(LiteralNumberEx(phrase.toNumber<int>()));
+            phrase_.Trim(true, false); //remove whitespace
+
+            if (phrase_.empty()) return Token(Token::TK_END);
+
+            for (TokenList::const_iterator i = tokens.begin(); i != tokens.end(); ++i)
+                if (phrase_.StartsWith(i->first))
+                {
+                    phrase_ = phrase_.substr(i->first.size());
+                    return Token(i->second);
+                }
+
+            Wstring::iterator digitEnd = std::find_if(phrase_.begin(), phrase_.end(), std::not1(std::ptr_fun(std::iswdigit)));
+            int digitCount = digitEnd - phrase_.begin();
+            if (digitCount != 0)
+            {
+                Token out(Token::TK_NUMBER);
+                out.number = Wstring(phrase_.c_str(), digitCount).toNumber<int>();
+                phrase_ = phrase_.substr(digitCount);
+                return out;
+            }
+
+            throw ParsingError(); //unknown token
         }
-    }
 
-    enum Associativity
-    {
-        TO_LEFT,
-        TO_RIGHT
+    private:
+        typedef std::vector<std::pair<Wstring, Token::Type> > TokenList;
+        TokenList tokens;
+        Wstring phrase_;
     };
-    static bool trySplit(const Wstring& phrase, const Wstring& delimiter, Wstring& part1, Wstring& part2, Associativity assoc = TO_RIGHT)
-    {
-        size_t pos = assoc == TO_LEFT ?
-                     phrase.find(delimiter) : //reverse [!]
-                     phrase.rfind(delimiter);
-        if (pos == Wstring::npos)
-            return false;
-
-        part1 = phrase.substr(0, pos);
-        part2 = phrase.substr(pos + delimiter.size());
-        return true;
-    }
 
-    template <class T>
-    const T& manageObj(const T& obj)
+
+    class Parser
     {
-        dump.push_back(obj);
-        return *boost::any_cast<T>(&dump.back());
-    }
+    public:
+        Parser(const Wstring& phrase, //in
+               const Expr<int>*& expr, int& n, int& count, PluralForm::DumpList& dump) ://out
+            scn(phrase),
+            tk(scn.nextToken()),
+            n_(n),
+            dump_(dump)
+        {
+            consumeToken(Token::TK_FORM_COUNT);
+            consumeToken(Token::TK_ASSIGN);
+
+            count = token().number;
+            consumeToken(Token::TK_NUMBER);
+
+            consumeToken(Token::TK_SEMICOLON);
+            consumeToken(Token::TK_PHRASE_BEGIN);
+            consumeToken(Token::TK_ASSIGN);
+
+            try
+            {
+                const Expression& e = parse();
+                expr = &dynamic_cast<const Expr<int>&>(e);
+            }
+            catch(std::bad_cast&) { throw ParsingError(); }
+
+            consumeToken(Token::TK_END);
+        }
+
+    private:
+        void nextToken() { tk = scn.nextToken(); }
+        const Token& token() const { return tk; }
+
+        void consumeToken(Token::Type t)
+        {
+            if (token().type != t)
+                throw ParsingError();
+            nextToken();
+        }
+
+        const Expression& parse() { return parseConditional(); };
+
+        const Expression& parseConditional()
+        {
+            const Expression& e = parseLogicalOr();
+
+            if (token().type == Token::TK_TERNARY_QUEST)
+            {
+                nextToken();
+                const Expression& thenEx = parse(); //associativity: <-
+                consumeToken(Token::TK_TERNARY_COLON);
+                const Expression& elseEx = parse(); //
+
+                return manageObj(TernaryExp<Expr<int> >(dynamic_cast<const Expr<bool>&>(e),
+                                                        dynamic_cast<const Expr<int>&>(thenEx),
+                                                        dynamic_cast<const Expr<int>&>(elseEx)));
+            }
+            return e;
+        }
+
+        const Expression& parseLogicalOr()
+        {
+            const Expression* e = &parseLogicalAnd();
+            for (;;) //associativity: ->
+                if (token().type == Token::TK_OR)
+                {
+                    nextToken();
+                    const Expression& rhs = parseLogicalAnd();
+                    e = &manageObj(makeBiExp(*e, rhs, std::logical_or<bool>()));
+                }
+                else break;
+            return *e;
+        }
+
+        const Expression& parseLogicalAnd()
+        {
+            const Expression* e = &parseEquality();
+            for (;;) //associativity: ->
+                if (token().type == Token::TK_AND)
+                {
+                    nextToken();
+                    const Expression& rhs = parseEquality();
+
+                    e = &manageObj(makeBiExp(*e, rhs, std::logical_and<bool>()));
+                }
+                else break;
+            return *e;
+        }
+
+        const Expression& parseEquality()
+        {
+            const Expression& e = parseRelational();
+
+            Token::Type t = token().type;
+            if (t == Token::TK_EQUAL || t == Token::TK_NOT_EQUAL) //associativity: n/a
+            {
+                nextToken();
+                const Expression& rhs = parseRelational();
+
+                if (t == Token::TK_EQUAL)
+                    return manageObj(makeBiExp(e, rhs, std::equal_to<int>()));
+                else
+                    return manageObj(makeBiExp(e, rhs, std::not_equal_to<int>()));
+            }
+            return e;
+        }
+
+        const Expression& parseRelational()
+        {
+            const Expression& e = parseMultiplicative();
+
+            Token::Type t = token().type;
+            if (t == Token::TK_LESS      || //associativity: n/a
+                t == Token::TK_LESS_EQUAL||
+                t == Token::TK_GREATER   ||
+                t == Token::TK_GREATER_EQUAL)
+            {
+                nextToken();
+                const Expression& rhs = parseMultiplicative();
+
+                if (t == Token::TK_LESS)          return manageObj(makeBiExp(e, rhs, std::less         <int>()));
+                if (t == Token::TK_LESS_EQUAL)    return manageObj(makeBiExp(e, rhs, std::less_equal   <int>()));
+                if (t == Token::TK_GREATER)       return manageObj(makeBiExp(e, rhs, std::greater      <int>()));
+                if (t == Token::TK_GREATER_EQUAL) return manageObj(makeBiExp(e, rhs, std::greater_equal<int>()));
+            }
+            return e;
+        }
+
+        const Expression& parseMultiplicative()
+        {
+            const Expression* e = &parsePrimary();
+
+            for (;;) //associativity: ->
+                if (token().type == Token::TK_MODULUS)
+                {
+                    nextToken();
+                    const Expression& rhs = parsePrimary();
+
+                    //"compile-time" check: n % 0
+                    const LiteralNumberEx* literal = dynamic_cast<const LiteralNumberEx*>(&rhs);
+                    if (literal && literal->eval() == 0)
+                        throw ParsingError();
+
+                    e = &manageObj(makeBiExp(*e, rhs, std::modulus<int>()));
+                }
+                else break;
+            return *e;
+        }
+
+        const Expression& parsePrimary()
+        {
+            if (token().type == Token::TK_N)
+            {
+                nextToken();
+                return manageObj(NumberN(n_));
+            }
+            else if (token().type == Token::TK_NUMBER)
+            {
+                const int number = token().number;
+                nextToken();
+                return manageObj(LiteralNumberEx(number));
+            }
+            else if (token().type == Token::TK_BRACKET_LEFT)
+            {
+                nextToken();
+                const Expression& e = parse();
+
+                consumeToken(Token::TK_BRACKET_RIGHT);
+                return e;
+            }
+            else
+                throw ParsingError();
+        }
+
+        template <class T>
+        const T& manageObj(const T& obj)
+        {
+            boost::shared_ptr<Expression> newEntry(new T(obj));
+            dump_.push_back(newEntry);
+            return static_cast<T&>(*dump_.back());
+        }
+
+        Scanner scn;
+        Token tk;
+
+        int& n_;
+        DumpList& dump_; //manage polymorphc object lifetimes
+    };
 
-    int count;
     const Expr<int>* expr;
     mutable int n_;
+    int count;
 
-    std::list<boost::any> dump; //manage polymorphc object lifetimes
+    PluralForm::DumpList dump; //manage polymorphc object lifetimes
 };
 
 
-    PluralForm dummy(L"nplurals=3; plural=n == 1 ? 0 : n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 10 || n % 100 > 20) ? 1 : 2");
-    int ddf = dummy.formCount();
-    int kddf = dummy.getForm(0);
-*/
+const wchar_t formPol[] = L"nplurals=3; plural=n == 1 ? 0 : n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 10 || n % 100 > 20) ? 1 : 2";
+int tstPol(int n)
+{
+    return n == 1 ? 0 : n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 10 || n % 100 > 20) ? 1 : 2;
+}
 
+const wchar_t formRu[] = L"nplurals= 3; plural=n % 10 == 1 && n % 100 != 11 ? 0 : n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 10 || n % 100 > 20) ? 1 : 2";
+int tstRu(int n)
+{
+    return n % 10 == 1 && n % 100 != 11 ? 0 : n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 10 || n % 100 > 20) ? 1 : 2 ;
+}
+
+const wchar_t formLit[] = L"nplurals =3; plural=n% 10 == 1&& n % 100 != 11 ? 0 : n % 100 != 12&& n % 10 == 2 ? 1 : 0";
+int tstLit(int n)
+{
+    return n % 10 == 1&& n % 100 != 11 ? 0 : n % 100 != 12&& n % 10 == 2 ? 1 : 0;
+}
+
+const wchar_t formArab[] = L"nplurals = 6; plural = n == 0 ? 0 : n == 1 ? 1 : n == 2 ? 2 : (n % 100 >= 3 && n % 100 <= 10) ? 3 : (n % 100 >= 11 && n % 100 <= 99) || (n % 100 == 1) || (n % 100 ==2) ? 4 : 5";
+int tstArab(int n)
+{
+    return n == 0 ? 0 : n == 1 ? 1 : n == 2 ? 2 : (n % 100 >= 3 && n % 100 <= 10) ? 3 : (n % 100 >= 11 && n % 100 <= 99) || (n % 100 == 1) || (n % 100 ==2) ? 4 : 5;
+}
+
+const wchar_t formGerm[] = L"nplurals=2; plural= n == 1 ? 0 : 1";
+int tstGerm(int n)
+{
+    return n == 1 ? 0 : 1;
+}
+
+const wchar_t formFren[] = L"nplurals=2; plural= n <= 1 ? 0 : 1";
+int tstFren(int n)
+{
+    return n <= 1 ? 0 : 1;
+}
+
+const wchar_t formJap[] = L"nplurals=1; plural=0";
+int tstJap(int n)
+{
+    return 0;
+}
+
+const wchar_t formRom[] = L"nplurals=3; plural= n == 1 ? 0 : n == 0 || (n % 100 >= 1 && n % 100 <= 20) ? 1 : 2	";
+int tstRom(int n)
+{
+    return n == 1 ? 0 : n == 0 || (n % 100 >= 1 && n % 100 <= 20) ? 1 : 2	;
+}
+
+const wchar_t formCze[] = L" nplurals=3; plural= n % 100 == 1 ? 0 : n % 100 >= 2 && n % 100 <= 4 ? 1 : 2";
+int tstCze(int n)
+{
+    return n % 100 == 1 ? 0 : n % 100 >= 2 && n % 100 <= 4 ? 1 : 2;
+}
+
+const wchar_t formSlov[] = L" nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3 ";
+int tstSlov(int n)
+{
+    return n % 100 == 1 ? 0 : n % 100 == 2 ? 1 : n % 100 == 3 || n % 100 == 4 ? 2 : 3;
+}
+
+void unitTest()
+{
+    typedef int (*TestFun)(int);
+    typedef std::vector<std::pair<const wchar_t*, TestFun> > PhraseFunList;
+    PhraseFunList phrases;
+    phrases.push_back(std::make_pair(formPol,  &tstPol));
+    phrases.push_back(std::make_pair(formRu,   &tstRu));
+    phrases.push_back(std::make_pair(formLit,  &tstLit));
+    phrases.push_back(std::make_pair(formArab, &tstArab));
+    phrases.push_back(std::make_pair(formGerm, &tstGerm));
+    phrases.push_back(std::make_pair(formFren, &tstFren));
+    phrases.push_back(std::make_pair(formJap,  &tstJap));
+    phrases.push_back(std::make_pair(formRom,  &tstRom));
+    phrases.push_back(std::make_pair(formCze,  &tstCze));
+    phrases.push_back(std::make_pair(formSlov, &tstSlov));
+
+    for (PhraseFunList::const_iterator i = phrases.begin(); i != phrases.end(); ++i)
+    {
+        PluralForm pf(i->first);
+        for (int j = 0; j < 10000000; ++j)
+            assert((i->second)(j) == pf.getForm(j));
+    }
+}
 
 
 wxString ffs3::translate(const wxString& original) //translate into currently selected language
 {
+	/*
+    int ba = 3;
+
+    unitTest();
+
+#ifndef _MSC_VER
+#warning 3434
+#endif
+
+	*/
+
+
+
     //look for translation in buffer table
     const Translation::const_iterator i = activeTranslation.find(original);
     if (i != activeTranslation.end())
diff --git a/shared/recycler.cpp b/shared/recycler.cpp
index a2b080c9..4fedf01f 100644
--- a/shared/recycler.cpp
+++ b/shared/recycler.cpp
@@ -146,12 +146,12 @@ void moveToWindowsRecycler(const std::vector<Zstring>& filesToDelete)  //throw (
 }
 
 
-void ffs3::moveToRecycleBin(const Zstring& fileToDelete)  //throw (FileError)
+bool ffs3::moveToRecycleBin(const Zstring& fileToDelete)  //throw (FileError)
 {
 #ifdef FFS_WIN
     const Zstring filenameFmt = applyLongPathPrefix(fileToDelete);
     if (::GetFileAttributes(filenameFmt.c_str()) == INVALID_FILE_ATTRIBUTES)
-        return; //neither file nor any other object with that name existing: no error situation, manual deletion relies on it!
+        return false; //neither file nor any other object with that name existing: no error situation, manual deletion relies on it!
 
     std::vector<Zstring> fileNames;
     fileNames.push_back(fileToDelete);
@@ -160,7 +160,7 @@ void ffs3::moveToRecycleBin(const Zstring& fileToDelete)  //throw (FileError)
 #elif defined FFS_LINUX
     struct stat fileInfo;
     if (::lstat(fileToDelete.c_str(), &fileInfo) != 0)
-        return; //neither file nor any other object with that name existing: no error situation, manual deletion relies on it!
+        return false; //neither file nor any other object with that name existing: no error situation, manual deletion relies on it!
 
 
     Glib::RefPtr<Gio::File> fileObj = Gio::File::create_for_path(fileToDelete.c_str()); //never fails
@@ -181,6 +181,7 @@ void ffs3::moveToRecycleBin(const Zstring& fileToDelete)  //throw (FileError)
                         wxT("(") + errorMessage + wxT(")"));
     }
 #endif
+return true;
 }
 
 
diff --git a/shared/recycler.h b/shared/recycler.h
index b9fc9719..404d6f06 100644
--- a/shared/recycler.h
+++ b/shared/recycler.h
@@ -33,7 +33,7 @@ Linker flag:
 bool recycleBinExists(); //test existence of Recycle Bin API on current system
 
 //move a file or folder to Recycle Bin
-void moveToRecycleBin(const Zstring& fileToDelete);  //throw (FileError)
+bool moveToRecycleBin(const Zstring& fileToDelete); //return "true" if file/dir was actually deleted; throw (FileError)
 }
 
 #endif // RECYCLER_H_INCLUDED
diff --git a/synchronization.cpp b/synchronization.cpp
index f98e15f6..d131b567 100644
--- a/synchronization.cpp
+++ b/synchronization.cpp
@@ -699,7 +699,7 @@ struct CallbackRemoveDirImpl : public CallbackRemoveDir
 {
     CallbackRemoveDirImpl(StatusHandler& handler) : statusHandler_(handler) {}
 
-    virtual void requestUiRefresh(const Zstring& currentObject)
+    virtual void notifyDeletion(const Zstring& currentObject)
     {
         statusHandler_.requestUiRefresh(); //exceptions may be thrown here!
     }
@@ -943,8 +943,8 @@ void SynchronizeFolderPair::execute(HierarchyObject& hierObj)
     //synchronize files:
     for (HierarchyObject::SubFileMapping::iterator i = hierObj.useSubFiles().begin(); i != hierObj.useSubFiles().end(); ++i)
     {
-        if (( reduceDiskSpace &&  diskSpaceIsReduced(*i)) ||
-            (!reduceDiskSpace && !diskSpaceIsReduced(*i)))
+		const bool letsDoThis = reduceDiskSpace == diskSpaceIsReduced(*i);
+        if (letsDoThis)
             tryReportingError(statusUpdater_, boost::bind(&SynchronizeFolderPair::synchronizeFile, this, boost::ref(*i)));
     }
 
@@ -958,14 +958,17 @@ void SynchronizeFolderPair::execute(HierarchyObject& hierObj)
     {
         const SyncOperation syncOp = i->getSyncOperation();
 
-        if (( reduceDiskSpace &&  diskSpaceIsReduced(*i)) || //ensure folder creation happens in second pass, to enable time adaption below
-            (!reduceDiskSpace && !diskSpaceIsReduced(*i)))   //
+		 //ensure folder creation happens in second pass, to enable time adaption below
+		const bool letsDoThis = reduceDiskSpace == diskSpaceIsReduced(*i);
+
+        if (letsDoThis)
             tryReportingError(statusUpdater_, boost::bind(&SynchronizeFolderPair::synchronizeFolder, this, boost::ref(*i)));
 
         //recursive synchronization:
         execute<reduceDiskSpace>(*i);
 
         //adapt folder modification dates: apply AFTER all subobjects have been synced to preserve folder modification date!
+		if (letsDoThis)
         try
         {
             switch (syncOp)
@@ -1905,7 +1908,7 @@ void SynchronizeFolderPair::copyFileUpdating(const Zstring& source, const Zstrin
         const Zstring targetDir   = target.BeforeLast(common::FILE_NAME_SEPARATOR);
         const Zstring templateDir = source.BeforeLast(common::FILE_NAME_SEPARATOR);
 
-        if (!targetDir.empty() && !ffs3::dirExists(targetDir))
+        if (!targetDir.empty())
         {
             ffs3::createDirectory(targetDir, templateDir, copyFilePermissions_); //throw (FileError)
             /*symbolic link handling:
diff --git a/ui/gui_generated.cpp b/ui/gui_generated.cpp
index 9a1328a7..a1bc1679 100644
--- a/ui/gui_generated.cpp
+++ b/ui/gui_generated.cpp
@@ -17,848 +17,848 @@
 
 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-L"), 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 );
-	
-	
-	bSizerTopButtons->Add( 15, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	wxFlexGridSizer* fgSizer121;
-	fgSizer121 = new wxFlexGridSizer( 2, 2, 0, 0 );
-	fgSizer121->SetFlexibleDirection( wxBOTH );
-	fgSizer121->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	m_staticTextCmpVariant = new wxStaticText( m_panelTopButtons, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextCmpVariant->Wrap( -1 );
-	m_staticTextCmpVariant->SetFont( wxFont( 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 );
-	
-	bSizerTopButtons->Add( fgSizer121, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 );
-	
-	
-	bSizerTopButtons->Add( 0, 0, 1, 0, 5 );
-	
-	wxFlexGridSizer* fgSizer12;
-	fgSizer12 = new wxFlexGridSizer( 2, 2, 0, 0 );
-	fgSizer12->SetFlexibleDirection( wxBOTH );
-	fgSizer12->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	
-	fgSizer12->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticTextSyncVariant = new wxStaticText( m_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( -1,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 );
-	
-	bSizerTopButtons->Add( fgSizer12, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 );
-	
-	
-	bSizerTopButtons->Add( 15, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_panelTopButtons->SetSizer( bSizerTopButtons );
-	m_panelTopButtons->Layout();
-	bSizerTopButtons->Fit( m_panelTopButtons );
-	bSizerPanelHolder->Add( m_panelTopButtons, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	m_panelDirectoryPairs = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer1601;
-	bSizer1601 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer91;
-	bSizer91 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_panelTopLeft = new wxPanel( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panelTopLeft->SetMinSize( wxSize( 1,1 ) );
-	
-	sbSizerDirLeft = new wxStaticBoxSizer( new wxStaticBox( m_panelTopLeft, wxID_ANY, _("Drag && drop") ), wxHORIZONTAL );
-	
-	m_directoryLeft = new CustomComboBox( m_panelTopLeft, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
-	sbSizerDirLeft->Add( m_directoryLeft, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_dirPickerLeft = new FfsDirPickerCtrl( m_panelTopLeft, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_dirPickerLeft->SetToolTip( _("Select a folder") );
-	
-	sbSizerDirLeft->Add( m_dirPickerLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_panelTopLeft->SetSizer( sbSizerDirLeft );
-	m_panelTopLeft->Layout();
-	sbSizerDirLeft->Fit( m_panelTopLeft );
-	bSizer91->Add( m_panelTopLeft, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_panelTopMiddle = new wxPanel( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer93;
-	bSizer93 = new wxBoxSizer( wxVERTICAL );
-	
-	
-	bSizer93->Add( 0, 3, 0, 0, 5 );
-	
-	m_bpButtonSwapSides = new wxBitmapButton( m_panelTopMiddle, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
-	m_bpButtonSwapSides->SetToolTip( _("Swap sides") );
-	
-	bSizer93->Add( m_bpButtonSwapSides, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer160;
-	bSizer160 = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizer160->Add( 0, 0, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonLocalFilter = new wxBitmapButton( m_panelTopMiddle, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
-	bSizer160->Add( m_bpButtonLocalFilter, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer160->Add( 5, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonAltSyncCfg = new wxBitmapButton( m_panelTopMiddle, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
-	bSizer160->Add( m_bpButtonAltSyncCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer160->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	bSizer93->Add( bSizer160, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_panelTopMiddle->SetSizer( bSizer93 );
-	m_panelTopMiddle->Layout();
-	bSizer93->Fit( m_panelTopMiddle );
-	bSizer91->Add( m_panelTopMiddle, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	m_panelTopRight = new wxPanel( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panelTopRight->SetMinSize( wxSize( 1,1 ) );
-	
-	sbSizerDirRight = new wxStaticBoxSizer( new wxStaticBox( m_panelTopRight, wxID_ANY, _("Drag && drop") ), wxHORIZONTAL );
-	
-	m_bpButtonAddPair = new wxBitmapButton( m_panelTopRight, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
-	m_bpButtonAddPair->SetToolTip( _("Add folder pair") );
-	
-	sbSizerDirRight->Add( m_bpButtonAddPair, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 3 );
-	
-	m_bpButtonRemovePair = new wxBitmapButton( m_panelTopRight, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
-	m_bpButtonRemovePair->SetToolTip( _("Remove folder pair") );
-	
-	sbSizerDirRight->Add( m_bpButtonRemovePair, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_directoryRight = new CustomComboBox( m_panelTopRight, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); 
-	sbSizerDirRight->Add( m_directoryRight, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_dirPickerRight = new FfsDirPickerCtrl( m_panelTopRight, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_dirPickerRight->SetToolTip( _("Select a folder") );
-	
-	sbSizerDirRight->Add( m_dirPickerRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_panelTopRight->SetSizer( sbSizerDirRight );
-	m_panelTopRight->Layout();
-	sbSizerDirRight->Fit( m_panelTopRight );
-	bSizer91->Add( m_panelTopRight, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	bSizer1601->Add( bSizer91, 0, wxEXPAND, 5 );
-	
-	m_scrolledWindowFolderPairs = new wxScrolledWindow( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxHSCROLL|wxVSCROLL );
-	m_scrolledWindowFolderPairs->SetScrollRate( 5, 5 );
-	m_scrolledWindowFolderPairs->SetMinSize( wxSize( -1,0 ) );
-	
-	bSizerAddFolderPairs = new wxBoxSizer( wxVERTICAL );
-	
-	m_scrolledWindowFolderPairs->SetSizer( bSizerAddFolderPairs );
-	m_scrolledWindowFolderPairs->Layout();
-	bSizerAddFolderPairs->Fit( m_scrolledWindowFolderPairs );
-	bSizer1601->Add( m_scrolledWindowFolderPairs, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	m_panelDirectoryPairs->SetSizer( bSizer1601 );
-	m_panelDirectoryPairs->Layout();
-	bSizer1601->Fit( m_panelDirectoryPairs );
-	bSizerPanelHolder->Add( m_panelDirectoryPairs, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	m_panelGrids = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	m_panelGrids->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_APPWORKSPACE ) );
-	
-	bSizerGridHolder = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_panelLeft = new wxPanel( m_panelGrids, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer7;
-	bSizer7 = new wxBoxSizer( wxVERTICAL );
-	
-	m_gridLeft = new CustomGridLeft( m_panelLeft, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	
-	// Grid
-	m_gridLeft->CreateGrid( 15, 4 );
-	m_gridLeft->EnableEditing( false );
-	m_gridLeft->EnableGridLines( true );
-	m_gridLeft->EnableDragGridSize( true );
-	m_gridLeft->SetMargins( 0, 0 );
-	
-	// Columns
-	m_gridLeft->EnableDragColMove( false );
-	m_gridLeft->EnableDragColSize( true );
-	m_gridLeft->SetColLabelSize( 20 );
-	m_gridLeft->SetColLabelAlignment( wxALIGN_LEFT, wxALIGN_CENTRE );
-	
-	// Rows
-	m_gridLeft->EnableDragRowSize( false );
-	m_gridLeft->SetRowLabelSize( 38 );
-	m_gridLeft->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
-	// Label Appearance
-	
-	// Cell Defaults
-	m_gridLeft->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTRE );
-	m_gridLeft->SetMinSize( wxSize( 1,1 ) );
-	
-	bSizer7->Add( m_gridLeft, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT, 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, 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|wxLEFT, 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_NEEDED_SB|wxLB_SINGLE|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 );
-	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 );
-	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 );
-	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 );
-	m_textCtrlData->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
-	m_textCtrlData->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-	m_textCtrlData->SetToolTip( _("Total amount of data that will be transferred") );
-	
-	fgSizer6->Add( m_textCtrlData, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizerStatistics->Add( fgSizer6, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
-	
-	
-	bSizerStatistics->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_panelStatistics->SetSizer( bSizerStatistics );
-	m_panelStatistics->Layout();
-	bSizerStatistics->Fit( m_panelStatistics );
-	bSizerPanelHolder->Add( m_panelStatistics, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_panelViewFilter = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	bSizerViewFilter = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizerViewFilter->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_bpButtonSyncCreateLeft = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonSyncCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonSyncDirOverwLeft = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonSyncDirOverwLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonSyncDeleteLeft = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonSyncDeleteLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonLeftOnly = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonLeftOnly, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonLeftNewer = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonLeftNewer, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonEqual = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonEqual, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonDifferent = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonDifferent, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonSyncDirNone = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonSyncDirNone, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonRightNewer = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonRightNewer, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonRightOnly = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonRightOnly, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonSyncDeleteRight = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonSyncDeleteRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonSyncDirOverwRight = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonSyncDirOverwRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonSyncCreateRight = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonSyncCreateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_bpButtonConflict = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	bSizerViewFilter->Add( m_bpButtonConflict, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	bSizerViewFilter->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_panelViewFilter->SetSizer( bSizerViewFilter );
-	m_panelViewFilter->Layout();
-	bSizerViewFilter->Fit( m_panelViewFilter );
-	bSizerPanelHolder->Add( m_panelViewFilter, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_panelStatusBar = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSTATIC_BORDER|wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer451;
-	bSizer451 = new wxBoxSizer( wxHORIZONTAL );
-	
-	bSizer451->SetMinSize( wxSize( -1,22 ) ); 
-	wxBoxSizer* bSizer53;
-	bSizer53 = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizer53->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticTextStatusLeft = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextStatusLeft->Wrap( -1 );
-	m_staticTextStatusLeft->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer53->Add( m_staticTextStatusLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	bSizer53->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer451->Add( bSizer53, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	m_staticline9 = new wxStaticLine( m_panelStatusBar, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-	bSizer451->Add( m_staticline9, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxEXPAND, 2 );
-	
-	
-	bSizer451->Add( 26, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticTextStatusMiddle = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextStatusMiddle->Wrap( -1 );
-	m_staticTextStatusMiddle->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer451->Add( m_staticTextStatusMiddle, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	bSizer451->Add( 26, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticline10 = new wxStaticLine( m_panelStatusBar, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-	bSizer451->Add( m_staticline10, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP, 2 );
-	
-	wxBoxSizer* bSizer52;
-	bSizer52 = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizer52->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticTextStatusRight = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextStatusRight->Wrap( -1 );
-	m_staticTextStatusRight->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer52->Add( m_staticTextStatusRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	wxBoxSizer* bSizer50;
-	bSizer50 = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizer50->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bitmap15 = new wxStaticBitmap( m_panelStatusBar, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 10,10 ), 0 );
-	bSizer50->Add( m_bitmap15, 0, wxALIGN_BOTTOM, 2 );
-	
-	bSizer52->Add( bSizer50, 1, wxALIGN_BOTTOM|wxEXPAND, 5 );
-	
-	bSizer451->Add( bSizer52, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_panelStatusBar->SetSizer( bSizer451 );
-	m_panelStatusBar->Layout();
-	bSizer451->Fit( m_panelStatusBar );
-	bSizerPanelHolder->Add( m_panelStatusBar, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	this->SetSizer( bSizerPanelHolder );
-	this->Layout();
-	bSizerPanelHolder->Fit( this );
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainDialogGenerated::OnClose ) );
-	this->Connect( m_menuItem10->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnCompare ) );
-	this->Connect( m_menuItem11->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnStartSync ) );
-	this->Connect( m_menuItemSwitchView->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnSwitchView ) );
-	this->Connect( m_menuItemNew->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnNewConfig ) );
-	this->Connect( m_menuItemSave->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnSaveConfig ) );
-	this->Connect( m_menuItemLoad->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnLoadConfig ) );
-	this->Connect( m_menuItem4->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuQuit ) );
-	this->Connect( m_menuItemGlobSett->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuGlobalSettings ) );
-	this->Connect( m_menuItem7->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuBatchJob ) );
-	this->Connect( m_menuItem5->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuExportFileList ) );
-	this->Connect( m_menuItemReadme->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnShowHelp ) );
-	this->Connect( m_menuItemCheckVer->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuCheckVersion ) );
-	this->Connect( m_menuItemAbout->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuAbout ) );
-	m_buttonCompare->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnCompare ), NULL, this );
-	m_bpButtonCmpConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnCmpSettings ), NULL, this );
-	m_bpButtonSyncConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncSettings ), NULL, this );
-	m_buttonStartSync->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnStartSync ), NULL, this );
-	m_dirPickerLeft->Connect( wxEVT_COMMAND_DIRPICKER_CHANGED, wxFileDirPickerEventHandler( MainDialogGenerated::OnDirSelected ), NULL, this );
-	m_bpButtonSwapSides->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSwapSides ), NULL, this );
-	m_bpButtonAddPair->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnAddFolderPair ), NULL, this );
-	m_bpButtonRemovePair->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnRemoveTopFolderPair ), NULL, this );
-	m_dirPickerRight->Connect( wxEVT_COMMAND_DIRPICKER_CHANGED, wxFileDirPickerEventHandler( MainDialogGenerated::OnDirSelected ), NULL, this );
-	m_gridLeft->Connect( wxEVT_GRID_CELL_LEFT_DCLICK, wxGridEventHandler( MainDialogGenerated::OnLeftGridDoubleClick ), NULL, this );
-	m_gridLeft->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRim ), NULL, this );
-	m_gridLeft->Connect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( MainDialogGenerated::OnSortLeftGrid ), NULL, this );
-	m_gridLeft->Connect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRimLabelLeft ), NULL, this );
-	m_gridMiddle->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextMiddle ), NULL, this );
-	m_gridMiddle->Connect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( MainDialogGenerated::OnSortMiddleGrid ), NULL, this );
-	m_gridMiddle->Connect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextMiddleLabel ), NULL, this );
-	m_gridRight->Connect( wxEVT_GRID_CELL_LEFT_DCLICK, wxGridEventHandler( MainDialogGenerated::OnRightGridDoubleClick ), NULL, this );
-	m_gridRight->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRim ), NULL, this );
-	m_gridRight->Connect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( MainDialogGenerated::OnSortRightGrid ), NULL, this );
-	m_gridRight->Connect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRimLabelRight ), NULL, this );
-	m_bpButtonSave->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSaveConfig ), NULL, this );
-	m_bpButtonLoad->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnLoadConfig ), NULL, this );
-	m_listBoxHistory->Connect( wxEVT_CHAR, wxKeyEventHandler( MainDialogGenerated::OnCfgHistoryKeyEvent ), NULL, this );
-	m_listBoxHistory->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnLoadFromHistory ), NULL, this );
-	m_bpButtonFilter->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigureFilter ), NULL, this );
-	m_checkBoxHideFilt->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnHideFilteredButton ), NULL, this );
-	m_bpButtonSyncCreateLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncCreateLeft ), NULL, this );
-	m_bpButtonSyncDirOverwLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDirLeft ), NULL, this );
-	m_bpButtonSyncDeleteLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDeleteLeft ), NULL, this );
-	m_bpButtonLeftOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnLeftOnlyFiles ), NULL, this );
-	m_bpButtonLeftNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnLeftNewerFiles ), NULL, this );
-	m_bpButtonEqual->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnEqualFiles ), NULL, this );
-	m_bpButtonDifferent->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnDifferentFiles ), NULL, this );
-	m_bpButtonSyncDirNone->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDirNone ), NULL, this );
-	m_bpButtonRightNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnRightNewerFiles ), NULL, this );
-	m_bpButtonRightOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnRightOnlyFiles ), NULL, this );
-	m_bpButtonSyncDeleteRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDeleteRight ), NULL, this );
-	m_bpButtonSyncDirOverwRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDirRight ), NULL, this );
-	m_bpButtonSyncCreateRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncCreateRight ), NULL, this );
-	m_bpButtonConflict->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConflictFiles ), NULL, this );
+    this->SetSizeHints( wxSize( 640,400 ), wxDefaultSize );
+
+    m_menubar1 = new wxMenuBar( 0 );
+    m_menuFile = new wxMenu();
+    m_menuItem10 = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("1. &Compare") ) + wxT('\t') + wxT("F5"), wxEmptyString, wxITEM_NORMAL );
+    m_menuFile->Append( m_menuItem10 );
+
+    m_menuItem11 = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("2. &Synchronize...") ) + wxT('\t') + wxT("F6"), wxEmptyString, wxITEM_NORMAL );
+    m_menuFile->Append( m_menuItem11 );
+
+    wxMenuItem* m_separator1;
+    m_separator1 = m_menuFile->AppendSeparator();
+
+    m_menuItemSwitchView = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("S&witch view") ) + wxT('\t') + wxT("F8"), wxEmptyString, wxITEM_NORMAL );
+    m_menuFile->Append( m_menuItemSwitchView );
+
+    wxMenuItem* m_separator2;
+    m_separator2 = m_menuFile->AppendSeparator();
+
+    m_menuItemNew = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("&New") ) + wxT('\t') + wxT("CTRL-N"), wxEmptyString, wxITEM_NORMAL );
+    m_menuFile->Append( m_menuItemNew );
+
+    m_menuItemSave = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("S&ave configuration...") ) + wxT('\t') + wxT("CTRL-S"), wxEmptyString, wxITEM_NORMAL );
+    m_menuFile->Append( m_menuItemSave );
+
+    m_menuItemLoad = new wxMenuItem( m_menuFile, wxID_ANY, wxString( _("&Load configuration...") ) + wxT('\t') + wxT("CTRL-L"), 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 );
+
+
+    bSizerTopButtons->Add( 15, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    wxFlexGridSizer* fgSizer121;
+    fgSizer121 = new wxFlexGridSizer( 2, 2, 0, 0 );
+    fgSizer121->SetFlexibleDirection( wxBOTH );
+    fgSizer121->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    m_staticTextCmpVariant = new wxStaticText( m_panelTopButtons, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextCmpVariant->Wrap( -1 );
+    m_staticTextCmpVariant->SetFont( wxFont( 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 );
+
+    bSizerTopButtons->Add( fgSizer121, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 );
+
+
+    bSizerTopButtons->Add( 0, 0, 1, 0, 5 );
+
+    wxFlexGridSizer* fgSizer12;
+    fgSizer12 = new wxFlexGridSizer( 2, 2, 0, 0 );
+    fgSizer12->SetFlexibleDirection( wxBOTH );
+    fgSizer12->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+
+    fgSizer12->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticTextSyncVariant = new wxStaticText( m_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( -1,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 );
+
+    bSizerTopButtons->Add( fgSizer12, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 );
+
+
+    bSizerTopButtons->Add( 15, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_panelTopButtons->SetSizer( bSizerTopButtons );
+    m_panelTopButtons->Layout();
+    bSizerTopButtons->Fit( m_panelTopButtons );
+    bSizerPanelHolder->Add( m_panelTopButtons, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+    m_panelDirectoryPairs = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer1601;
+    bSizer1601 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer91;
+    bSizer91 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_panelTopLeft = new wxPanel( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panelTopLeft->SetMinSize( wxSize( 1,1 ) );
+
+    sbSizerDirLeft = new wxStaticBoxSizer( new wxStaticBox( m_panelTopLeft, wxID_ANY, _("Drag && drop") ), wxHORIZONTAL );
+
+    m_directoryLeft = new CustomComboBox( m_panelTopLeft, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+    sbSizerDirLeft->Add( m_directoryLeft, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_dirPickerLeft = new FfsDirPickerCtrl( m_panelTopLeft, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_dirPickerLeft->SetToolTip( _("Select a folder") );
+
+    sbSizerDirLeft->Add( m_dirPickerLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_panelTopLeft->SetSizer( sbSizerDirLeft );
+    m_panelTopLeft->Layout();
+    sbSizerDirLeft->Fit( m_panelTopLeft );
+    bSizer91->Add( m_panelTopLeft, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_panelTopMiddle = new wxPanel( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer93;
+    bSizer93 = new wxBoxSizer( wxVERTICAL );
+
+
+    bSizer93->Add( 0, 3, 0, 0, 5 );
+
+    m_bpButtonSwapSides = new wxBitmapButton( m_panelTopMiddle, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxBU_AUTODRAW );
+    m_bpButtonSwapSides->SetToolTip( _("Swap sides") );
+
+    bSizer93->Add( m_bpButtonSwapSides, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer160;
+    bSizer160 = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizer160->Add( 0, 0, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonLocalFilter = new wxBitmapButton( m_panelTopMiddle, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
+    bSizer160->Add( m_bpButtonLocalFilter, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer160->Add( 5, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonAltSyncCfg = new wxBitmapButton( m_panelTopMiddle, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
+    bSizer160->Add( m_bpButtonAltSyncCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer160->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    bSizer93->Add( bSizer160, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_panelTopMiddle->SetSizer( bSizer93 );
+    m_panelTopMiddle->Layout();
+    bSizer93->Fit( m_panelTopMiddle );
+    bSizer91->Add( m_panelTopMiddle, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    m_panelTopRight = new wxPanel( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panelTopRight->SetMinSize( wxSize( 1,1 ) );
+
+    sbSizerDirRight = new wxStaticBoxSizer( new wxStaticBox( m_panelTopRight, wxID_ANY, _("Drag && drop") ), wxHORIZONTAL );
+
+    m_bpButtonAddPair = new wxBitmapButton( m_panelTopRight, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
+    m_bpButtonAddPair->SetToolTip( _("Add folder pair") );
+
+    sbSizerDirRight->Add( m_bpButtonAddPair, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 3 );
+
+    m_bpButtonRemovePair = new wxBitmapButton( m_panelTopRight, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
+    m_bpButtonRemovePair->SetToolTip( _("Remove folder pair") );
+
+    sbSizerDirRight->Add( m_bpButtonRemovePair, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_directoryRight = new CustomComboBox( m_panelTopRight, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
+    sbSizerDirRight->Add( m_directoryRight, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_dirPickerRight = new FfsDirPickerCtrl( m_panelTopRight, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_dirPickerRight->SetToolTip( _("Select a folder") );
+
+    sbSizerDirRight->Add( m_dirPickerRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_panelTopRight->SetSizer( sbSizerDirRight );
+    m_panelTopRight->Layout();
+    sbSizerDirRight->Fit( m_panelTopRight );
+    bSizer91->Add( m_panelTopRight, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    bSizer1601->Add( bSizer91, 0, wxEXPAND, 5 );
+
+    m_scrolledWindowFolderPairs = new wxScrolledWindow( m_panelDirectoryPairs, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxHSCROLL|wxVSCROLL );
+    m_scrolledWindowFolderPairs->SetScrollRate( 5, 5 );
+    m_scrolledWindowFolderPairs->SetMinSize( wxSize( -1,0 ) );
+
+    bSizerAddFolderPairs = new wxBoxSizer( wxVERTICAL );
+
+    m_scrolledWindowFolderPairs->SetSizer( bSizerAddFolderPairs );
+    m_scrolledWindowFolderPairs->Layout();
+    bSizerAddFolderPairs->Fit( m_scrolledWindowFolderPairs );
+    bSizer1601->Add( m_scrolledWindowFolderPairs, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    m_panelDirectoryPairs->SetSizer( bSizer1601 );
+    m_panelDirectoryPairs->Layout();
+    bSizer1601->Fit( m_panelDirectoryPairs );
+    bSizerPanelHolder->Add( m_panelDirectoryPairs, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+    m_panelGrids = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    m_panelGrids->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_APPWORKSPACE ) );
+
+    bSizerGridHolder = new wxBoxSizer( wxHORIZONTAL );
+
+    m_panelLeft = new wxPanel( m_panelGrids, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer7;
+    bSizer7 = new wxBoxSizer( wxVERTICAL );
+
+    m_gridLeft = new CustomGridLeft( m_panelLeft, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+
+    // Grid
+    m_gridLeft->CreateGrid( 15, 4 );
+    m_gridLeft->EnableEditing( false );
+    m_gridLeft->EnableGridLines( true );
+    m_gridLeft->EnableDragGridSize( true );
+    m_gridLeft->SetMargins( 0, 0 );
+
+    // Columns
+    m_gridLeft->EnableDragColMove( false );
+    m_gridLeft->EnableDragColSize( true );
+    m_gridLeft->SetColLabelSize( 20 );
+    m_gridLeft->SetColLabelAlignment( wxALIGN_LEFT, wxALIGN_CENTRE );
+
+    // Rows
+    m_gridLeft->EnableDragRowSize( false );
+    m_gridLeft->SetRowLabelSize( 38 );
+    m_gridLeft->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
+
+    // Label Appearance
+
+    // Cell Defaults
+    m_gridLeft->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_CENTRE );
+    m_gridLeft->SetMinSize( wxSize( 1,1 ) );
+
+    bSizer7->Add( m_gridLeft, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT, 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, 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|wxLEFT, 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_NEEDED_SB|wxLB_SINGLE|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 );
+    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 );
+    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 );
+    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 );
+    m_textCtrlData->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
+    m_textCtrlData->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+    m_textCtrlData->SetToolTip( _("Total amount of data that will be transferred") );
+
+    fgSizer6->Add( m_textCtrlData, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizerStatistics->Add( fgSizer6, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
+
+
+    bSizerStatistics->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_panelStatistics->SetSizer( bSizerStatistics );
+    m_panelStatistics->Layout();
+    bSizerStatistics->Fit( m_panelStatistics );
+    bSizerPanelHolder->Add( m_panelStatistics, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_panelViewFilter = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    bSizerViewFilter = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizerViewFilter->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_bpButtonSyncCreateLeft = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonSyncCreateLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonSyncDirOverwLeft = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonSyncDirOverwLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonSyncDeleteLeft = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonSyncDeleteLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonLeftOnly = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonLeftOnly, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonLeftNewer = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonLeftNewer, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonEqual = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonEqual, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonDifferent = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonDifferent, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonSyncDirNone = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonSyncDirNone, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonRightNewer = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonRightNewer, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonRightOnly = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonRightOnly, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonSyncDeleteRight = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonSyncDeleteRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonSyncDirOverwRight = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonSyncDirOverwRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonSyncCreateRight = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonSyncCreateRight, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_bpButtonConflict = new ToggleButton( m_panelViewFilter, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    bSizerViewFilter->Add( m_bpButtonConflict, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    bSizerViewFilter->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_panelViewFilter->SetSizer( bSizerViewFilter );
+    m_panelViewFilter->Layout();
+    bSizerViewFilter->Fit( m_panelViewFilter );
+    bSizerPanelHolder->Add( m_panelViewFilter, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_panelStatusBar = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSTATIC_BORDER|wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer451;
+    bSizer451 = new wxBoxSizer( wxHORIZONTAL );
+
+    bSizer451->SetMinSize( wxSize( -1,22 ) );
+    wxBoxSizer* bSizer53;
+    bSizer53 = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizer53->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticTextStatusLeft = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextStatusLeft->Wrap( -1 );
+    m_staticTextStatusLeft->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer53->Add( m_staticTextStatusLeft, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    bSizer53->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer451->Add( bSizer53, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    m_staticline9 = new wxStaticLine( m_panelStatusBar, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    bSizer451->Add( m_staticline9, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxEXPAND, 2 );
+
+
+    bSizer451->Add( 26, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticTextStatusMiddle = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextStatusMiddle->Wrap( -1 );
+    m_staticTextStatusMiddle->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer451->Add( m_staticTextStatusMiddle, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    bSizer451->Add( 26, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticline10 = new wxStaticLine( m_panelStatusBar, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    bSizer451->Add( m_staticline10, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP, 2 );
+
+    wxBoxSizer* bSizer52;
+    bSizer52 = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizer52->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticTextStatusRight = new wxStaticText( m_panelStatusBar, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextStatusRight->Wrap( -1 );
+    m_staticTextStatusRight->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer52->Add( m_staticTextStatusRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    wxBoxSizer* bSizer50;
+    bSizer50 = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizer50->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bitmap15 = new wxStaticBitmap( m_panelStatusBar, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 10,10 ), 0 );
+    bSizer50->Add( m_bitmap15, 0, wxALIGN_BOTTOM, 2 );
+
+    bSizer52->Add( bSizer50, 1, wxALIGN_BOTTOM|wxEXPAND, 5 );
+
+    bSizer451->Add( bSizer52, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_panelStatusBar->SetSizer( bSizer451 );
+    m_panelStatusBar->Layout();
+    bSizer451->Fit( m_panelStatusBar );
+    bSizerPanelHolder->Add( m_panelStatusBar, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+    this->SetSizer( bSizerPanelHolder );
+    this->Layout();
+    bSizerPanelHolder->Fit( this );
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainDialogGenerated::OnClose ) );
+    this->Connect( m_menuItem10->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnCompare ) );
+    this->Connect( m_menuItem11->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnStartSync ) );
+    this->Connect( m_menuItemSwitchView->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnSwitchView ) );
+    this->Connect( m_menuItemNew->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnNewConfig ) );
+    this->Connect( m_menuItemSave->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnSaveConfig ) );
+    this->Connect( m_menuItemLoad->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnLoadConfig ) );
+    this->Connect( m_menuItem4->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuQuit ) );
+    this->Connect( m_menuItemGlobSett->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuGlobalSettings ) );
+    this->Connect( m_menuItem7->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuBatchJob ) );
+    this->Connect( m_menuItem5->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuExportFileList ) );
+    this->Connect( m_menuItemReadme->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnShowHelp ) );
+    this->Connect( m_menuItemCheckVer->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuCheckVersion ) );
+    this->Connect( m_menuItemAbout->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuAbout ) );
+    m_buttonCompare->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnCompare ), NULL, this );
+    m_bpButtonCmpConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnCmpSettings ), NULL, this );
+    m_bpButtonSyncConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncSettings ), NULL, this );
+    m_buttonStartSync->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnStartSync ), NULL, this );
+    m_dirPickerLeft->Connect( wxEVT_COMMAND_DIRPICKER_CHANGED, wxFileDirPickerEventHandler( MainDialogGenerated::OnDirSelected ), NULL, this );
+    m_bpButtonSwapSides->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSwapSides ), NULL, this );
+    m_bpButtonAddPair->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnAddFolderPair ), NULL, this );
+    m_bpButtonRemovePair->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnRemoveTopFolderPair ), NULL, this );
+    m_dirPickerRight->Connect( wxEVT_COMMAND_DIRPICKER_CHANGED, wxFileDirPickerEventHandler( MainDialogGenerated::OnDirSelected ), NULL, this );
+    m_gridLeft->Connect( wxEVT_GRID_CELL_LEFT_DCLICK, wxGridEventHandler( MainDialogGenerated::OnLeftGridDoubleClick ), NULL, this );
+    m_gridLeft->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRim ), NULL, this );
+    m_gridLeft->Connect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( MainDialogGenerated::OnSortLeftGrid ), NULL, this );
+    m_gridLeft->Connect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRimLabelLeft ), NULL, this );
+    m_gridMiddle->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextMiddle ), NULL, this );
+    m_gridMiddle->Connect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( MainDialogGenerated::OnSortMiddleGrid ), NULL, this );
+    m_gridMiddle->Connect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextMiddleLabel ), NULL, this );
+    m_gridRight->Connect( wxEVT_GRID_CELL_LEFT_DCLICK, wxGridEventHandler( MainDialogGenerated::OnRightGridDoubleClick ), NULL, this );
+    m_gridRight->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRim ), NULL, this );
+    m_gridRight->Connect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( MainDialogGenerated::OnSortRightGrid ), NULL, this );
+    m_gridRight->Connect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRimLabelRight ), NULL, this );
+    m_bpButtonSave->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSaveConfig ), NULL, this );
+    m_bpButtonLoad->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnLoadConfig ), NULL, this );
+    m_listBoxHistory->Connect( wxEVT_CHAR, wxKeyEventHandler( MainDialogGenerated::OnCfgHistoryKeyEvent ), NULL, this );
+    m_listBoxHistory->Connect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnLoadFromHistory ), NULL, this );
+    m_bpButtonFilter->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigureFilter ), NULL, this );
+    m_checkBoxHideFilt->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnHideFilteredButton ), NULL, this );
+    m_bpButtonSyncCreateLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncCreateLeft ), NULL, this );
+    m_bpButtonSyncDirOverwLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDirLeft ), NULL, this );
+    m_bpButtonSyncDeleteLeft->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDeleteLeft ), NULL, this );
+    m_bpButtonLeftOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnLeftOnlyFiles ), NULL, this );
+    m_bpButtonLeftNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnLeftNewerFiles ), NULL, this );
+    m_bpButtonEqual->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnEqualFiles ), NULL, this );
+    m_bpButtonDifferent->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnDifferentFiles ), NULL, this );
+    m_bpButtonSyncDirNone->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDirNone ), NULL, this );
+    m_bpButtonRightNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnRightNewerFiles ), NULL, this );
+    m_bpButtonRightOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnRightOnlyFiles ), NULL, this );
+    m_bpButtonSyncDeleteRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDeleteRight ), NULL, this );
+    m_bpButtonSyncDirOverwRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDirRight ), NULL, this );
+    m_bpButtonSyncCreateRight->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncCreateRight ), NULL, this );
+    m_bpButtonConflict->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConflictFiles ), NULL, this );
 }
 
 MainDialogGenerated::~MainDialogGenerated()
 {
-	// Disconnect Events
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainDialogGenerated::OnClose ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnCompare ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnStartSync ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnSwitchView ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnNewConfig ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnSaveConfig ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnLoadConfig ) );
-	this->Disconnect( wxID_EXIT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuQuit ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuGlobalSettings ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuBatchJob ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuExportFileList ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnShowHelp ) );
-	this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuCheckVersion ) );
-	this->Disconnect( wxID_ABOUT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuAbout ) );
-	m_buttonCompare->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnCompare ), NULL, this );
-	m_bpButtonCmpConfig->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnCmpSettings ), NULL, this );
-	m_bpButtonSyncConfig->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncSettings ), NULL, this );
-	m_buttonStartSync->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnStartSync ), NULL, this );
-	m_dirPickerLeft->Disconnect( wxEVT_COMMAND_DIRPICKER_CHANGED, wxFileDirPickerEventHandler( MainDialogGenerated::OnDirSelected ), NULL, this );
-	m_bpButtonSwapSides->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSwapSides ), NULL, this );
-	m_bpButtonAddPair->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnAddFolderPair ), NULL, this );
-	m_bpButtonRemovePair->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnRemoveTopFolderPair ), NULL, this );
-	m_dirPickerRight->Disconnect( wxEVT_COMMAND_DIRPICKER_CHANGED, wxFileDirPickerEventHandler( MainDialogGenerated::OnDirSelected ), NULL, this );
-	m_gridLeft->Disconnect( wxEVT_GRID_CELL_LEFT_DCLICK, wxGridEventHandler( MainDialogGenerated::OnLeftGridDoubleClick ), NULL, this );
-	m_gridLeft->Disconnect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRim ), NULL, this );
-	m_gridLeft->Disconnect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( MainDialogGenerated::OnSortLeftGrid ), NULL, this );
-	m_gridLeft->Disconnect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRimLabelLeft ), NULL, this );
-	m_gridMiddle->Disconnect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextMiddle ), NULL, this );
-	m_gridMiddle->Disconnect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( MainDialogGenerated::OnSortMiddleGrid ), NULL, this );
-	m_gridMiddle->Disconnect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextMiddleLabel ), NULL, this );
-	m_gridRight->Disconnect( wxEVT_GRID_CELL_LEFT_DCLICK, wxGridEventHandler( MainDialogGenerated::OnRightGridDoubleClick ), NULL, this );
-	m_gridRight->Disconnect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRim ), NULL, this );
-	m_gridRight->Disconnect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( MainDialogGenerated::OnSortRightGrid ), NULL, this );
-	m_gridRight->Disconnect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRimLabelRight ), NULL, this );
-	m_bpButtonSave->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSaveConfig ), NULL, this );
-	m_bpButtonLoad->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnLoadConfig ), NULL, this );
-	m_listBoxHistory->Disconnect( wxEVT_CHAR, wxKeyEventHandler( MainDialogGenerated::OnCfgHistoryKeyEvent ), NULL, this );
-	m_listBoxHistory->Disconnect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnLoadFromHistory ), NULL, this );
-	m_bpButtonFilter->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigureFilter ), NULL, this );
-	m_checkBoxHideFilt->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnHideFilteredButton ), NULL, this );
-	m_bpButtonSyncCreateLeft->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncCreateLeft ), NULL, this );
-	m_bpButtonSyncDirOverwLeft->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDirLeft ), NULL, this );
-	m_bpButtonSyncDeleteLeft->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDeleteLeft ), NULL, this );
-	m_bpButtonLeftOnly->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnLeftOnlyFiles ), NULL, this );
-	m_bpButtonLeftNewer->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnLeftNewerFiles ), NULL, this );
-	m_bpButtonEqual->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnEqualFiles ), NULL, this );
-	m_bpButtonDifferent->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnDifferentFiles ), NULL, this );
-	m_bpButtonSyncDirNone->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDirNone ), NULL, this );
-	m_bpButtonRightNewer->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnRightNewerFiles ), NULL, this );
-	m_bpButtonRightOnly->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnRightOnlyFiles ), NULL, this );
-	m_bpButtonSyncDeleteRight->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDeleteRight ), NULL, this );
-	m_bpButtonSyncDirOverwRight->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDirRight ), NULL, this );
-	m_bpButtonSyncCreateRight->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncCreateRight ), NULL, this );
-	m_bpButtonConflict->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConflictFiles ), NULL, this );
-	
+    // Disconnect Events
+    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( MainDialogGenerated::OnClose ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnCompare ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnStartSync ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnSwitchView ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnNewConfig ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnSaveConfig ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnLoadConfig ) );
+    this->Disconnect( wxID_EXIT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuQuit ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuGlobalSettings ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuBatchJob ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuExportFileList ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnShowHelp ) );
+    this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuCheckVersion ) );
+    this->Disconnect( wxID_ABOUT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnMenuAbout ) );
+    m_buttonCompare->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnCompare ), NULL, this );
+    m_bpButtonCmpConfig->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnCmpSettings ), NULL, this );
+    m_bpButtonSyncConfig->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncSettings ), NULL, this );
+    m_buttonStartSync->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnStartSync ), NULL, this );
+    m_dirPickerLeft->Disconnect( wxEVT_COMMAND_DIRPICKER_CHANGED, wxFileDirPickerEventHandler( MainDialogGenerated::OnDirSelected ), NULL, this );
+    m_bpButtonSwapSides->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSwapSides ), NULL, this );
+    m_bpButtonAddPair->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnAddFolderPair ), NULL, this );
+    m_bpButtonRemovePair->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnRemoveTopFolderPair ), NULL, this );
+    m_dirPickerRight->Disconnect( wxEVT_COMMAND_DIRPICKER_CHANGED, wxFileDirPickerEventHandler( MainDialogGenerated::OnDirSelected ), NULL, this );
+    m_gridLeft->Disconnect( wxEVT_GRID_CELL_LEFT_DCLICK, wxGridEventHandler( MainDialogGenerated::OnLeftGridDoubleClick ), NULL, this );
+    m_gridLeft->Disconnect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRim ), NULL, this );
+    m_gridLeft->Disconnect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( MainDialogGenerated::OnSortLeftGrid ), NULL, this );
+    m_gridLeft->Disconnect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRimLabelLeft ), NULL, this );
+    m_gridMiddle->Disconnect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextMiddle ), NULL, this );
+    m_gridMiddle->Disconnect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( MainDialogGenerated::OnSortMiddleGrid ), NULL, this );
+    m_gridMiddle->Disconnect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextMiddleLabel ), NULL, this );
+    m_gridRight->Disconnect( wxEVT_GRID_CELL_LEFT_DCLICK, wxGridEventHandler( MainDialogGenerated::OnRightGridDoubleClick ), NULL, this );
+    m_gridRight->Disconnect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRim ), NULL, this );
+    m_gridRight->Disconnect( wxEVT_GRID_LABEL_LEFT_CLICK, wxGridEventHandler( MainDialogGenerated::OnSortRightGrid ), NULL, this );
+    m_gridRight->Disconnect( wxEVT_GRID_LABEL_RIGHT_CLICK, wxGridEventHandler( MainDialogGenerated::OnContextRimLabelRight ), NULL, this );
+    m_bpButtonSave->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSaveConfig ), NULL, this );
+    m_bpButtonLoad->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnLoadConfig ), NULL, this );
+    m_listBoxHistory->Disconnect( wxEVT_CHAR, wxKeyEventHandler( MainDialogGenerated::OnCfgHistoryKeyEvent ), NULL, this );
+    m_listBoxHistory->Disconnect( wxEVT_COMMAND_LISTBOX_SELECTED, wxCommandEventHandler( MainDialogGenerated::OnLoadFromHistory ), NULL, this );
+    m_bpButtonFilter->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConfigureFilter ), NULL, this );
+    m_checkBoxHideFilt->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnHideFilteredButton ), NULL, this );
+    m_bpButtonSyncCreateLeft->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncCreateLeft ), NULL, this );
+    m_bpButtonSyncDirOverwLeft->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDirLeft ), NULL, this );
+    m_bpButtonSyncDeleteLeft->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDeleteLeft ), NULL, this );
+    m_bpButtonLeftOnly->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnLeftOnlyFiles ), NULL, this );
+    m_bpButtonLeftNewer->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnLeftNewerFiles ), NULL, this );
+    m_bpButtonEqual->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnEqualFiles ), NULL, this );
+    m_bpButtonDifferent->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnDifferentFiles ), NULL, this );
+    m_bpButtonSyncDirNone->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDirNone ), NULL, this );
+    m_bpButtonRightNewer->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnRightNewerFiles ), NULL, this );
+    m_bpButtonRightOnly->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnRightOnlyFiles ), NULL, this );
+    m_bpButtonSyncDeleteRight->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDeleteRight ), NULL, this );
+    m_bpButtonSyncDirOverwRight->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncDirRight ), NULL, this );
+    m_bpButtonSyncCreateRight->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnSyncCreateRight ), NULL, this );
+    m_bpButtonConflict->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::OnConflictFiles ), NULL, this );
+
 }
 
 FolderPairGenerated::FolderPairGenerated( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
 {
-	wxBoxSizer* bSizer74;
-	bSizer74 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_panelLeft = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer134;
-	bSizer134 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_directoryLeft = new wxTextCtrl( m_panelLeft, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer134->Add( m_directoryLeft, 1, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
-	m_dirPickerLeft = new FfsDirPickerCtrl( m_panelLeft, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_dirPickerLeft->SetToolTip( _("Select a folder") );
-	
-	bSizer134->Add( m_dirPickerLeft, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_panelLeft->SetSizer( bSizer134 );
-	m_panelLeft->Layout();
-	bSizer134->Fit( m_panelLeft );
-	bSizer74->Add( m_panelLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_panel20 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer95;
-	bSizer95 = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizer95->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_bpButtonLocalFilter = new wxBitmapButton( m_panel20, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
-	bSizer95->Add( m_bpButtonLocalFilter, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer95->Add( 5, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonAltSyncCfg = new wxBitmapButton( m_panel20, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
-	bSizer95->Add( m_bpButtonAltSyncCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer95->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_panel20->SetSizer( bSizer95 );
-	m_panel20->Layout();
-	bSizer95->Fit( m_panel20 );
-	bSizer74->Add( m_panel20, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-	
-	m_panelRight = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer135;
-	bSizer135 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bpButtonRemovePair = new wxBitmapButton( m_panelRight, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
-	m_bpButtonRemovePair->SetToolTip( _("Remove folder pair") );
-	
-	bSizer135->Add( m_bpButtonRemovePair, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
-	m_directoryRight = new wxTextCtrl( m_panelRight, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer135->Add( m_directoryRight, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_dirPickerRight = new FfsDirPickerCtrl( m_panelRight, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_dirPickerRight->SetToolTip( _("Select a folder") );
-	
-	bSizer135->Add( m_dirPickerRight, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_panelRight->SetSizer( bSizer135 );
-	m_panelRight->Layout();
-	bSizer135->Fit( m_panelRight );
-	bSizer74->Add( m_panelRight, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	this->SetSizer( bSizer74 );
-	this->Layout();
-	bSizer74->Fit( this );
+    wxBoxSizer* bSizer74;
+    bSizer74 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_panelLeft = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer134;
+    bSizer134 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_directoryLeft = new wxTextCtrl( m_panelLeft, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer134->Add( m_directoryLeft, 1, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+
+    m_dirPickerLeft = new FfsDirPickerCtrl( m_panelLeft, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_dirPickerLeft->SetToolTip( _("Select a folder") );
+
+    bSizer134->Add( m_dirPickerLeft, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    m_panelLeft->SetSizer( bSizer134 );
+    m_panelLeft->Layout();
+    bSizer134->Fit( m_panelLeft );
+    bSizer74->Add( m_panelLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_panel20 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer95;
+    bSizer95 = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizer95->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_bpButtonLocalFilter = new wxBitmapButton( m_panel20, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
+    bSizer95->Add( m_bpButtonLocalFilter, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer95->Add( 5, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonAltSyncCfg = new wxBitmapButton( m_panel20, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
+    bSizer95->Add( m_bpButtonAltSyncCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer95->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_panel20->SetSizer( bSizer95 );
+    m_panel20->Layout();
+    bSizer95->Fit( m_panel20 );
+    bSizer74->Add( m_panel20, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+
+    m_panelRight = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer135;
+    bSizer135 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bpButtonRemovePair = new wxBitmapButton( m_panelRight, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
+    m_bpButtonRemovePair->SetToolTip( _("Remove folder pair") );
+
+    bSizer135->Add( m_bpButtonRemovePair, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+
+    m_directoryRight = new wxTextCtrl( m_panelRight, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer135->Add( m_directoryRight, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_dirPickerRight = new FfsDirPickerCtrl( m_panelRight, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_dirPickerRight->SetToolTip( _("Select a folder") );
+
+    bSizer135->Add( m_dirPickerRight, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    m_panelRight->SetSizer( bSizer135 );
+    m_panelRight->Layout();
+    bSizer135->Fit( m_panelRight );
+    bSizer74->Add( m_panelRight, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    this->SetSizer( bSizer74 );
+    this->Layout();
+    bSizer74->Fit( this );
 }
 
 FolderPairGenerated::~FolderPairGenerated()
@@ -867,111 +867,111 @@ FolderPairGenerated::~FolderPairGenerated()
 
 BatchFolderPairGenerated::BatchFolderPairGenerated( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
 {
-	wxBoxSizer* bSizer142;
-	bSizer142 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer140;
-	bSizer140 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_panel32 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxDOUBLE_BORDER );
-	wxBoxSizer* bSizer147;
-	bSizer147 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer136;
-	bSizer136 = new wxBoxSizer( wxVERTICAL );
-	
-	m_bpButtonRemovePair = new wxBitmapButton( m_panel32, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
-	m_bpButtonRemovePair->SetToolTip( _("Remove folder pair") );
-	
-	bSizer136->Add( m_bpButtonRemovePair, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer147->Add( bSizer136, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	wxBoxSizer* bSizer143;
-	bSizer143 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer145;
-	bSizer145 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText53 = new wxStaticText( m_panel32, wxID_ANY, _("Left"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText53->Wrap( -1 );
-	m_staticText53->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer145->Add( m_staticText53, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer143->Add( bSizer145, 1, 0, 5 );
-	
-	wxBoxSizer* bSizer146;
-	bSizer146 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText541 = new wxStaticText( m_panel32, wxID_ANY, _("Right"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText541->Wrap( -1 );
-	m_staticText541->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer146->Add( m_staticText541, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer143->Add( bSizer146, 1, 0, 5 );
-	
-	bSizer147->Add( bSizer143, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
-	
-	m_panel32->SetSizer( bSizer147 );
-	m_panel32->Layout();
-	bSizer147->Fit( m_panel32 );
-	bSizer140->Add( m_panel32, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer144;
-	bSizer144 = new wxBoxSizer( wxVERTICAL );
-	
-	m_panelLeft = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer114;
-	bSizer114 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_directoryLeft = new wxTextCtrl( m_panelLeft, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer114->Add( m_directoryLeft, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_dirPickerLeft = new FfsDirPickerCtrl( m_panelLeft, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_dirPickerLeft->SetToolTip( _("Select a folder") );
-	
-	bSizer114->Add( m_dirPickerLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonLocalFilter = new wxBitmapButton( m_panelLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
-	bSizer114->Add( m_bpButtonLocalFilter, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_panelLeft->SetSizer( bSizer114 );
-	m_panelLeft->Layout();
-	bSizer114->Fit( m_panelLeft );
-	bSizer144->Add( m_panelLeft, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	m_panelRight = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer115;
-	bSizer115 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_directoryRight = new wxTextCtrl( m_panelRight, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer115->Add( m_directoryRight, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_dirPickerRight = new FfsDirPickerCtrl( m_panelRight, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_dirPickerRight->SetToolTip( _("Select a folder") );
-	
-	bSizer115->Add( m_dirPickerRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonAltSyncCfg = new wxBitmapButton( m_panelRight, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
-	bSizer115->Add( m_bpButtonAltSyncCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_panelRight->SetSizer( bSizer115 );
-	m_panelRight->Layout();
-	bSizer115->Fit( m_panelRight );
-	bSizer144->Add( m_panelRight, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer140->Add( bSizer144, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer142->Add( bSizer140, 0, wxEXPAND, 5 );
-	
-	
-	bSizer142->Add( 0, 5, 0, 0, 5 );
-	
-	this->SetSizer( bSizer142 );
-	this->Layout();
-	bSizer142->Fit( this );
+    wxBoxSizer* bSizer142;
+    bSizer142 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer140;
+    bSizer140 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_panel32 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxDOUBLE_BORDER );
+    wxBoxSizer* bSizer147;
+    bSizer147 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer136;
+    bSizer136 = new wxBoxSizer( wxVERTICAL );
+
+    m_bpButtonRemovePair = new wxBitmapButton( m_panel32, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
+    m_bpButtonRemovePair->SetToolTip( _("Remove folder pair") );
+
+    bSizer136->Add( m_bpButtonRemovePair, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer147->Add( bSizer136, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    wxBoxSizer* bSizer143;
+    bSizer143 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer145;
+    bSizer145 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText53 = new wxStaticText( m_panel32, wxID_ANY, _("Left"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText53->Wrap( -1 );
+    m_staticText53->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer145->Add( m_staticText53, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer143->Add( bSizer145, 1, 0, 5 );
+
+    wxBoxSizer* bSizer146;
+    bSizer146 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText541 = new wxStaticText( m_panel32, wxID_ANY, _("Right"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText541->Wrap( -1 );
+    m_staticText541->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer146->Add( m_staticText541, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer143->Add( bSizer146, 1, 0, 5 );
+
+    bSizer147->Add( bSizer143, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
+
+    m_panel32->SetSizer( bSizer147 );
+    m_panel32->Layout();
+    bSizer147->Fit( m_panel32 );
+    bSizer140->Add( m_panel32, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer144;
+    bSizer144 = new wxBoxSizer( wxVERTICAL );
+
+    m_panelLeft = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer114;
+    bSizer114 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_directoryLeft = new wxTextCtrl( m_panelLeft, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer114->Add( m_directoryLeft, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_dirPickerLeft = new FfsDirPickerCtrl( m_panelLeft, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_dirPickerLeft->SetToolTip( _("Select a folder") );
+
+    bSizer114->Add( m_dirPickerLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonLocalFilter = new wxBitmapButton( m_panelLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
+    bSizer114->Add( m_bpButtonLocalFilter, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_panelLeft->SetSizer( bSizer114 );
+    m_panelLeft->Layout();
+    bSizer114->Fit( m_panelLeft );
+    bSizer144->Add( m_panelLeft, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    m_panelRight = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer115;
+    bSizer115 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_directoryRight = new wxTextCtrl( m_panelRight, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer115->Add( m_directoryRight, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_dirPickerRight = new FfsDirPickerCtrl( m_panelRight, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_dirPickerRight->SetToolTip( _("Select a folder") );
+
+    bSizer115->Add( m_dirPickerRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonAltSyncCfg = new wxBitmapButton( m_panelRight, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
+    bSizer115->Add( m_bpButtonAltSyncCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_panelRight->SetSizer( bSizer115 );
+    m_panelRight->Layout();
+    bSizer115->Fit( m_panelRight );
+    bSizer144->Add( m_panelRight, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer140->Add( bSizer144, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer142->Add( bSizer140, 0, wxEXPAND, 5 );
+
+
+    bSizer142->Add( 0, 5, 0, 0, 5 );
+
+    this->SetSizer( bSizer142 );
+    this->Layout();
+    bSizer142->Fit( this );
 }
 
 BatchFolderPairGenerated::~BatchFolderPairGenerated()
@@ -980,562 +980,562 @@ BatchFolderPairGenerated::~BatchFolderPairGenerated()
 
 BatchDlgGenerated::BatchDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-	this->SetSizeHints( wxSize( 460,420 ), wxDefaultSize );
-	
-	wxBoxSizer* bSizer54;
-	bSizer54 = new wxBoxSizer( wxVERTICAL );
-	
-	bSizer69 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer87;
-	bSizer87 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmap27 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), 0 );
-	bSizer87->Add( m_bitmap27, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_panel8 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER|wxTAB_TRAVERSAL );
-	m_panel8->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DLIGHT ) );
-	
-	wxBoxSizer* bSizer72;
-	bSizer72 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText56 = new wxStaticText( m_panel8, wxID_ANY, _("Batch job"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText56->Wrap( -1 );
-	m_staticText56->SetFont( wxFont( 16, 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer72->Add( m_staticText56, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_panel8->SetSizer( bSizer72 );
-	m_panel8->Layout();
-	bSizer72->Fit( m_panel8 );
-	bSizer87->Add( m_panel8, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	
-	bSizer87->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer69->Add( bSizer87, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	bSizer69->Add( 0, 5, 0, 0, 5 );
-	
-	wxBoxSizer* bSizer70;
-	bSizer70 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText44 = new wxStaticText( this, wxID_ANY, _("Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText44->Wrap( 500 );
-	bSizer70->Add( m_staticText44, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	m_bpButtonHelp = new wxBitmapButton( this, wxID_HELP, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	m_bpButtonHelp->SetToolTip( _("Help") );
-	
-	bSizer70->Add( m_bpButtonHelp, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
-	bSizer69->Add( bSizer70, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	bSizer69->Add( 0, 5, 0, 0, 5 );
-	
-	m_staticline10 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer69->Add( m_staticline10, 0, wxEXPAND|wxTOP, 5 );
-	
-	m_staticText531 = new wxStaticText( this, wxID_ANY, _("Configuration overview:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText531->Wrap( -1 );
-	m_staticText531->SetFont( wxFont( 10, 74, 90, 92, false, wxT("Arial Black") ) );
-	
-	bSizer69->Add( m_staticText531, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_notebookSettings = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	m_panelOverview = new wxPanel( m_notebookSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer67;
-	bSizer67 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer120;
-	bSizer120 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer175;
-	bSizer175 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxStaticBoxSizer* sbSizer241;
-	sbSizer241 = new wxStaticBoxSizer( new wxStaticBox( m_panelOverview, wxID_ANY, _("Compare") ), wxHORIZONTAL );
-	
-	m_bpButtonCmpConfig = new wxBitmapButton( m_panelOverview, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,42 ), wxBU_AUTODRAW );
-	m_bpButtonCmpConfig->SetToolTip( _("Comparison settings") );
-	
-	sbSizer241->Add( m_bpButtonCmpConfig, 0, wxALIGN_CENTER_VERTICAL, 3 );
-	
-	
-	sbSizer241->Add( 10, 0, 0, 0, 5 );
-	
-	m_staticTextCmpVariant = new wxStaticText( m_panelOverview, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextCmpVariant->Wrap( -1 );
-	m_staticTextCmpVariant->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
-	m_staticTextCmpVariant->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
-	
-	sbSizer241->Add( m_staticTextCmpVariant, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer175->Add( sbSizer241, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer175->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	wxStaticBoxSizer* sbSizer26;
-	sbSizer26 = new wxStaticBoxSizer( new wxStaticBox( m_panelOverview, wxID_ANY, _("Filter files") ), wxVERTICAL );
-	
-	m_bpButtonFilter = new wxBitmapButton( m_panelOverview, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW|wxFULL_REPAINT_ON_RESIZE );
-	sbSizer26->Add( m_bpButtonFilter, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 15 );
-	
-	bSizer175->Add( sbSizer26, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer175->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	wxStaticBoxSizer* sbSizer252;
-	sbSizer252 = new wxStaticBoxSizer( new wxStaticBox( m_panelOverview, wxID_ANY, _("Synchronize...") ), wxHORIZONTAL );
-	
-	m_staticTextSyncVariant = new wxStaticText( m_panelOverview, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextSyncVariant->Wrap( -1 );
-	m_staticTextSyncVariant->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
-	m_staticTextSyncVariant->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
-	
-	sbSizer252->Add( m_staticTextSyncVariant, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	sbSizer252->Add( 10, 0, 0, 0, 5 );
-	
-	m_bpButtonSyncConfig = new wxBitmapButton( m_panelOverview, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,42 ), wxBU_AUTODRAW );
-	m_bpButtonSyncConfig->SetToolTip( _("Synchronization settings") );
-	
-	sbSizer252->Add( m_bpButtonSyncConfig, 0, wxALIGN_CENTER_VERTICAL, 3 );
-	
-	bSizer175->Add( sbSizer252, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer120->Add( bSizer175, 0, wxEXPAND, 5 );
-	
-	
-	bSizer120->Add( 0, 5, 0, 0, 5 );
-	
-	m_scrolledWindow6 = new wxScrolledWindow( m_panelOverview, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
-	m_scrolledWindow6->SetScrollRate( 5, 5 );
-	wxBoxSizer* bSizer141;
-	bSizer141 = new wxBoxSizer( wxVERTICAL );
-	
-	sbSizerMainPair = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_panelMainPair = new wxPanel( m_scrolledWindow6, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxDOUBLE_BORDER );
-	wxBoxSizer* bSizer147;
-	bSizer147 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer1361;
-	bSizer1361 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bpButtonAddPair = new wxBitmapButton( m_panelMainPair, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
-	m_bpButtonAddPair->SetToolTip( _("Add folder pair") );
-	
-	bSizer1361->Add( m_bpButtonAddPair, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 3 );
-	
-	m_bpButtonRemovePair = new wxBitmapButton( m_panelMainPair, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
-	m_bpButtonRemovePair->SetToolTip( _("Remove folder pair") );
-	
-	bSizer1361->Add( m_bpButtonRemovePair, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	bSizer147->Add( bSizer1361, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	wxBoxSizer* bSizer143;
-	bSizer143 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer145;
-	bSizer145 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText532 = new wxStaticText( m_panelMainPair, wxID_ANY, _("Left"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText532->Wrap( -1 );
-	m_staticText532->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer145->Add( m_staticText532, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer143->Add( bSizer145, 1, 0, 5 );
-	
-	wxBoxSizer* bSizer146;
-	bSizer146 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText5411 = new wxStaticText( m_panelMainPair, wxID_ANY, _("Right"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText5411->Wrap( -1 );
-	m_staticText5411->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer146->Add( m_staticText5411, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer143->Add( bSizer146, 1, 0, 5 );
-	
-	bSizer147->Add( bSizer143, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-	
-	m_panelMainPair->SetSizer( bSizer147 );
-	m_panelMainPair->Layout();
-	bSizer147->Fit( m_panelMainPair );
-	sbSizerMainPair->Add( m_panelMainPair, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM, 5 );
-	
-	wxBoxSizer* bSizer158;
-	bSizer158 = new wxBoxSizer( wxVERTICAL );
-	
-	m_panelLeft = new wxPanel( m_scrolledWindow6, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer1141;
-	bSizer1141 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_directoryLeft = new wxTextCtrl( m_panelLeft, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer1141->Add( m_directoryLeft, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_dirPickerLeft = new FfsDirPickerCtrl( m_panelLeft, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_dirPickerLeft->SetToolTip( _("Select a folder") );
-	
-	bSizer1141->Add( m_dirPickerLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonLocalFilter = new wxBitmapButton( m_panelLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
-	bSizer1141->Add( m_bpButtonLocalFilter, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_panelLeft->SetSizer( bSizer1141 );
-	m_panelLeft->Layout();
-	bSizer1141->Fit( m_panelLeft );
-	bSizer158->Add( m_panelLeft, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	m_panelRight = new wxPanel( m_scrolledWindow6, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer115;
-	bSizer115 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_directoryRight = new wxTextCtrl( m_panelRight, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer115->Add( m_directoryRight, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_dirPickerRight = new FfsDirPickerCtrl( m_panelRight, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_dirPickerRight->SetToolTip( _("Select a folder") );
-	
-	bSizer115->Add( m_dirPickerRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonAltSyncCfg = new wxBitmapButton( m_panelRight, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
-	bSizer115->Add( m_bpButtonAltSyncCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_panelRight->SetSizer( bSizer115 );
-	m_panelRight->Layout();
-	bSizer115->Fit( m_panelRight );
-	bSizer158->Add( m_panelRight, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	sbSizerMainPair->Add( bSizer158, 1, wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 );
-	
-	bSizer141->Add( sbSizerMainPair, 0, wxEXPAND, 5 );
-	
-	bSizerAddFolderPairs = new wxBoxSizer( wxVERTICAL );
-	
-	bSizer141->Add( bSizerAddFolderPairs, 1, wxEXPAND, 5 );
-	
-	m_scrolledWindow6->SetSizer( bSizer141 );
-	m_scrolledWindow6->Layout();
-	bSizer141->Fit( m_scrolledWindow6 );
-	bSizer120->Add( m_scrolledWindow6, 1, wxEXPAND, 5 );
-	
-	
-	bSizer120->Add( 0, 5, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	wxFlexGridSizer* fgSizer15;
-	fgSizer15 = new wxFlexGridSizer( 1, 2, 10, 10 );
-	fgSizer15->SetFlexibleDirection( wxBOTH );
-	fgSizer15->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	wxStaticBoxSizer* sbSizer24;
-	sbSizer24 = new wxStaticBoxSizer( new wxStaticBox( m_panelOverview, wxID_ANY, _("Status feedback") ), wxVERTICAL );
-	
-	
-	sbSizer24->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_checkBoxSilent = new wxCheckBox( m_panelOverview, wxID_ANY, _("Silent mode"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_checkBoxSilent->SetToolTip( _("Start minimized and write status information to a logfile") );
-	
-	sbSizer24->Add( m_checkBoxSilent, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 14 );
-	
-	
-	sbSizer24->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	fgSizer15->Add( sbSizer24, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	wxStaticBoxSizer* sbSizer25;
-	sbSizer25 = new wxStaticBoxSizer( new wxStaticBox( m_panelOverview, wxID_ANY, _("Error handling") ), wxHORIZONTAL );
-	
-	wxArrayString m_choiceHandleErrorChoices;
-	m_choiceHandleError = new wxChoice( m_panelOverview, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceHandleErrorChoices, 0 );
-	m_choiceHandleError->SetSelection( 0 );
-	sbSizer25->Add( m_choiceHandleError, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	fgSizer15->Add( sbSizer25, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer120->Add( fgSizer15, 0, 0, 5 );
-	
-	bSizer67->Add( bSizer120, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 10 );
-	
-	m_panelOverview->SetSizer( bSizer67 );
-	m_panelOverview->Layout();
-	bSizer67->Fit( m_panelOverview );
-	m_notebookSettings->AddPage( m_panelOverview, _("Overview"), true );
-	m_panelLogging = new wxPanel( m_notebookSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer117;
-	bSizer117 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer119;
-	bSizer119 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText120 = new wxStaticText( m_panelLogging, wxID_ANY, _("Select logfile directory:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText120->Wrap( -1 );
-	bSizer119->Add( m_staticText120, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	sbSizerLogfileDir = new wxStaticBoxSizer( new wxStaticBox( m_panelLogging, wxID_ANY, _("Drag && drop") ), wxHORIZONTAL );
-	
-	m_textCtrlLogfileDir = new wxTextCtrl( m_panelLogging, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	sbSizerLogfileDir->Add( m_textCtrlLogfileDir, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_dirPickerLogfileDir = new FfsDirPickerCtrl( m_panelLogging, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_dirPickerLogfileDir->SetToolTip( _("Select a folder") );
-	
-	sbSizerLogfileDir->Add( m_dirPickerLogfileDir, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer119->Add( sbSizerLogfileDir, 1, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer152;
-	bSizer152 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText96 = new wxStaticText( m_panelLogging, wxID_ANY, _("Maximum number of logfiles:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText96->Wrap( -1 );
-	bSizer152->Add( m_staticText96, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer152->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_spinCtrlLogCountMax = new wxSpinCtrl( m_panelLogging, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
-	bSizer152->Add( m_spinCtrlLogCountMax, 0, wxALL, 5 );
-	
-	bSizer119->Add( bSizer152, 0, wxEXPAND, 5 );
-	
-	bSizer117->Add( bSizer119, 0, wxEXPAND|wxALL, 10 );
-	
-	m_panelLogging->SetSizer( bSizer117 );
-	m_panelLogging->Layout();
-	bSizer117->Fit( m_panelLogging );
-	m_notebookSettings->AddPage( m_panelLogging, _("Logging"), false );
-	
-	bSizer69->Add( m_notebookSettings, 1, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer68;
-	bSizer68 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_buttonSave = new wxButton( this, wxID_SAVE, _("&Save"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_buttonSave->SetDefault(); 
-	m_buttonSave->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer68->Add( m_buttonSave, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_buttonLoad = new wxButton( this, wxID_OPEN, _("&Load"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_buttonLoad->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer68->Add( m_buttonLoad, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	m_button6 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_button6->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer68->Add( m_button6, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer69->Add( bSizer68, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	bSizer54->Add( bSizer69, 1, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 5 );
-	
-	this->SetSizer( bSizer54 );
-	this->Layout();
-	bSizer54->Fit( this );
-	
-	this->Centre( wxBOTH );
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( BatchDlgGenerated::OnClose ) );
-	m_bpButtonHelp->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnHelp ), NULL, this );
-	m_bpButtonCmpConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnCmpSettings ), NULL, this );
-	m_bpButtonFilter->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnConfigureFilter ), NULL, this );
-	m_bpButtonSyncConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnSyncSettings ), NULL, this );
-	m_bpButtonAddPair->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnAddFolderPair ), NULL, this );
-	m_bpButtonRemovePair->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnRemoveTopFolderPair ), NULL, this );
-	m_checkBoxSilent->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnCheckSilent ), NULL, this );
-	m_choiceHandleError->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( BatchDlgGenerated::OnChangeErrorHandling ), NULL, this );
-	m_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( 460,420 ), wxDefaultSize );
+
+    wxBoxSizer* bSizer54;
+    bSizer54 = new wxBoxSizer( wxVERTICAL );
+
+    bSizer69 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer87;
+    bSizer87 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmap27 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), 0 );
+    bSizer87->Add( m_bitmap27, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    m_panel8 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER|wxTAB_TRAVERSAL );
+    m_panel8->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DLIGHT ) );
+
+    wxBoxSizer* bSizer72;
+    bSizer72 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText56 = new wxStaticText( m_panel8, wxID_ANY, _("Batch job"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText56->Wrap( -1 );
+    m_staticText56->SetFont( wxFont( 16, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer72->Add( m_staticText56, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_panel8->SetSizer( bSizer72 );
+    m_panel8->Layout();
+    bSizer72->Fit( m_panel8 );
+    bSizer87->Add( m_panel8, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+
+    bSizer87->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer69->Add( bSizer87, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    bSizer69->Add( 0, 5, 0, 0, 5 );
+
+    wxBoxSizer* bSizer70;
+    bSizer70 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText44 = new wxStaticText( this, wxID_ANY, _("Assemble a batch file for automated synchronization. To start in batch mode simply pass the name of the file to the FreeFileSync executable: FreeFileSync.exe <batchfile>. This can also be scheduled in your operating system's task planner."), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText44->Wrap( 500 );
+    bSizer70->Add( m_staticText44, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    m_bpButtonHelp = new wxBitmapButton( this, wxID_HELP, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    m_bpButtonHelp->SetToolTip( _("Help") );
+
+    bSizer70->Add( m_bpButtonHelp, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+
+    bSizer69->Add( bSizer70, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    bSizer69->Add( 0, 5, 0, 0, 5 );
+
+    m_staticline10 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer69->Add( m_staticline10, 0, wxEXPAND|wxTOP, 5 );
+
+    m_staticText531 = new wxStaticText( this, wxID_ANY, _("Configuration overview:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText531->Wrap( -1 );
+    m_staticText531->SetFont( wxFont( 10, 74, 90, 92, false, wxT("Arial Black") ) );
+
+    bSizer69->Add( m_staticText531, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_notebookSettings = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+    m_panelOverview = new wxPanel( m_notebookSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer67;
+    bSizer67 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer120;
+    bSizer120 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer175;
+    bSizer175 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxStaticBoxSizer* sbSizer241;
+    sbSizer241 = new wxStaticBoxSizer( new wxStaticBox( m_panelOverview, wxID_ANY, _("Compare") ), wxHORIZONTAL );
+
+    m_bpButtonCmpConfig = new wxBitmapButton( m_panelOverview, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,42 ), wxBU_AUTODRAW );
+    m_bpButtonCmpConfig->SetToolTip( _("Comparison settings") );
+
+    sbSizer241->Add( m_bpButtonCmpConfig, 0, wxALIGN_CENTER_VERTICAL, 3 );
+
+
+    sbSizer241->Add( 10, 0, 0, 0, 5 );
+
+    m_staticTextCmpVariant = new wxStaticText( m_panelOverview, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextCmpVariant->Wrap( -1 );
+    m_staticTextCmpVariant->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
+    m_staticTextCmpVariant->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+
+    sbSizer241->Add( m_staticTextCmpVariant, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer175->Add( sbSizer241, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer175->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    wxStaticBoxSizer* sbSizer26;
+    sbSizer26 = new wxStaticBoxSizer( new wxStaticBox( m_panelOverview, wxID_ANY, _("Filter files") ), wxVERTICAL );
+
+    m_bpButtonFilter = new wxBitmapButton( m_panelOverview, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW|wxFULL_REPAINT_ON_RESIZE );
+    sbSizer26->Add( m_bpButtonFilter, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 15 );
+
+    bSizer175->Add( sbSizer26, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer175->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    wxStaticBoxSizer* sbSizer252;
+    sbSizer252 = new wxStaticBoxSizer( new wxStaticBox( m_panelOverview, wxID_ANY, _("Synchronize...") ), wxHORIZONTAL );
+
+    m_staticTextSyncVariant = new wxStaticText( m_panelOverview, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextSyncVariant->Wrap( -1 );
+    m_staticTextSyncVariant->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
+    m_staticTextSyncVariant->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
+
+    sbSizer252->Add( m_staticTextSyncVariant, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    sbSizer252->Add( 10, 0, 0, 0, 5 );
+
+    m_bpButtonSyncConfig = new wxBitmapButton( m_panelOverview, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,42 ), wxBU_AUTODRAW );
+    m_bpButtonSyncConfig->SetToolTip( _("Synchronization settings") );
+
+    sbSizer252->Add( m_bpButtonSyncConfig, 0, wxALIGN_CENTER_VERTICAL, 3 );
+
+    bSizer175->Add( sbSizer252, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer120->Add( bSizer175, 0, wxEXPAND, 5 );
+
+
+    bSizer120->Add( 0, 5, 0, 0, 5 );
+
+    m_scrolledWindow6 = new wxScrolledWindow( m_panelOverview, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxVSCROLL );
+    m_scrolledWindow6->SetScrollRate( 5, 5 );
+    wxBoxSizer* bSizer141;
+    bSizer141 = new wxBoxSizer( wxVERTICAL );
+
+    sbSizerMainPair = new wxBoxSizer( wxHORIZONTAL );
+
+    m_panelMainPair = new wxPanel( m_scrolledWindow6, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxDOUBLE_BORDER );
+    wxBoxSizer* bSizer147;
+    bSizer147 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer1361;
+    bSizer1361 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bpButtonAddPair = new wxBitmapButton( m_panelMainPair, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
+    m_bpButtonAddPair->SetToolTip( _("Add folder pair") );
+
+    bSizer1361->Add( m_bpButtonAddPair, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 3 );
+
+    m_bpButtonRemovePair = new wxBitmapButton( m_panelMainPair, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
+    m_bpButtonRemovePair->SetToolTip( _("Remove folder pair") );
+
+    bSizer1361->Add( m_bpButtonRemovePair, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    bSizer147->Add( bSizer1361, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    wxBoxSizer* bSizer143;
+    bSizer143 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer145;
+    bSizer145 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText532 = new wxStaticText( m_panelMainPair, wxID_ANY, _("Left"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText532->Wrap( -1 );
+    m_staticText532->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer145->Add( m_staticText532, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer143->Add( bSizer145, 1, 0, 5 );
+
+    wxBoxSizer* bSizer146;
+    bSizer146 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText5411 = new wxStaticText( m_panelMainPair, wxID_ANY, _("Right"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText5411->Wrap( -1 );
+    m_staticText5411->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer146->Add( m_staticText5411, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer143->Add( bSizer146, 1, 0, 5 );
+
+    bSizer147->Add( bSizer143, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+
+    m_panelMainPair->SetSizer( bSizer147 );
+    m_panelMainPair->Layout();
+    bSizer147->Fit( m_panelMainPair );
+    sbSizerMainPair->Add( m_panelMainPair, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM, 5 );
+
+    wxBoxSizer* bSizer158;
+    bSizer158 = new wxBoxSizer( wxVERTICAL );
+
+    m_panelLeft = new wxPanel( m_scrolledWindow6, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer1141;
+    bSizer1141 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_directoryLeft = new wxTextCtrl( m_panelLeft, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer1141->Add( m_directoryLeft, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_dirPickerLeft = new FfsDirPickerCtrl( m_panelLeft, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_dirPickerLeft->SetToolTip( _("Select a folder") );
+
+    bSizer1141->Add( m_dirPickerLeft, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonLocalFilter = new wxBitmapButton( m_panelLeft, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
+    bSizer1141->Add( m_bpButtonLocalFilter, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_panelLeft->SetSizer( bSizer1141 );
+    m_panelLeft->Layout();
+    bSizer1141->Fit( m_panelLeft );
+    bSizer158->Add( m_panelLeft, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    m_panelRight = new wxPanel( m_scrolledWindow6, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer115;
+    bSizer115 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_directoryRight = new wxTextCtrl( m_panelRight, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer115->Add( m_directoryRight, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_dirPickerRight = new FfsDirPickerCtrl( m_panelRight, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_dirPickerRight->SetToolTip( _("Select a folder") );
+
+    bSizer115->Add( m_dirPickerRight, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonAltSyncCfg = new wxBitmapButton( m_panelRight, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 20,20 ), wxBU_AUTODRAW );
+    bSizer115->Add( m_bpButtonAltSyncCfg, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_panelRight->SetSizer( bSizer115 );
+    m_panelRight->Layout();
+    bSizer115->Fit( m_panelRight );
+    bSizer158->Add( m_panelRight, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+
+    sbSizerMainPair->Add( bSizer158, 1, wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 );
+
+    bSizer141->Add( sbSizerMainPair, 0, wxEXPAND, 5 );
+
+    bSizerAddFolderPairs = new wxBoxSizer( wxVERTICAL );
+
+    bSizer141->Add( bSizerAddFolderPairs, 1, wxEXPAND, 5 );
+
+    m_scrolledWindow6->SetSizer( bSizer141 );
+    m_scrolledWindow6->Layout();
+    bSizer141->Fit( m_scrolledWindow6 );
+    bSizer120->Add( m_scrolledWindow6, 1, wxEXPAND, 5 );
+
+
+    bSizer120->Add( 0, 5, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    wxFlexGridSizer* fgSizer15;
+    fgSizer15 = new wxFlexGridSizer( 1, 2, 10, 10 );
+    fgSizer15->SetFlexibleDirection( wxBOTH );
+    fgSizer15->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    wxStaticBoxSizer* sbSizer24;
+    sbSizer24 = new wxStaticBoxSizer( new wxStaticBox( m_panelOverview, wxID_ANY, _("Status feedback") ), wxVERTICAL );
+
+
+    sbSizer24->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_checkBoxSilent = new wxCheckBox( m_panelOverview, wxID_ANY, _("Silent mode"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_checkBoxSilent->SetToolTip( _("Start minimized and write status information to a logfile") );
+
+    sbSizer24->Add( m_checkBoxSilent, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 14 );
+
+
+    sbSizer24->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    fgSizer15->Add( sbSizer24, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    wxStaticBoxSizer* sbSizer25;
+    sbSizer25 = new wxStaticBoxSizer( new wxStaticBox( m_panelOverview, wxID_ANY, _("Error handling") ), wxHORIZONTAL );
+
+    wxArrayString m_choiceHandleErrorChoices;
+    m_choiceHandleError = new wxChoice( m_panelOverview, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceHandleErrorChoices, 0 );
+    m_choiceHandleError->SetSelection( 0 );
+    sbSizer25->Add( m_choiceHandleError, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    fgSizer15->Add( sbSizer25, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer120->Add( fgSizer15, 0, 0, 5 );
+
+    bSizer67->Add( bSizer120, 1, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 10 );
+
+    m_panelOverview->SetSizer( bSizer67 );
+    m_panelOverview->Layout();
+    bSizer67->Fit( m_panelOverview );
+    m_notebookSettings->AddPage( m_panelOverview, _("Overview"), true );
+    m_panelLogging = new wxPanel( m_notebookSettings, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer117;
+    bSizer117 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer119;
+    bSizer119 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText120 = new wxStaticText( m_panelLogging, wxID_ANY, _("Select logfile directory:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText120->Wrap( -1 );
+    bSizer119->Add( m_staticText120, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    sbSizerLogfileDir = new wxStaticBoxSizer( new wxStaticBox( m_panelLogging, wxID_ANY, _("Drag && drop") ), wxHORIZONTAL );
+
+    m_textCtrlLogfileDir = new wxTextCtrl( m_panelLogging, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    sbSizerLogfileDir->Add( m_textCtrlLogfileDir, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_dirPickerLogfileDir = new FfsDirPickerCtrl( m_panelLogging, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_dirPickerLogfileDir->SetToolTip( _("Select a folder") );
+
+    sbSizerLogfileDir->Add( m_dirPickerLogfileDir, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer119->Add( sbSizerLogfileDir, 1, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer152;
+    bSizer152 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText96 = new wxStaticText( m_panelLogging, wxID_ANY, _("Maximum number of logfiles:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText96->Wrap( -1 );
+    bSizer152->Add( m_staticText96, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer152->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_spinCtrlLogCountMax = new wxSpinCtrl( m_panelLogging, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 2000000000, 0 );
+    bSizer152->Add( m_spinCtrlLogCountMax, 0, wxALL, 5 );
+
+    bSizer119->Add( bSizer152, 0, wxEXPAND, 5 );
+
+    bSizer117->Add( bSizer119, 0, wxEXPAND|wxALL, 10 );
+
+    m_panelLogging->SetSizer( bSizer117 );
+    m_panelLogging->Layout();
+    bSizer117->Fit( m_panelLogging );
+    m_notebookSettings->AddPage( m_panelLogging, _("Logging"), false );
+
+    bSizer69->Add( m_notebookSettings, 1, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer68;
+    bSizer68 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_buttonSave = new wxButton( this, wxID_SAVE, _("&Save"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_buttonSave->SetDefault();
+    m_buttonSave->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer68->Add( m_buttonSave, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_buttonLoad = new wxButton( this, wxID_OPEN, _("&Load"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_buttonLoad->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer68->Add( m_buttonLoad, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    m_button6 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_button6->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer68->Add( m_button6, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer69->Add( bSizer68, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    bSizer54->Add( bSizer69, 1, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 5 );
+
+    this->SetSizer( bSizer54 );
+    this->Layout();
+    bSizer54->Fit( this );
+
+    this->Centre( wxBOTH );
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( BatchDlgGenerated::OnClose ) );
+    m_bpButtonHelp->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnHelp ), NULL, this );
+    m_bpButtonCmpConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnCmpSettings ), NULL, this );
+    m_bpButtonFilter->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnConfigureFilter ), NULL, this );
+    m_bpButtonSyncConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnSyncSettings ), NULL, this );
+    m_bpButtonAddPair->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnAddFolderPair ), NULL, this );
+    m_bpButtonRemovePair->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnRemoveTopFolderPair ), NULL, this );
+    m_checkBoxSilent->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnCheckSilent ), NULL, this );
+    m_choiceHandleError->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( BatchDlgGenerated::OnChangeErrorHandling ), NULL, this );
+    m_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_bpButtonAddPair->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnAddFolderPair ), NULL, this );
-	m_bpButtonRemovePair->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnRemoveTopFolderPair ), NULL, this );
-	m_checkBoxSilent->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnCheckSilent ), NULL, this );
-	m_choiceHandleError->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( BatchDlgGenerated::OnChangeErrorHandling ), NULL, this );
-	m_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_bpButtonAddPair->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnAddFolderPair ), NULL, this );
+    m_bpButtonRemovePair->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnRemoveTopFolderPair ), NULL, this );
+    m_checkBoxSilent->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnCheckSilent ), NULL, this );
+    m_choiceHandleError->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( BatchDlgGenerated::OnChangeErrorHandling ), NULL, this );
+    m_spinCtrlLogCountMax->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( BatchDlgGenerated::OnChangeMaxLogCountTxt ), NULL, this );
+    m_buttonSave->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnSaveBatchJob ), NULL, this );
+    m_buttonLoad->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnLoadBatchJob ), NULL, this );
+    m_button6->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( BatchDlgGenerated::OnCancel ), NULL, this );
+
 }
 
 CompareStatusGenerated::CompareStatusGenerated( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
 {
-	wxBoxSizer* bSizer40;
-	bSizer40 = new wxBoxSizer( wxVERTICAL );
-	
-	
-	bSizer40->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	bSizer42 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer157;
-	bSizer157 = new wxBoxSizer( wxVERTICAL );
-	
-	bSizerFilesFound = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText321 = new wxStaticText( this, wxID_ANY, _("Elements found:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText321->Wrap( -1 );
-	m_staticText321->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizerFilesFound->Add( m_staticText321, 0, wxALIGN_BOTTOM, 5 );
-	
-	m_staticTextScanned = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextScanned->Wrap( -1 );
-	m_staticTextScanned->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
-	
-	bSizerFilesFound->Add( m_staticTextScanned, 0, wxALIGN_BOTTOM|wxLEFT, 5 );
-	
-	bSizer157->Add( bSizerFilesFound, 0, 0, 5 );
-	
-	bSizerFilesRemaining = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText46 = new wxStaticText( this, wxID_ANY, _("Elements remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText46->Wrap( -1 );
-	m_staticText46->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizerFilesRemaining->Add( m_staticText46, 0, wxALIGN_BOTTOM, 5 );
-	
-	wxBoxSizer* bSizer154;
-	bSizer154 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticTextFilesRemaining = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextFilesRemaining->Wrap( -1 );
-	m_staticTextFilesRemaining->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
-	
-	bSizer154->Add( m_staticTextFilesRemaining, 0, wxALIGN_BOTTOM, 5 );
-	
-	m_staticText117 = new wxStaticText( this, wxID_ANY, _("("), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText117->Wrap( -1 );
-	m_staticText117->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
-	
-	bSizer154->Add( m_staticText117, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
-	
-	m_staticTextDataRemaining = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextDataRemaining->Wrap( -1 );
-	m_staticTextDataRemaining->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
-	
-	bSizer154->Add( m_staticTextDataRemaining, 0, wxALIGN_BOTTOM, 5 );
-	
-	m_staticText118 = new wxStaticText( this, wxID_ANY, _(")"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText118->Wrap( -1 );
-	m_staticText118->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
-	
-	bSizer154->Add( m_staticText118, 0, wxALIGN_BOTTOM, 5 );
-	
-	bSizerFilesRemaining->Add( bSizer154, 0, wxALIGN_BOTTOM|wxLEFT, 5 );
-	
-	bSizer157->Add( bSizerFilesRemaining, 0, 0, 5 );
-	
-	bSizer42->Add( bSizer157, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer42->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	sSizerSpeed = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText104 = new wxStaticText( this, wxID_ANY, _("Speed:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText104->Wrap( -1 );
-	m_staticText104->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	sSizerSpeed->Add( m_staticText104, 0, wxALIGN_BOTTOM, 5 );
-	
-	m_staticTextSpeed = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextSpeed->Wrap( -1 );
-	m_staticTextSpeed->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
-	
-	sSizerSpeed->Add( m_staticTextSpeed, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
-	
-	bSizer42->Add( sSizerSpeed, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer42->Add( 10, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	sSizerTimeRemaining = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticTextTimeRemFixed = new wxStaticText( this, wxID_ANY, _("Time remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextTimeRemFixed->Wrap( -1 );
-	m_staticTextTimeRemFixed->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	sSizerTimeRemaining->Add( m_staticTextTimeRemFixed, 0, wxALIGN_BOTTOM, 5 );
-	
-	m_staticTextTimeRemaining = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextTimeRemaining->Wrap( -1 );
-	m_staticTextTimeRemaining->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
-	
-	sSizerTimeRemaining->Add( m_staticTextTimeRemaining, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
-	
-	bSizer42->Add( sSizerTimeRemaining, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer42->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	sSizerTimeElapsed = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxStaticText* m_staticText37;
-	m_staticText37 = new wxStaticText( this, wxID_ANY, _("Time elapsed:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText37->Wrap( -1 );
-	m_staticText37->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	sSizerTimeElapsed->Add( m_staticText37, 0, wxALIGN_BOTTOM, 5 );
-	
-	m_staticTextTimeElapsed = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextTimeElapsed->Wrap( -1 );
-	m_staticTextTimeElapsed->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
-	
-	sSizerTimeElapsed->Add( m_staticTextTimeElapsed, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
-	
-	bSizer42->Add( sSizerTimeElapsed, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer40->Add( bSizer42, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	wxBoxSizer* bSizer48;
-	bSizer48 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText30 = new wxStaticText( this, wxID_ANY, _("Operation:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText30->Wrap( -1 );
-	m_staticText30->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer48->Add( m_staticText30, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_textCtrlStatus = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
-	m_textCtrlStatus->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-	
-	bSizer48->Add( m_textCtrlStatus, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer40->Add( bSizer48, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	m_gauge2 = new wxGauge( this, wxID_ANY, 100, wxDefaultPosition, wxSize( -1,14 ), wxGA_HORIZONTAL|wxGA_SMOOTH );
-	bSizer40->Add( m_gauge2, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
-	
-	
-	bSizer40->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	this->SetSizer( bSizer40 );
-	this->Layout();
-	bSizer40->Fit( this );
+    wxBoxSizer* bSizer40;
+    bSizer40 = new wxBoxSizer( wxVERTICAL );
+
+
+    bSizer40->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    bSizer42 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer157;
+    bSizer157 = new wxBoxSizer( wxVERTICAL );
+
+    bSizerFilesFound = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText321 = new wxStaticText( this, wxID_ANY, _("Elements found:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText321->Wrap( -1 );
+    m_staticText321->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizerFilesFound->Add( m_staticText321, 0, wxALIGN_BOTTOM, 5 );
+
+    m_staticTextScanned = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextScanned->Wrap( -1 );
+    m_staticTextScanned->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
+
+    bSizerFilesFound->Add( m_staticTextScanned, 0, wxALIGN_BOTTOM|wxLEFT, 5 );
+
+    bSizer157->Add( bSizerFilesFound, 0, 0, 5 );
+
+    bSizerFilesRemaining = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText46 = new wxStaticText( this, wxID_ANY, _("Elements remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText46->Wrap( -1 );
+    m_staticText46->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizerFilesRemaining->Add( m_staticText46, 0, wxALIGN_BOTTOM, 5 );
+
+    wxBoxSizer* bSizer154;
+    bSizer154 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticTextFilesRemaining = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextFilesRemaining->Wrap( -1 );
+    m_staticTextFilesRemaining->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
+
+    bSizer154->Add( m_staticTextFilesRemaining, 0, wxALIGN_BOTTOM, 5 );
+
+    m_staticText117 = new wxStaticText( this, wxID_ANY, _("("), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText117->Wrap( -1 );
+    m_staticText117->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
+
+    bSizer154->Add( m_staticText117, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
+
+    m_staticTextDataRemaining = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextDataRemaining->Wrap( -1 );
+    m_staticTextDataRemaining->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
+
+    bSizer154->Add( m_staticTextDataRemaining, 0, wxALIGN_BOTTOM, 5 );
+
+    m_staticText118 = new wxStaticText( this, wxID_ANY, _(")"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText118->Wrap( -1 );
+    m_staticText118->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
+
+    bSizer154->Add( m_staticText118, 0, wxALIGN_BOTTOM, 5 );
+
+    bSizerFilesRemaining->Add( bSizer154, 0, wxALIGN_BOTTOM|wxLEFT, 5 );
+
+    bSizer157->Add( bSizerFilesRemaining, 0, 0, 5 );
+
+    bSizer42->Add( bSizer157, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer42->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    sSizerSpeed = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText104 = new wxStaticText( this, wxID_ANY, _("Speed:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText104->Wrap( -1 );
+    m_staticText104->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    sSizerSpeed->Add( m_staticText104, 0, wxALIGN_BOTTOM, 5 );
+
+    m_staticTextSpeed = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextSpeed->Wrap( -1 );
+    m_staticTextSpeed->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
+
+    sSizerSpeed->Add( m_staticTextSpeed, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
+
+    bSizer42->Add( sSizerSpeed, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer42->Add( 10, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    sSizerTimeRemaining = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticTextTimeRemFixed = new wxStaticText( this, wxID_ANY, _("Time remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextTimeRemFixed->Wrap( -1 );
+    m_staticTextTimeRemFixed->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    sSizerTimeRemaining->Add( m_staticTextTimeRemFixed, 0, wxALIGN_BOTTOM, 5 );
+
+    m_staticTextTimeRemaining = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextTimeRemaining->Wrap( -1 );
+    m_staticTextTimeRemaining->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
+
+    sSizerTimeRemaining->Add( m_staticTextTimeRemaining, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
+
+    bSizer42->Add( sSizerTimeRemaining, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer42->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    sSizerTimeElapsed = new wxBoxSizer( wxHORIZONTAL );
+
+    wxStaticText* m_staticText37;
+    m_staticText37 = new wxStaticText( this, wxID_ANY, _("Time elapsed:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText37->Wrap( -1 );
+    m_staticText37->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    sSizerTimeElapsed->Add( m_staticText37, 0, wxALIGN_BOTTOM, 5 );
+
+    m_staticTextTimeElapsed = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextTimeElapsed->Wrap( -1 );
+    m_staticTextTimeElapsed->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
+
+    sSizerTimeElapsed->Add( m_staticTextTimeElapsed, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
+
+    bSizer42->Add( sSizerTimeElapsed, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer40->Add( bSizer42, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+    wxBoxSizer* bSizer48;
+    bSizer48 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText30 = new wxStaticText( this, wxID_ANY, _("Operation:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText30->Wrap( -1 );
+    m_staticText30->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer48->Add( m_staticText30, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_textCtrlStatus = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
+    m_textCtrlStatus->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+
+    bSizer48->Add( m_textCtrlStatus, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer40->Add( bSizer48, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+    m_gauge2 = new wxGauge( this, wxID_ANY, 100, wxDefaultPosition, wxSize( -1,14 ), wxGA_HORIZONTAL|wxGA_SMOOTH );
+    bSizer40->Add( m_gauge2, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
+
+
+    bSizer40->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    this->SetSizer( bSizer40 );
+    this->Layout();
+    bSizer40->Fit( this );
 }
 
 CompareStatusGenerated::~CompareStatusGenerated()
@@ -1544,2149 +1544,2149 @@ 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( 300 );
-	fgSizer1->Add( m_staticText81, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
-	m_radioBtnMirror = new wxRadioButton( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_radioBtnMirror->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
-	
-	fgSizer1->Add( m_radioBtnMirror, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_buttonOneWay = new wxButton( this, wxID_ANY, _("Mirror ->>"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_buttonOneWay->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
-	
-	fgSizer1->Add( m_buttonOneWay, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	m_staticText8 = new wxStaticText( this, wxID_ANY, _("Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText8->Wrap( 300 );
-	fgSizer1->Add( m_staticText8, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_radioBtnUpdate = new wxRadioButton( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_radioBtnUpdate->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
-	
-	fgSizer1->Add( m_radioBtnUpdate, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_buttonUpdate = new wxButton( this, wxID_ANY, _("Update ->"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_buttonUpdate->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
-	
-	fgSizer1->Add( m_buttonUpdate, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	m_staticText101 = new wxStaticText( this, wxID_ANY, _("Copy new or updated files to right folder."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText101->Wrap( 300 );
-	fgSizer1->Add( m_staticText101, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
-	m_radioBtnCustom = new wxRadioButton( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_radioBtnCustom->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
-	m_radioBtnCustom->Enable( false );
-	
-	fgSizer1->Add( m_radioBtnCustom, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	wxBoxSizer* bSizer65;
-	bSizer65 = new wxBoxSizer( wxVERTICAL );
-	
-	
-	bSizer65->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticText23 = new wxStaticText( this, wxID_ANY, _("Custom"), wxDefaultPosition, wxSize( -1,-1 ), wxALIGN_CENTRE|wxSTATIC_BORDER );
-	m_staticText23->Wrap( -1 );
-	m_staticText23->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer65->Add( m_staticText23, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	
-	bSizer65->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	fgSizer1->Add( bSizer65, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	m_staticText9 = new wxStaticText( this, wxID_ANY, _("Configure your own synchronization rules."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText9->Wrap( 300 );
-	fgSizer1->Add( m_staticText9, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
-	sbSizer7->Add( fgSizer1, 0, 0, 5 );
-	
-	bSizer29->Add( sbSizer7, 0, wxEXPAND, 5 );
-	
-	
-	bSizer29->Add( 0, 5, 1, 0, 5 );
-	
-	bSizer201 = new wxBoxSizer( wxHORIZONTAL );
-	
-	sbSizerErrorHandling = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Error handling") ), wxHORIZONTAL );
-	
-	wxArrayString m_choiceHandleErrorChoices;
-	m_choiceHandleError = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceHandleErrorChoices, 0 );
-	m_choiceHandleError->SetSelection( 0 );
-	sbSizerErrorHandling->Add( m_choiceHandleError, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer201->Add( sbSizerErrorHandling, 0, wxEXPAND|wxRIGHT, 10 );
-	
-	sbSizerCustDelDir = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Deletion handling") ), wxVERTICAL );
-	
-	wxArrayString m_choiceHandleDeletionChoices;
-	m_choiceHandleDeletion = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceHandleDeletionChoices, 0 );
-	m_choiceHandleDeletion->SetSelection( 0 );
-	sbSizerCustDelDir->Add( m_choiceHandleDeletion, 0, wxBOTTOM, 5 );
-	
-	m_panelCustomDeletionDir = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer1151;
-	bSizer1151 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_textCtrlCustomDelFolder = new wxTextCtrl( m_panelCustomDeletionDir, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_textCtrlCustomDelFolder->SetMinSize( wxSize( 200,-1 ) );
-	
-	bSizer1151->Add( m_textCtrlCustomDelFolder, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_dirPickerCustomDelFolder = new FfsDirPickerCtrl( m_panelCustomDeletionDir, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer1151->Add( m_dirPickerCustomDelFolder, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_panelCustomDeletionDir->SetSizer( bSizer1151 );
-	m_panelCustomDeletionDir->Layout();
-	bSizer1151->Fit( m_panelCustomDeletionDir );
-	sbSizerCustDelDir->Add( m_panelCustomDeletionDir, 0, 0, 5 );
-	
-	bSizer201->Add( sbSizerCustDelDir, 0, wxEXPAND, 5 );
-	
-	bSizer29->Add( bSizer201, 0, wxTOP|wxBOTTOM, 5 );
-	
-	
-	bSizer29->Add( 0, 5, 1, 0, 5 );
-	
-	wxBoxSizer* bSizer291;
-	bSizer291 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_buttonOK = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_buttonOK->SetDefault(); 
-	m_buttonOK->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer291->Add( m_buttonOK, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	m_button16 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_button16->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer291->Add( m_button16, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer291->Add( 20, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer29->Add( bSizer291, 0, wxEXPAND, 5 );
-	
-	bSizer181->Add( bSizer29, 0, wxEXPAND, 5 );
-	
-	
-	bSizer181->Add( 10, 0, 0, 0, 5 );
-	
-	sbSizerSyncDirections = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Configuration") ), wxVERTICAL );
-	
-	wxGridSizer* gSizer3;
-	gSizer3 = new wxGridSizer( 1, 2, 0, 5 );
-	
-	m_staticText21 = new wxStaticText( this, wxID_ANY, _("Category"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText21->Wrap( -1 );
-	m_staticText21->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
-	
-	gSizer3->Add( m_staticText21, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticText31 = new wxStaticText( this, wxID_ANY, _("Action"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText31->Wrap( -1 );
-	m_staticText31->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
-	
-	gSizer3->Add( m_staticText31, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	sbSizerSyncDirections->Add( gSizer3, 0, wxEXPAND, 5 );
-	
-	m_staticline3 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	sbSizerSyncDirections->Add( m_staticline3, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP|wxBOTTOM, 5 );
-	
-	wxBoxSizer* bSizer121;
-	bSizer121 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer122;
-	bSizer122 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapLeftOnly = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
-	m_bitmapLeftOnly->SetToolTip( _("Files/folders that exist on left side only") );
-	
-	bSizer122->Add( m_bitmapLeftOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer122->Add( 5, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonLeftOnly = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizer122->Add( m_bpButtonLeftOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer121->Add( bSizer122, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	wxBoxSizer* bSizer123;
-	bSizer123 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapRightOnly = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
-	m_bitmapRightOnly->SetToolTip( _("Files/folders that exist on right side only") );
-	
-	bSizer123->Add( m_bitmapRightOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer123->Add( 5, 0, 0, 0, 5 );
-	
-	m_bpButtonRightOnly = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizer123->Add( m_bpButtonRightOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer121->Add( bSizer123, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	wxBoxSizer* bSizer124;
-	bSizer124 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapLeftNewer = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
-	m_bitmapLeftNewer->SetToolTip( _("Files that exist on both sides, left one is newer") );
-	
-	bSizer124->Add( m_bitmapLeftNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer124->Add( 5, 0, 0, 0, 5 );
-	
-	m_bpButtonLeftNewer = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizer124->Add( m_bpButtonLeftNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer121->Add( bSizer124, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	wxBoxSizer* bSizer125;
-	bSizer125 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapRightNewer = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
-	m_bitmapRightNewer->SetToolTip( _("Files that exist on both sides, right one is newer") );
-	
-	bSizer125->Add( m_bitmapRightNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer125->Add( 5, 0, 0, 0, 5 );
-	
-	m_bpButtonRightNewer = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizer125->Add( m_bpButtonRightNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer121->Add( bSizer125, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	wxBoxSizer* bSizer126;
-	bSizer126 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapDifferent = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
-	m_bitmapDifferent->SetToolTip( _("Files that have different content") );
-	
-	bSizer126->Add( m_bitmapDifferent, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer126->Add( 5, 0, 0, 0, 5 );
-	
-	m_bpButtonDifferent = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizer126->Add( m_bpButtonDifferent, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer121->Add( bSizer126, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	wxBoxSizer* bSizer127;
-	bSizer127 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapConflict = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
-	m_bitmapConflict->SetToolTip( _("Conflicts/files that cannot be categorized") );
-	
-	bSizer127->Add( m_bitmapConflict, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer127->Add( 5, 0, 0, 0, 5 );
-	
-	m_bpButtonConflict = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
-	bSizer127->Add( m_bpButtonConflict, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer121->Add( bSizer127, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	sbSizerSyncDirections->Add( bSizer121, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	bSizer181->Add( sbSizerSyncDirections, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	bSizer7->Add( bSizer181, 0, wxALL, 5 );
-	
-	this->SetSizer( bSizer7 );
-	this->Layout();
-	bSizer7->Fit( this );
-	
-	this->Centre( wxBOTH );
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SyncCfgDlgGenerated::OnClose ) );
-	m_radioBtnAutomatic->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncAutomatic ), NULL, this );
-	m_buttonAutomatic->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncAutomatic ), NULL, this );
-	m_radioBtnMirror->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncLeftToRight ), NULL, this );
-	m_buttonOneWay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncLeftToRight ), NULL, this );
-	m_radioBtnUpdate->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncUpdate ), NULL, this );
-	m_buttonUpdate->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncUpdate ), NULL, this );
-	m_radioBtnCustom->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncCustom ), NULL, this );
-	m_choiceHandleError->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnChangeErrorHandling ), NULL, this );
-	m_choiceHandleDeletion->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnChangeDeletionHandling ), NULL, this );
-	m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnApply ), NULL, this );
-	m_button16->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnCancel ), NULL, this );
-	m_bpButtonLeftOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnExLeftSideOnly ), NULL, this );
-	m_bpButtonRightOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnExRightSideOnly ), NULL, this );
-	m_bpButtonLeftNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnLeftNewer ), NULL, this );
-	m_bpButtonRightNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnRightNewer ), NULL, this );
-	m_bpButtonDifferent->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnDifferent ), NULL, this );
-	m_bpButtonConflict->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnConflict ), NULL, this );
+    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+
+    wxBoxSizer* bSizer7;
+    bSizer7 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer181;
+    bSizer181 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer29;
+    bSizer29 = new wxBoxSizer( wxVERTICAL );
+
+    wxStaticBoxSizer* sbSizer7;
+    sbSizer7 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxEmptyString ), wxVERTICAL );
+
+    m_staticText1 = new wxStaticText( this, wxID_ANY, _("Select variant:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText1->Wrap( -1 );
+    m_staticText1->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
+
+    sbSizer7->Add( m_staticText1, 0, wxALL, 5 );
+
+    wxFlexGridSizer* fgSizer1;
+    fgSizer1 = new wxFlexGridSizer( 4, 3, 8, 5 );
+    fgSizer1->SetFlexibleDirection( wxHORIZONTAL );
+    fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    m_radioBtnAutomatic = new wxRadioButton( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    m_radioBtnAutomatic->SetValue( true );
+    m_radioBtnAutomatic->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
+
+    fgSizer1->Add( m_radioBtnAutomatic, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_buttonAutomatic = new wxButton( this, wxID_ANY, _("<Automatic>"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+    m_buttonAutomatic->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
+
+    fgSizer1->Add( m_buttonAutomatic, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    m_staticText81 = new wxStaticText( this, wxID_ANY, _("Identify and propagate changes on both sides using a database. Deletions and conflicts are detected automatically."), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText81->Wrap( 300 );
+    fgSizer1->Add( m_staticText81, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+
+    m_radioBtnMirror = new wxRadioButton( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    m_radioBtnMirror->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
+
+    fgSizer1->Add( m_radioBtnMirror, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_buttonOneWay = new wxButton( this, wxID_ANY, _("Mirror ->>"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+    m_buttonOneWay->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
+
+    fgSizer1->Add( m_buttonOneWay, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    m_staticText8 = new wxStaticText( this, wxID_ANY, _("Mirror backup of left folder. Right folder is modified to exactly match left folder after synchronization."), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText8->Wrap( 300 );
+    fgSizer1->Add( m_staticText8, 0, wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_radioBtnUpdate = new wxRadioButton( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    m_radioBtnUpdate->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
+
+    fgSizer1->Add( m_radioBtnUpdate, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_buttonUpdate = new wxButton( this, wxID_ANY, _("Update ->"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+    m_buttonUpdate->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
+
+    fgSizer1->Add( m_buttonUpdate, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    m_staticText101 = new wxStaticText( this, wxID_ANY, _("Copy new or updated files to right folder."), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText101->Wrap( 300 );
+    fgSizer1->Add( m_staticText101, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+
+    m_radioBtnCustom = new wxRadioButton( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    m_radioBtnCustom->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
+    m_radioBtnCustom->Enable( false );
+
+    fgSizer1->Add( m_radioBtnCustom, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    wxBoxSizer* bSizer65;
+    bSizer65 = new wxBoxSizer( wxVERTICAL );
+
+
+    bSizer65->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticText23 = new wxStaticText( this, wxID_ANY, _("Custom"), wxDefaultPosition, wxSize( -1,-1 ), wxALIGN_CENTRE|wxSTATIC_BORDER );
+    m_staticText23->Wrap( -1 );
+    m_staticText23->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer65->Add( m_staticText23, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+
+    bSizer65->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    fgSizer1->Add( bSizer65, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    m_staticText9 = new wxStaticText( this, wxID_ANY, _("Configure your own synchronization rules."), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText9->Wrap( 300 );
+    fgSizer1->Add( m_staticText9, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+
+    sbSizer7->Add( fgSizer1, 0, 0, 5 );
+
+    bSizer29->Add( sbSizer7, 0, wxEXPAND, 5 );
+
+
+    bSizer29->Add( 0, 5, 1, 0, 5 );
+
+    bSizer201 = new wxBoxSizer( wxHORIZONTAL );
+
+    sbSizerErrorHandling = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Error handling") ), wxHORIZONTAL );
+
+    wxArrayString m_choiceHandleErrorChoices;
+    m_choiceHandleError = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceHandleErrorChoices, 0 );
+    m_choiceHandleError->SetSelection( 0 );
+    sbSizerErrorHandling->Add( m_choiceHandleError, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer201->Add( sbSizerErrorHandling, 0, wxEXPAND|wxRIGHT, 10 );
+
+    sbSizerCustDelDir = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Deletion handling") ), wxVERTICAL );
+
+    wxArrayString m_choiceHandleDeletionChoices;
+    m_choiceHandleDeletion = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceHandleDeletionChoices, 0 );
+    m_choiceHandleDeletion->SetSelection( 0 );
+    sbSizerCustDelDir->Add( m_choiceHandleDeletion, 0, wxBOTTOM, 5 );
+
+    m_panelCustomDeletionDir = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer1151;
+    bSizer1151 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_textCtrlCustomDelFolder = new wxTextCtrl( m_panelCustomDeletionDir, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    m_textCtrlCustomDelFolder->SetMinSize( wxSize( 200,-1 ) );
+
+    bSizer1151->Add( m_textCtrlCustomDelFolder, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_dirPickerCustomDelFolder = new FfsDirPickerCtrl( m_panelCustomDeletionDir, wxID_ANY, wxEmptyString, _("Select a folder"), wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer1151->Add( m_dirPickerCustomDelFolder, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_panelCustomDeletionDir->SetSizer( bSizer1151 );
+    m_panelCustomDeletionDir->Layout();
+    bSizer1151->Fit( m_panelCustomDeletionDir );
+    sbSizerCustDelDir->Add( m_panelCustomDeletionDir, 0, 0, 5 );
+
+    bSizer201->Add( sbSizerCustDelDir, 0, wxEXPAND, 5 );
+
+    bSizer29->Add( bSizer201, 0, wxTOP|wxBOTTOM, 5 );
+
+
+    bSizer29->Add( 0, 5, 1, 0, 5 );
+
+    wxBoxSizer* bSizer291;
+    bSizer291 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_buttonOK = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_buttonOK->SetDefault();
+    m_buttonOK->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer291->Add( m_buttonOK, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    m_button16 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_button16->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer291->Add( m_button16, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer291->Add( 20, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer29->Add( bSizer291, 0, wxEXPAND, 5 );
+
+    bSizer181->Add( bSizer29, 0, wxEXPAND, 5 );
+
+
+    bSizer181->Add( 10, 0, 0, 0, 5 );
+
+    sbSizerSyncDirections = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Configuration") ), wxVERTICAL );
+
+    wxGridSizer* gSizer3;
+    gSizer3 = new wxGridSizer( 1, 2, 0, 5 );
+
+    m_staticText21 = new wxStaticText( this, wxID_ANY, _("Category"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText21->Wrap( -1 );
+    m_staticText21->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
+
+    gSizer3->Add( m_staticText21, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticText31 = new wxStaticText( this, wxID_ANY, _("Action"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText31->Wrap( -1 );
+    m_staticText31->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
+
+    gSizer3->Add( m_staticText31, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    sbSizerSyncDirections->Add( gSizer3, 0, wxEXPAND, 5 );
+
+    m_staticline3 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    sbSizerSyncDirections->Add( m_staticline3, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxTOP|wxBOTTOM, 5 );
+
+    wxBoxSizer* bSizer121;
+    bSizer121 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer122;
+    bSizer122 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapLeftOnly = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
+    m_bitmapLeftOnly->SetToolTip( _("Files/folders that exist on left side only") );
+
+    bSizer122->Add( m_bitmapLeftOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer122->Add( 5, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonLeftOnly = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
+    bSizer122->Add( m_bpButtonLeftOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer121->Add( bSizer122, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    wxBoxSizer* bSizer123;
+    bSizer123 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapRightOnly = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
+    m_bitmapRightOnly->SetToolTip( _("Files/folders that exist on right side only") );
+
+    bSizer123->Add( m_bitmapRightOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer123->Add( 5, 0, 0, 0, 5 );
+
+    m_bpButtonRightOnly = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
+    bSizer123->Add( m_bpButtonRightOnly, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer121->Add( bSizer123, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    wxBoxSizer* bSizer124;
+    bSizer124 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapLeftNewer = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
+    m_bitmapLeftNewer->SetToolTip( _("Files that exist on both sides, left one is newer") );
+
+    bSizer124->Add( m_bitmapLeftNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer124->Add( 5, 0, 0, 0, 5 );
+
+    m_bpButtonLeftNewer = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
+    bSizer124->Add( m_bpButtonLeftNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer121->Add( bSizer124, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    wxBoxSizer* bSizer125;
+    bSizer125 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapRightNewer = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
+    m_bitmapRightNewer->SetToolTip( _("Files that exist on both sides, right one is newer") );
+
+    bSizer125->Add( m_bitmapRightNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer125->Add( 5, 0, 0, 0, 5 );
+
+    m_bpButtonRightNewer = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
+    bSizer125->Add( m_bpButtonRightNewer, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer121->Add( bSizer125, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    wxBoxSizer* bSizer126;
+    bSizer126 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapDifferent = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
+    m_bitmapDifferent->SetToolTip( _("Files that have different content") );
+
+    bSizer126->Add( m_bitmapDifferent, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer126->Add( 5, 0, 0, 0, 5 );
+
+    m_bpButtonDifferent = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
+    bSizer126->Add( m_bpButtonDifferent, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer121->Add( bSizer126, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    wxBoxSizer* bSizer127;
+    bSizer127 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapConflict = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 45,45 ), 0 );
+    m_bitmapConflict->SetToolTip( _("Conflicts/files that cannot be categorized") );
+
+    bSizer127->Add( m_bitmapConflict, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer127->Add( 5, 0, 0, 0, 5 );
+
+    m_bpButtonConflict = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 42,42 ), wxBU_AUTODRAW );
+    bSizer127->Add( m_bpButtonConflict, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer121->Add( bSizer127, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    sbSizerSyncDirections->Add( bSizer121, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    bSizer181->Add( sbSizerSyncDirections, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    bSizer7->Add( bSizer181, 0, wxALL, 5 );
+
+    this->SetSizer( bSizer7 );
+    this->Layout();
+    bSizer7->Fit( this );
+
+    this->Centre( wxBOTH );
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SyncCfgDlgGenerated::OnClose ) );
+    m_radioBtnAutomatic->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncAutomatic ), NULL, this );
+    m_buttonAutomatic->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncAutomatic ), NULL, this );
+    m_radioBtnMirror->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncLeftToRight ), NULL, this );
+    m_buttonOneWay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncLeftToRight ), NULL, this );
+    m_radioBtnUpdate->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncUpdate ), NULL, this );
+    m_buttonUpdate->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncUpdate ), NULL, this );
+    m_radioBtnCustom->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncCustom ), NULL, this );
+    m_choiceHandleError->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnChangeErrorHandling ), NULL, this );
+    m_choiceHandleDeletion->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnChangeDeletionHandling ), NULL, this );
+    m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnApply ), NULL, this );
+    m_button16->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnCancel ), NULL, this );
+    m_bpButtonLeftOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnExLeftSideOnly ), NULL, this );
+    m_bpButtonRightOnly->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnExRightSideOnly ), NULL, this );
+    m_bpButtonLeftNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnLeftNewer ), NULL, this );
+    m_bpButtonRightNewer->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnRightNewer ), NULL, this );
+    m_bpButtonDifferent->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnDifferent ), NULL, this );
+    m_bpButtonConflict->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnConflict ), NULL, this );
 }
 
 SyncCfgDlgGenerated::~SyncCfgDlgGenerated()
 {
-	// Disconnect Events
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SyncCfgDlgGenerated::OnClose ) );
-	m_radioBtnAutomatic->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncAutomatic ), NULL, this );
-	m_buttonAutomatic->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncAutomatic ), NULL, this );
-	m_radioBtnMirror->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncLeftToRight ), NULL, this );
-	m_buttonOneWay->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncLeftToRight ), NULL, this );
-	m_radioBtnUpdate->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncUpdate ), NULL, this );
-	m_buttonUpdate->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncUpdate ), NULL, this );
-	m_radioBtnCustom->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncCustom ), NULL, this );
-	m_choiceHandleError->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnChangeErrorHandling ), NULL, this );
-	m_choiceHandleDeletion->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnChangeDeletionHandling ), NULL, this );
-	m_buttonOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnApply ), NULL, this );
-	m_button16->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnCancel ), NULL, this );
-	m_bpButtonLeftOnly->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnExLeftSideOnly ), NULL, this );
-	m_bpButtonRightOnly->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnExRightSideOnly ), NULL, this );
-	m_bpButtonLeftNewer->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnLeftNewer ), NULL, this );
-	m_bpButtonRightNewer->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnRightNewer ), NULL, this );
-	m_bpButtonDifferent->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnDifferent ), NULL, this );
-	m_bpButtonConflict->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnConflict ), NULL, this );
-	
+    // Disconnect Events
+    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SyncCfgDlgGenerated::OnClose ) );
+    m_radioBtnAutomatic->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncAutomatic ), NULL, this );
+    m_buttonAutomatic->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncAutomatic ), NULL, this );
+    m_radioBtnMirror->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncLeftToRight ), NULL, this );
+    m_buttonOneWay->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncLeftToRight ), NULL, this );
+    m_radioBtnUpdate->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncUpdate ), NULL, this );
+    m_buttonUpdate->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncUpdate ), NULL, this );
+    m_radioBtnCustom->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnSyncCustom ), NULL, this );
+    m_choiceHandleError->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnChangeErrorHandling ), NULL, this );
+    m_choiceHandleDeletion->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( SyncCfgDlgGenerated::OnChangeDeletionHandling ), NULL, this );
+    m_buttonOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnApply ), NULL, this );
+    m_button16->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnCancel ), NULL, this );
+    m_bpButtonLeftOnly->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnExLeftSideOnly ), NULL, this );
+    m_bpButtonRightOnly->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnExRightSideOnly ), NULL, this );
+    m_bpButtonLeftNewer->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnLeftNewer ), NULL, this );
+    m_bpButtonRightNewer->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnRightNewer ), NULL, this );
+    m_bpButtonDifferent->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnDifferent ), NULL, this );
+    m_bpButtonConflict->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncCfgDlgGenerated::OnConflict ), NULL, this );
+
 }
 
 CmpCfgDlgGenerated::CmpCfgDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-	
-	wxBoxSizer* bSizer136;
-	bSizer136 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer55;
-	bSizer55 = new wxBoxSizer( wxVERTICAL );
-	
-	wxStaticBoxSizer* sbSizer6;
-	sbSizer6 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Compare by...") ), wxHORIZONTAL );
-	
-	wxFlexGridSizer* fgSizer16;
-	fgSizer16 = new wxFlexGridSizer( 2, 3, 0, 0 );
-	fgSizer16->SetFlexibleDirection( wxBOTH );
-	fgSizer16->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	m_radioBtnSizeDate = new wxRadioButton( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
-	m_radioBtnSizeDate->SetValue( true ); 
-	m_radioBtnSizeDate->SetToolTip( _("Files are found equal if\n     - filesize\n     - last write time and date\nare the same") );
-	
-	fgSizer16->Add( m_radioBtnSizeDate, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bitmapByTime = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_bitmapByTime->SetToolTip( _("Files are found equal if\n     - filesize\n     - last write time and date\nare the same") );
-	
-	fgSizer16->Add( m_bitmapByTime, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_buttonTimeSize = new wxButton( this, wxID_ANY, _("File size and date"), wxDefaultPosition, wxSize( -1,42 ), 0 );
-	m_buttonTimeSize->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
-	m_buttonTimeSize->SetToolTip( _("Files are found equal if\n     - filesize\n     - last write time and date\nare the same") );
-	
-	fgSizer16->Add( m_buttonTimeSize, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALL, 5 );
-	
-	m_radioBtnContent = new wxRadioButton( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_radioBtnContent->SetToolTip( _("Files are found equal if\n     - file content\nis the same") );
-	
-	fgSizer16->Add( m_radioBtnContent, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bitmapByContent = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	m_bitmapByContent->SetToolTip( _("Files are found equal if\n     - file content\nis the same") );
-	
-	fgSizer16->Add( m_bitmapByContent, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_buttonContent = new wxButton( this, wxID_ANY, _("File content"), wxDefaultPosition, wxSize( -1,42 ), 0 );
-	m_buttonContent->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
-	m_buttonContent->SetToolTip( _("Files are found equal if\n     - file content\nis the same") );
-	
-	fgSizer16->Add( m_buttonContent, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	sbSizer6->Add( fgSizer16, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	m_staticline14 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
-	sbSizer6->Add( m_staticline14, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
-	
-	m_bpButtonHelp = new wxBitmapButton( this, wxID_HELP, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	m_bpButtonHelp->SetToolTip( _("Help") );
-	
-	sbSizer6->Add( m_bpButtonHelp, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer55->Add( sbSizer6, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 2 );
-	
-	
-	bSizer55->Add( 0, 4, 0, 0, 5 );
-	
-	wxStaticBoxSizer* sbSizer25;
-	sbSizer25 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Symbolic Link handling") ), wxVERTICAL );
-	
-	wxArrayString m_choiceHandleSymlinksChoices;
-	m_choiceHandleSymlinks = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceHandleSymlinksChoices, 0 );
-	m_choiceHandleSymlinks->SetSelection( 0 );
-	sbSizer25->Add( m_choiceHandleSymlinks, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	bSizer55->Add( sbSizer25, 0, wxEXPAND|wxTOP, 5 );
-	
-	wxBoxSizer* bSizer22;
-	bSizer22 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_button10 = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_button10->SetDefault(); 
-	m_button10->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer22->Add( m_button10, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_button6 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_button6->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer22->Add( m_button6, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer55->Add( bSizer22, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	bSizer136->Add( bSizer55, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	this->SetSizer( bSizer136 );
-	this->Layout();
-	bSizer136->Fit( this );
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CmpCfgDlgGenerated::OnClose ) );
-	m_radioBtnSizeDate->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( CmpCfgDlgGenerated::OnTimeSize ), NULL, this );
-	m_buttonTimeSize->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnTimeSize ), NULL, this );
-	m_radioBtnContent->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( CmpCfgDlgGenerated::OnContent ), NULL, this );
-	m_buttonContent->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnContent ), NULL, this );
-	m_bpButtonHelp->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnShowHelp ), NULL, this );
-	m_choiceHandleSymlinks->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( CmpCfgDlgGenerated::OnChangeErrorHandling ), NULL, this );
-	m_button10->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnOkay ), NULL, this );
-	m_button6->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnCancel ), NULL, this );
+    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+
+    wxBoxSizer* bSizer136;
+    bSizer136 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer55;
+    bSizer55 = new wxBoxSizer( wxVERTICAL );
+
+    wxStaticBoxSizer* sbSizer6;
+    sbSizer6 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Compare by...") ), wxHORIZONTAL );
+
+    wxFlexGridSizer* fgSizer16;
+    fgSizer16 = new wxFlexGridSizer( 2, 3, 0, 0 );
+    fgSizer16->SetFlexibleDirection( wxBOTH );
+    fgSizer16->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    m_radioBtnSizeDate = new wxRadioButton( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
+    m_radioBtnSizeDate->SetValue( true );
+    m_radioBtnSizeDate->SetToolTip( _("Files are found equal if\n     - filesize\n     - last write time and date\nare the same") );
+
+    fgSizer16->Add( m_radioBtnSizeDate, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bitmapByTime = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    m_bitmapByTime->SetToolTip( _("Files are found equal if\n     - filesize\n     - last write time and date\nare the same") );
+
+    fgSizer16->Add( m_bitmapByTime, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_buttonTimeSize = new wxButton( this, wxID_ANY, _("File size and date"), wxDefaultPosition, wxSize( -1,42 ), 0 );
+    m_buttonTimeSize->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
+    m_buttonTimeSize->SetToolTip( _("Files are found equal if\n     - filesize\n     - last write time and date\nare the same") );
+
+    fgSizer16->Add( m_buttonTimeSize, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxALL, 5 );
+
+    m_radioBtnContent = new wxRadioButton( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+    m_radioBtnContent->SetToolTip( _("Files are found equal if\n     - file content\nis the same") );
+
+    fgSizer16->Add( m_radioBtnContent, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bitmapByContent = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    m_bitmapByContent->SetToolTip( _("Files are found equal if\n     - file content\nis the same") );
+
+    fgSizer16->Add( m_bitmapByContent, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_buttonContent = new wxButton( this, wxID_ANY, _("File content"), wxDefaultPosition, wxSize( -1,42 ), 0 );
+    m_buttonContent->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
+    m_buttonContent->SetToolTip( _("Files are found equal if\n     - file content\nis the same") );
+
+    fgSizer16->Add( m_buttonContent, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+    sbSizer6->Add( fgSizer16, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    m_staticline14 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    sbSizer6->Add( m_staticline14, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
+
+    m_bpButtonHelp = new wxBitmapButton( this, wxID_HELP, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    m_bpButtonHelp->SetToolTip( _("Help") );
+
+    sbSizer6->Add( m_bpButtonHelp, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer55->Add( sbSizer6, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 2 );
+
+
+    bSizer55->Add( 0, 4, 0, 0, 5 );
+
+    wxStaticBoxSizer* sbSizer25;
+    sbSizer25 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Symbolic Link handling") ), wxVERTICAL );
+
+    wxArrayString m_choiceHandleSymlinksChoices;
+    m_choiceHandleSymlinks = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceHandleSymlinksChoices, 0 );
+    m_choiceHandleSymlinks->SetSelection( 0 );
+    sbSizer25->Add( m_choiceHandleSymlinks, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    bSizer55->Add( sbSizer25, 0, wxEXPAND|wxTOP, 5 );
+
+    wxBoxSizer* bSizer22;
+    bSizer22 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_button10 = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_button10->SetDefault();
+    m_button10->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer22->Add( m_button10, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_button6 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_button6->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer22->Add( m_button6, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer55->Add( bSizer22, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    bSizer136->Add( bSizer55, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    this->SetSizer( bSizer136 );
+    this->Layout();
+    bSizer136->Fit( this );
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CmpCfgDlgGenerated::OnClose ) );
+    m_radioBtnSizeDate->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( CmpCfgDlgGenerated::OnTimeSize ), NULL, this );
+    m_buttonTimeSize->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnTimeSize ), NULL, this );
+    m_radioBtnContent->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( CmpCfgDlgGenerated::OnContent ), NULL, this );
+    m_buttonContent->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnContent ), NULL, this );
+    m_bpButtonHelp->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnShowHelp ), NULL, this );
+    m_choiceHandleSymlinks->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( CmpCfgDlgGenerated::OnChangeErrorHandling ), NULL, this );
+    m_button10->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnOkay ), NULL, this );
+    m_button6->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnCancel ), NULL, this );
 }
 
 CmpCfgDlgGenerated::~CmpCfgDlgGenerated()
 {
-	// Disconnect Events
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CmpCfgDlgGenerated::OnClose ) );
-	m_radioBtnSizeDate->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( CmpCfgDlgGenerated::OnTimeSize ), NULL, this );
-	m_buttonTimeSize->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnTimeSize ), NULL, this );
-	m_radioBtnContent->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( CmpCfgDlgGenerated::OnContent ), NULL, this );
-	m_buttonContent->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnContent ), NULL, this );
-	m_bpButtonHelp->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnShowHelp ), NULL, this );
-	m_choiceHandleSymlinks->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( CmpCfgDlgGenerated::OnChangeErrorHandling ), NULL, this );
-	m_button10->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnOkay ), NULL, this );
-	m_button6->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnCancel ), NULL, this );
-	
+    // Disconnect Events
+    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CmpCfgDlgGenerated::OnClose ) );
+    m_radioBtnSizeDate->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( CmpCfgDlgGenerated::OnTimeSize ), NULL, this );
+    m_buttonTimeSize->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnTimeSize ), NULL, this );
+    m_radioBtnContent->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( CmpCfgDlgGenerated::OnContent ), NULL, this );
+    m_buttonContent->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnContent ), NULL, this );
+    m_bpButtonHelp->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnShowHelp ), NULL, this );
+    m_choiceHandleSymlinks->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( CmpCfgDlgGenerated::OnChangeErrorHandling ), NULL, this );
+    m_button10->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnOkay ), NULL, this );
+    m_button6->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CmpCfgDlgGenerated::OnCancel ), NULL, this );
+
 }
 
 SyncStatusDlgGenerated::SyncStatusDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxFrame( parent, id, title, pos, size, style )
 {
-	this->SetSizeHints( wxSize( 470,300 ), wxDefaultSize );
-	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
-	
-	wxBoxSizer* bSizer27;
-	bSizer27 = new wxBoxSizer( wxVERTICAL );
-	
-	
-	bSizer27->Add( 0, 15, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer37;
-	bSizer37 = new wxBoxSizer( wxHORIZONTAL );
-	
-	bSizer27->Add( bSizer37, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	wxBoxSizer* bSizer42;
-	bSizer42 = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizer42->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_bitmapStatus = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 28,28 ), 0 );
-	bSizer42->Add( m_bitmapStatus, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticTextStatus = new wxStaticText( this, wxID_ANY, _("Synchronizing..."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextStatus->Wrap( -1 );
-	m_staticTextStatus->SetFont( wxFont( 14, 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer42->Add( m_staticTextStatus, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-	
-	m_animationControl1 = new wxAnimationCtrl( this, wxID_ANY, wxNullAnimation, wxDefaultPosition, wxDefaultSize, wxAC_DEFAULT_STYLE ); 
-	m_animationControl1->SetMinSize( wxSize( 45,45 ) );
-	
-	bSizer42->Add( m_animationControl1, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
-	
-	bSizer42->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	bSizer27->Add( bSizer42, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	bSizer31 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer111;
-	bSizer111 = new wxBoxSizer( wxVERTICAL );
-	
-	bSizerObjectsRemaining = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText25 = new wxStaticText( this, wxID_ANY, _("Elements remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText25->Wrap( -1 );
-	m_staticText25->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizerObjectsRemaining->Add( m_staticText25, 0, wxALIGN_BOTTOM, 5 );
-	
-	m_staticTextRemainingObj = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_staticTextRemainingObj->Wrap( -1 );
-	m_staticTextRemainingObj->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
-	
-	bSizerObjectsRemaining->Add( m_staticTextRemainingObj, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
-	
-	m_staticText96 = new wxStaticText( this, wxID_ANY, _("("), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText96->Wrap( -1 );
-	m_staticText96->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
-	
-	bSizerObjectsRemaining->Add( m_staticText96, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
-	
-	m_staticTextDataRemaining = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextDataRemaining->Wrap( -1 );
-	m_staticTextDataRemaining->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
-	
-	bSizerObjectsRemaining->Add( m_staticTextDataRemaining, 0, wxALIGN_BOTTOM, 5 );
-	
-	m_staticText97 = new wxStaticText( this, wxID_ANY, _(")"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText97->Wrap( -1 );
-	m_staticText97->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
-	
-	bSizerObjectsRemaining->Add( m_staticText97, 0, wxALIGN_BOTTOM, 5 );
-	
-	bSizer111->Add( bSizerObjectsRemaining, 0, 0, 5 );
-	
-	bSizerObjectsProcessed = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText251 = new wxStaticText( this, wxID_ANY, _("Elements processed:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText251->Wrap( -1 );
-	m_staticText251->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizerObjectsProcessed->Add( m_staticText251, 0, wxALIGN_BOTTOM, 5 );
-	
-	m_staticTextProcessedObj = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
-	m_staticTextProcessedObj->Wrap( -1 );
-	m_staticTextProcessedObj->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
-	
-	bSizerObjectsProcessed->Add( m_staticTextProcessedObj, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
-	
-	m_staticText98 = new wxStaticText( this, wxID_ANY, _("("), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText98->Wrap( -1 );
-	m_staticText98->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
-	
-	bSizerObjectsProcessed->Add( m_staticText98, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
-	
-	m_staticTextDataProcessed = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextDataProcessed->Wrap( -1 );
-	m_staticTextDataProcessed->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
-	
-	bSizerObjectsProcessed->Add( m_staticTextDataProcessed, 0, wxALIGN_BOTTOM, 5 );
-	
-	m_staticText99 = new wxStaticText( this, wxID_ANY, _(")"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText99->Wrap( -1 );
-	m_staticText99->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
-	
-	bSizerObjectsProcessed->Add( m_staticText99, 0, wxALIGN_BOTTOM, 5 );
-	
-	bSizer111->Add( bSizerObjectsProcessed, 0, 0, 5 );
-	
-	bSizer31->Add( bSizer111, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer31->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer114;
-	bSizer114 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText55 = new wxStaticText( this, wxID_ANY, _("Time elapsed:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText55->Wrap( -1 );
-	m_staticText55->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer114->Add( m_staticText55, 0, wxALIGN_BOTTOM, 5 );
-	
-	m_staticTextTimeElapsed = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextTimeElapsed->Wrap( -1 );
-	m_staticTextTimeElapsed->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
-	
-	bSizer114->Add( m_staticTextTimeElapsed, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
-	
-	bSizer31->Add( bSizer114, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer27->Add( bSizer31, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	bSizerProgressText = new wxBoxSizer( wxVERTICAL );
-	
-	m_textCtrlInfo = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY );
-	m_textCtrlInfo->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-	
-	bSizerProgressText->Add( m_textCtrlInfo, 3, wxEXPAND|wxALL, 5 );
-	
-	bSizer27->Add( bSizerProgressText, 1, wxEXPAND, 5 );
-	
-	m_gauge1 = new wxGauge( this, wxID_ANY, 100, wxDefaultPosition, wxSize( -1,20 ), wxGA_HORIZONTAL );
-	bSizer27->Add( m_gauge1, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	bSizer28 = new wxBoxSizer( wxHORIZONTAL );
-	
-	bSizerSpeed = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText108 = new wxStaticText( this, wxID_ANY, _("Speed:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText108->Wrap( -1 );
-	m_staticText108->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizerSpeed->Add( m_staticText108, 0, wxALIGN_BOTTOM, 5 );
-	
-	m_staticTextSpeed = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextSpeed->Wrap( -1 );
-	m_staticTextSpeed->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
-	
-	bSizerSpeed->Add( m_staticTextSpeed, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
-	
-	
-	bSizerSpeed->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer28->Add( bSizerSpeed, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer28->Add( 0, 0, 1, 0, 5 );
-	
-	m_buttonOK = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( 100,32 ), 0 );
-	m_buttonOK->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	m_buttonOK->Enable( false );
-	m_buttonOK->Hide();
-	
-	bSizer28->Add( m_buttonOK, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-	
-	m_buttonPause = new wxButton( this, wxID_ANY, _("&Pause"), wxDefaultPosition, wxSize( 100,32 ), 0 );
-	m_buttonPause->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer28->Add( m_buttonPause, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-	
-	m_buttonAbort = new wxButton( this, wxID_CANCEL, _("&Abort"), wxDefaultPosition, wxSize( 100,32 ), 0 );
-	m_buttonAbort->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer28->Add( m_buttonAbort, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-	
-	
-	bSizer28->Add( 0, 0, 1, 0, 5 );
-	
-	bSizerRemTime = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizerRemTime->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticText21 = new wxStaticText( this, wxID_ANY, _("Time remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText21->Wrap( -1 );
-	m_staticText21->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizerRemTime->Add( m_staticText21, 0, wxALIGN_BOTTOM, 5 );
-	
-	m_staticTextTimeRemaining = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextTimeRemaining->Wrap( -1 );
-	m_staticTextTimeRemaining->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
-	
-	bSizerRemTime->Add( m_staticTextTimeRemaining, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
-	
-	bSizer28->Add( bSizerRemTime, 1, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer27->Add( bSizer28, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxALL, 5 );
-	
-	
-	bSizer27->Add( 0, 5, 0, wxEXPAND, 5 );
-	
-	this->SetSizer( bSizer27 );
-	this->Layout();
-	
-	this->Centre( wxBOTH );
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SyncStatusDlgGenerated::OnClose ) );
-	this->Connect( wxEVT_ICONIZE, wxIconizeEventHandler( SyncStatusDlgGenerated::OnIconize ) );
-	m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncStatusDlgGenerated::OnOkay ), NULL, this );
-	m_buttonPause->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncStatusDlgGenerated::OnPause ), NULL, this );
-	m_buttonAbort->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncStatusDlgGenerated::OnAbort ), NULL, this );
+    this->SetSizeHints( wxSize( 470,300 ), wxDefaultSize );
+    this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ) );
+
+    wxBoxSizer* bSizer27;
+    bSizer27 = new wxBoxSizer( wxVERTICAL );
+
+
+    bSizer27->Add( 0, 15, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer37;
+    bSizer37 = new wxBoxSizer( wxHORIZONTAL );
+
+    bSizer27->Add( bSizer37, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    wxBoxSizer* bSizer42;
+    bSizer42 = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizer42->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_bitmapStatus = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 28,28 ), 0 );
+    bSizer42->Add( m_bitmapStatus, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticTextStatus = new wxStaticText( this, wxID_ANY, _("Synchronizing..."), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextStatus->Wrap( -1 );
+    m_staticTextStatus->SetFont( wxFont( 14, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer42->Add( m_staticTextStatus, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+
+    m_animationControl1 = new wxAnimationCtrl( this, wxID_ANY, wxNullAnimation, wxDefaultPosition, wxDefaultSize, wxAC_DEFAULT_STYLE );
+    m_animationControl1->SetMinSize( wxSize( 45,45 ) );
+
+    bSizer42->Add( m_animationControl1, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+
+
+    bSizer42->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    bSizer27->Add( bSizer42, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    bSizer31 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer111;
+    bSizer111 = new wxBoxSizer( wxVERTICAL );
+
+    bSizerObjectsRemaining = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText25 = new wxStaticText( this, wxID_ANY, _("Elements remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText25->Wrap( -1 );
+    m_staticText25->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizerObjectsRemaining->Add( m_staticText25, 0, wxALIGN_BOTTOM, 5 );
+
+    m_staticTextRemainingObj = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+    m_staticTextRemainingObj->Wrap( -1 );
+    m_staticTextRemainingObj->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
+
+    bSizerObjectsRemaining->Add( m_staticTextRemainingObj, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
+
+    m_staticText96 = new wxStaticText( this, wxID_ANY, _("("), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText96->Wrap( -1 );
+    m_staticText96->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
+
+    bSizerObjectsRemaining->Add( m_staticText96, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
+
+    m_staticTextDataRemaining = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextDataRemaining->Wrap( -1 );
+    m_staticTextDataRemaining->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
+
+    bSizerObjectsRemaining->Add( m_staticTextDataRemaining, 0, wxALIGN_BOTTOM, 5 );
+
+    m_staticText97 = new wxStaticText( this, wxID_ANY, _(")"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText97->Wrap( -1 );
+    m_staticText97->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
+
+    bSizerObjectsRemaining->Add( m_staticText97, 0, wxALIGN_BOTTOM, 5 );
+
+    bSizer111->Add( bSizerObjectsRemaining, 0, 0, 5 );
+
+    bSizerObjectsProcessed = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText251 = new wxStaticText( this, wxID_ANY, _("Elements processed:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText251->Wrap( -1 );
+    m_staticText251->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizerObjectsProcessed->Add( m_staticText251, 0, wxALIGN_BOTTOM, 5 );
+
+    m_staticTextProcessedObj = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxSize( -1,-1 ), 0 );
+    m_staticTextProcessedObj->Wrap( -1 );
+    m_staticTextProcessedObj->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
+
+    bSizerObjectsProcessed->Add( m_staticTextProcessedObj, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
+
+    m_staticText98 = new wxStaticText( this, wxID_ANY, _("("), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText98->Wrap( -1 );
+    m_staticText98->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
+
+    bSizerObjectsProcessed->Add( m_staticText98, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
+
+    m_staticTextDataProcessed = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextDataProcessed->Wrap( -1 );
+    m_staticTextDataProcessed->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
+
+    bSizerObjectsProcessed->Add( m_staticTextDataProcessed, 0, wxALIGN_BOTTOM, 5 );
+
+    m_staticText99 = new wxStaticText( this, wxID_ANY, _(")"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText99->Wrap( -1 );
+    m_staticText99->SetFont( wxFont( 9, 74, 90, 90, false, wxT("Arial") ) );
+
+    bSizerObjectsProcessed->Add( m_staticText99, 0, wxALIGN_BOTTOM, 5 );
+
+    bSizer111->Add( bSizerObjectsProcessed, 0, 0, 5 );
+
+    bSizer31->Add( bSizer111, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer31->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer114;
+    bSizer114 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText55 = new wxStaticText( this, wxID_ANY, _("Time elapsed:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText55->Wrap( -1 );
+    m_staticText55->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer114->Add( m_staticText55, 0, wxALIGN_BOTTOM, 5 );
+
+    m_staticTextTimeElapsed = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextTimeElapsed->Wrap( -1 );
+    m_staticTextTimeElapsed->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
+
+    bSizer114->Add( m_staticTextTimeElapsed, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
+
+    bSizer31->Add( bSizer114, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer27->Add( bSizer31, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+    bSizerProgressText = new wxBoxSizer( wxVERTICAL );
+
+    m_textCtrlInfo = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY );
+    m_textCtrlInfo->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+
+    bSizerProgressText->Add( m_textCtrlInfo, 3, wxEXPAND|wxALL, 5 );
+
+    bSizer27->Add( bSizerProgressText, 1, wxEXPAND, 5 );
+
+    m_gauge1 = new wxGauge( this, wxID_ANY, 100, wxDefaultPosition, wxSize( -1,20 ), wxGA_HORIZONTAL );
+    bSizer27->Add( m_gauge1, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+    bSizer28 = new wxBoxSizer( wxHORIZONTAL );
+
+    bSizerSpeed = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText108 = new wxStaticText( this, wxID_ANY, _("Speed:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText108->Wrap( -1 );
+    m_staticText108->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizerSpeed->Add( m_staticText108, 0, wxALIGN_BOTTOM, 5 );
+
+    m_staticTextSpeed = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextSpeed->Wrap( -1 );
+    m_staticTextSpeed->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
+
+    bSizerSpeed->Add( m_staticTextSpeed, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
+
+
+    bSizerSpeed->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer28->Add( bSizerSpeed, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer28->Add( 0, 0, 1, 0, 5 );
+
+    m_buttonOK = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( 100,32 ), 0 );
+    m_buttonOK->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+    m_buttonOK->Enable( false );
+    m_buttonOK->Hide();
+
+    bSizer28->Add( m_buttonOK, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+
+    m_buttonPause = new wxButton( this, wxID_ANY, _("&Pause"), wxDefaultPosition, wxSize( 100,32 ), 0 );
+    m_buttonPause->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer28->Add( m_buttonPause, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+
+    m_buttonAbort = new wxButton( this, wxID_CANCEL, _("&Abort"), wxDefaultPosition, wxSize( 100,32 ), 0 );
+    m_buttonAbort->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer28->Add( m_buttonAbort, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+
+
+    bSizer28->Add( 0, 0, 1, 0, 5 );
+
+    bSizerRemTime = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizerRemTime->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticText21 = new wxStaticText( this, wxID_ANY, _("Time remaining:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText21->Wrap( -1 );
+    m_staticText21->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizerRemTime->Add( m_staticText21, 0, wxALIGN_BOTTOM, 5 );
+
+    m_staticTextTimeRemaining = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextTimeRemaining->Wrap( -1 );
+    m_staticTextTimeRemaining->SetFont( wxFont( 9, 74, 90, 92, false, wxT("Arial") ) );
+
+    bSizerRemTime->Add( m_staticTextTimeRemaining, 0, wxLEFT|wxALIGN_BOTTOM, 5 );
+
+    bSizer28->Add( bSizerRemTime, 1, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer27->Add( bSizer28, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxALL, 5 );
+
+
+    bSizer27->Add( 0, 5, 0, wxEXPAND, 5 );
+
+    this->SetSizer( bSizer27 );
+    this->Layout();
+
+    this->Centre( wxBOTH );
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SyncStatusDlgGenerated::OnClose ) );
+    this->Connect( wxEVT_ICONIZE, wxIconizeEventHandler( SyncStatusDlgGenerated::OnIconize ) );
+    m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncStatusDlgGenerated::OnOkay ), NULL, this );
+    m_buttonPause->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncStatusDlgGenerated::OnPause ), NULL, this );
+    m_buttonAbort->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncStatusDlgGenerated::OnAbort ), NULL, this );
 }
 
 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, 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 );
 }
 
 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 );
+
 }
 
 HelpDlgGenerated::HelpDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-	
-	wxBoxSizer* bSizer20;
-	bSizer20 = new wxBoxSizer( wxVERTICAL );
-	
-	
-	bSizer20->Add( 0, 10, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer85;
-	bSizer85 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmap25 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), 0 );
-	bSizer85->Add( m_bitmap25, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_panel8 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER|wxTAB_TRAVERSAL );
-	m_panel8->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DLIGHT ) );
-	
-	wxBoxSizer* bSizer72;
-	bSizer72 = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizer72->Add( 20, 0, 0, 0, 5 );
-	
-	m_staticText56 = new wxStaticText( m_panel8, wxID_ANY, _("Help"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText56->Wrap( -1 );
-	m_staticText56->SetFont( wxFont( 16, 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer72->Add( m_staticText56, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer72->Add( 20, 0, 0, 0, 5 );
-	
-	m_panel8->SetSizer( bSizer72 );
-	m_panel8->Layout();
-	bSizer72->Fit( m_panel8 );
-	bSizer85->Add( m_panel8, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	
-	bSizer85->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer20->Add( bSizer85, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_notebook1 = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	m_scrolledWindow1 = new wxScrolledWindow( m_notebook1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxSIMPLE_BORDER|wxVSCROLL );
-	m_scrolledWindow1->SetScrollRate( 5, 5 );
-	m_scrolledWindow1->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_INACTIVEBORDER ) );
-	
-	wxBoxSizer* bSizer70;
-	bSizer70 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText59 = new wxStaticText( m_scrolledWindow1, wxID_ANY, _("Compare by \"File size and date\""), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText59->Wrap( 500 );
-	m_staticText59->SetFont( wxFont( 10, 70, 90, 92, true, wxEmptyString ) );
-	
-	bSizer70->Add( m_staticText59, 0, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_staticText60 = new wxStaticText( m_scrolledWindow1, wxID_ANY, _("This variant evaluates two equally named files as being equal when they have the same file size AND the same last write date and time."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText60->Wrap( 500 );
-	bSizer70->Add( m_staticText60, 0, wxALL, 5 );
-	
-	m_staticText61 = new wxStaticText( m_scrolledWindow1, wxID_ANY, _("When the comparison is started with this option set the following decision tree is processed:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText61->Wrap( 500 );
-	bSizer70->Add( m_staticText61, 0, wxALL, 5 );
-	
-	m_treeCtrl1 = new wxTreeCtrl( m_scrolledWindow1, wxID_ANY, wxDefaultPosition, wxSize( -1,175 ), wxTR_DEFAULT_STYLE );
-	m_treeCtrl1->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-	
-	bSizer70->Add( m_treeCtrl1, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	m_staticText63 = new wxStaticText( m_scrolledWindow1, wxID_ANY, _("As a result the files are separated into the following categories:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText63->Wrap( 500 );
-	bSizer70->Add( m_staticText63, 0, wxALL, 5 );
-	
-	m_staticText75 = new wxStaticText( m_scrolledWindow1, wxID_ANY, _("- equal"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText75->Wrap( -1 );
-	bSizer70->Add( m_staticText75, 0, wxRIGHT|wxLEFT, 5 );
-	
-	m_staticText76 = new wxStaticText( m_scrolledWindow1, wxID_ANY, _("- left newer"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText76->Wrap( -1 );
-	bSizer70->Add( m_staticText76, 0, wxRIGHT|wxLEFT, 5 );
-	
-	m_staticText77 = new wxStaticText( m_scrolledWindow1, wxID_ANY, _("- right newer"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText77->Wrap( -1 );
-	bSizer70->Add( m_staticText77, 0, wxRIGHT|wxLEFT, 5 );
-	
-	m_staticText79 = new wxStaticText( m_scrolledWindow1, wxID_ANY, _("- exists left only"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText79->Wrap( -1 );
-	bSizer70->Add( m_staticText79, 0, wxRIGHT|wxLEFT, 5 );
-	
-	m_staticText80 = new wxStaticText( m_scrolledWindow1, wxID_ANY, _("- exists right only"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText80->Wrap( -1 );
-	bSizer70->Add( m_staticText80, 0, wxRIGHT|wxLEFT, 5 );
-	
-	m_staticText78 = new wxStaticText( m_scrolledWindow1, wxID_ANY, _("- conflict"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText78->Wrap( -1 );
-	bSizer70->Add( m_staticText78, 0, wxRIGHT|wxLEFT, 5 );
-	
-	m_scrolledWindow1->SetSizer( bSizer70 );
-	m_scrolledWindow1->Layout();
-	bSizer70->Fit( m_scrolledWindow1 );
-	m_notebook1->AddPage( m_scrolledWindow1, _("File size and date"), true );
-	m_scrolledWindow5 = new wxScrolledWindow( m_notebook1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxSIMPLE_BORDER|wxVSCROLL );
-	m_scrolledWindow5->SetScrollRate( 5, 5 );
-	m_scrolledWindow5->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_INACTIVEBORDER ) );
-	
-	wxBoxSizer* bSizer74;
-	bSizer74 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText65 = new wxStaticText( m_scrolledWindow5, wxID_ANY, _("Compare by \"File content\""), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText65->Wrap( 500 );
-	m_staticText65->SetFont( wxFont( 10, 70, 90, 92, true, wxEmptyString ) );
-	
-	bSizer74->Add( m_staticText65, 0, wxALL, 5 );
-	
-	m_staticText66 = new wxStaticText( m_scrolledWindow5, wxID_ANY, _("As the name suggests, two files which share the same name are marked as equal if and only if they have the same content. This option is useful for consistency checks rather than backup operations. Therefore the file times are not taken into account at all.\n\nWith this option enabled the decision tree is smaller:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText66->Wrap( 500 );
-	bSizer74->Add( m_staticText66, 0, wxALL, 5 );
-	
-	m_treeCtrl2 = new wxTreeCtrl( m_scrolledWindow5, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTR_DEFAULT_STYLE );
-	m_treeCtrl2->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-	m_treeCtrl2->SetMinSize( wxSize( -1,130 ) );
-	
-	bSizer74->Add( m_treeCtrl2, 0, wxALL|wxEXPAND, 5 );
-	
-	m_staticText69 = new wxStaticText( m_scrolledWindow5, wxID_ANY, _("As a result the files are separated into the following categories:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText69->Wrap( 500 );
-	bSizer74->Add( m_staticText69, 0, wxALL, 5 );
-	
-	m_staticText81 = new wxStaticText( m_scrolledWindow5, wxID_ANY, _("- equal"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText81->Wrap( -1 );
-	bSizer74->Add( m_staticText81, 0, wxRIGHT|wxLEFT, 5 );
-	
-	m_staticText82 = new wxStaticText( m_scrolledWindow5, wxID_ANY, _("- different"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText82->Wrap( -1 );
-	bSizer74->Add( m_staticText82, 0, wxRIGHT|wxLEFT, 5 );
-	
-	m_staticText83 = new wxStaticText( m_scrolledWindow5, wxID_ANY, _("- exists left only"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText83->Wrap( -1 );
-	bSizer74->Add( m_staticText83, 0, wxRIGHT|wxLEFT, 5 );
-	
-	m_staticText84 = new wxStaticText( m_scrolledWindow5, wxID_ANY, _("- exists right only"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText84->Wrap( -1 );
-	bSizer74->Add( m_staticText84, 0, wxRIGHT|wxLEFT, 5 );
-	
-	m_scrolledWindow5->SetSizer( bSizer74 );
-	m_scrolledWindow5->Layout();
-	bSizer74->Fit( m_scrolledWindow5 );
-	m_notebook1->AddPage( m_scrolledWindow5, _("File content"), false );
-	
-	bSizer20->Add( m_notebook1, 1, wxEXPAND | wxALL, 5 );
-	
-	m_button8 = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( 100,32 ), 0 );
-	m_button8->SetDefault(); 
-	m_button8->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer20->Add( m_button8, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	this->SetSizer( bSizer20 );
-	this->Layout();
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( HelpDlgGenerated::OnClose ) );
-	m_button8->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( HelpDlgGenerated::OnOK ), NULL, this );
+    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+
+    wxBoxSizer* bSizer20;
+    bSizer20 = new wxBoxSizer( wxVERTICAL );
+
+
+    bSizer20->Add( 0, 10, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer85;
+    bSizer85 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmap25 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), 0 );
+    bSizer85->Add( m_bitmap25, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    m_panel8 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER|wxTAB_TRAVERSAL );
+    m_panel8->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DLIGHT ) );
+
+    wxBoxSizer* bSizer72;
+    bSizer72 = new wxBoxSizer( wxHORIZONTAL );
+
+
+    bSizer72->Add( 20, 0, 0, 0, 5 );
+
+    m_staticText56 = new wxStaticText( m_panel8, wxID_ANY, _("Help"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText56->Wrap( -1 );
+    m_staticText56->SetFont( wxFont( 16, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer72->Add( m_staticText56, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer72->Add( 20, 0, 0, 0, 5 );
+
+    m_panel8->SetSizer( bSizer72 );
+    m_panel8->Layout();
+    bSizer72->Fit( m_panel8 );
+    bSizer85->Add( m_panel8, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+
+    bSizer85->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer20->Add( bSizer85, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_notebook1 = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+    m_scrolledWindow1 = new wxScrolledWindow( m_notebook1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxSIMPLE_BORDER|wxVSCROLL );
+    m_scrolledWindow1->SetScrollRate( 5, 5 );
+    m_scrolledWindow1->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_INACTIVEBORDER ) );
+
+    wxBoxSizer* bSizer70;
+    bSizer70 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText59 = new wxStaticText( m_scrolledWindow1, wxID_ANY, _("Compare by \"File size and date\""), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText59->Wrap( 500 );
+    m_staticText59->SetFont( wxFont( 10, 70, 90, 92, true, wxEmptyString ) );
+
+    bSizer70->Add( m_staticText59, 0, wxALL|wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_staticText60 = new wxStaticText( m_scrolledWindow1, wxID_ANY, _("This variant evaluates two equally named files as being equal when they have the same file size AND the same last write date and time."), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText60->Wrap( 500 );
+    bSizer70->Add( m_staticText60, 0, wxALL, 5 );
+
+    m_staticText61 = new wxStaticText( m_scrolledWindow1, wxID_ANY, _("When the comparison is started with this option set the following decision tree is processed:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText61->Wrap( 500 );
+    bSizer70->Add( m_staticText61, 0, wxALL, 5 );
+
+    m_treeCtrl1 = new wxTreeCtrl( m_scrolledWindow1, wxID_ANY, wxDefaultPosition, wxSize( -1,175 ), wxTR_DEFAULT_STYLE );
+    m_treeCtrl1->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+
+    bSizer70->Add( m_treeCtrl1, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+    m_staticText63 = new wxStaticText( m_scrolledWindow1, wxID_ANY, _("As a result the files are separated into the following categories:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText63->Wrap( 500 );
+    bSizer70->Add( m_staticText63, 0, wxALL, 5 );
+
+    m_staticText75 = new wxStaticText( m_scrolledWindow1, wxID_ANY, _("- equal"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText75->Wrap( -1 );
+    bSizer70->Add( m_staticText75, 0, wxRIGHT|wxLEFT, 5 );
+
+    m_staticText76 = new wxStaticText( m_scrolledWindow1, wxID_ANY, _("- left newer"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText76->Wrap( -1 );
+    bSizer70->Add( m_staticText76, 0, wxRIGHT|wxLEFT, 5 );
+
+    m_staticText77 = new wxStaticText( m_scrolledWindow1, wxID_ANY, _("- right newer"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText77->Wrap( -1 );
+    bSizer70->Add( m_staticText77, 0, wxRIGHT|wxLEFT, 5 );
+
+    m_staticText79 = new wxStaticText( m_scrolledWindow1, wxID_ANY, _("- exists left only"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText79->Wrap( -1 );
+    bSizer70->Add( m_staticText79, 0, wxRIGHT|wxLEFT, 5 );
+
+    m_staticText80 = new wxStaticText( m_scrolledWindow1, wxID_ANY, _("- exists right only"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText80->Wrap( -1 );
+    bSizer70->Add( m_staticText80, 0, wxRIGHT|wxLEFT, 5 );
+
+    m_staticText78 = new wxStaticText( m_scrolledWindow1, wxID_ANY, _("- conflict"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText78->Wrap( -1 );
+    bSizer70->Add( m_staticText78, 0, wxRIGHT|wxLEFT, 5 );
+
+    m_scrolledWindow1->SetSizer( bSizer70 );
+    m_scrolledWindow1->Layout();
+    bSizer70->Fit( m_scrolledWindow1 );
+    m_notebook1->AddPage( m_scrolledWindow1, _("File size and date"), true );
+    m_scrolledWindow5 = new wxScrolledWindow( m_notebook1, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHSCROLL|wxSIMPLE_BORDER|wxVSCROLL );
+    m_scrolledWindow5->SetScrollRate( 5, 5 );
+    m_scrolledWindow5->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_INACTIVEBORDER ) );
+
+    wxBoxSizer* bSizer74;
+    bSizer74 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText65 = new wxStaticText( m_scrolledWindow5, wxID_ANY, _("Compare by \"File content\""), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText65->Wrap( 500 );
+    m_staticText65->SetFont( wxFont( 10, 70, 90, 92, true, wxEmptyString ) );
+
+    bSizer74->Add( m_staticText65, 0, wxALL, 5 );
+
+    m_staticText66 = new wxStaticText( m_scrolledWindow5, wxID_ANY, _("As the name suggests, two files which share the same name are marked as equal if and only if they have the same content. This option is useful for consistency checks rather than backup operations. Therefore the file times are not taken into account at all.\n\nWith this option enabled the decision tree is smaller:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText66->Wrap( 500 );
+    bSizer74->Add( m_staticText66, 0, wxALL, 5 );
+
+    m_treeCtrl2 = new wxTreeCtrl( m_scrolledWindow5, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTR_DEFAULT_STYLE );
+    m_treeCtrl2->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+    m_treeCtrl2->SetMinSize( wxSize( -1,130 ) );
+
+    bSizer74->Add( m_treeCtrl2, 0, wxALL|wxEXPAND, 5 );
+
+    m_staticText69 = new wxStaticText( m_scrolledWindow5, wxID_ANY, _("As a result the files are separated into the following categories:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText69->Wrap( 500 );
+    bSizer74->Add( m_staticText69, 0, wxALL, 5 );
+
+    m_staticText81 = new wxStaticText( m_scrolledWindow5, wxID_ANY, _("- equal"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText81->Wrap( -1 );
+    bSizer74->Add( m_staticText81, 0, wxRIGHT|wxLEFT, 5 );
+
+    m_staticText82 = new wxStaticText( m_scrolledWindow5, wxID_ANY, _("- different"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText82->Wrap( -1 );
+    bSizer74->Add( m_staticText82, 0, wxRIGHT|wxLEFT, 5 );
+
+    m_staticText83 = new wxStaticText( m_scrolledWindow5, wxID_ANY, _("- exists left only"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText83->Wrap( -1 );
+    bSizer74->Add( m_staticText83, 0, wxRIGHT|wxLEFT, 5 );
+
+    m_staticText84 = new wxStaticText( m_scrolledWindow5, wxID_ANY, _("- exists right only"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText84->Wrap( -1 );
+    bSizer74->Add( m_staticText84, 0, wxRIGHT|wxLEFT, 5 );
+
+    m_scrolledWindow5->SetSizer( bSizer74 );
+    m_scrolledWindow5->Layout();
+    bSizer74->Fit( m_scrolledWindow5 );
+    m_notebook1->AddPage( m_scrolledWindow5, _("File content"), false );
+
+    bSizer20->Add( m_notebook1, 1, wxEXPAND | wxALL, 5 );
+
+    m_button8 = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( 100,32 ), 0 );
+    m_button8->SetDefault();
+    m_button8->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer20->Add( m_button8, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    this->SetSizer( bSizer20 );
+    this->Layout();
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( HelpDlgGenerated::OnClose ) );
+    m_button8->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( HelpDlgGenerated::OnOK ), NULL, this );
 }
 
 HelpDlgGenerated::~HelpDlgGenerated()
 {
-	// Disconnect Events
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( HelpDlgGenerated::OnClose ) );
-	m_button8->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( HelpDlgGenerated::OnOK ), NULL, this );
-	
+    // Disconnect Events
+    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( HelpDlgGenerated::OnClose ) );
+    m_button8->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( HelpDlgGenerated::OnOK ), NULL, this );
+
 }
 
 AboutDlgGenerated::AboutDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-	
-	wxBoxSizer* bSizer31;
-	bSizer31 = new wxBoxSizer( wxVERTICAL );
-	
-	
-	bSizer31->Add( 0, 5, 0, 0, 5 );
-	
-	m_panel5 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxSIMPLE_BORDER|wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer36;
-	bSizer36 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmap11 = new wxStaticBitmap( m_panel5, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 404,55 ), 0 );
-	bSizer36->Add( m_bitmap11, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_panel5->SetSizer( bSizer36 );
-	m_panel5->Layout();
-	bSizer36->Fit( m_panel5 );
-	bSizer31->Add( m_panel5, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_build = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_build->Wrap( -1 );
-	m_build->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer31->Add( m_build, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	
-	bSizer31->Add( 0, 10, 0, 0, 5 );
-	
-	wxBoxSizer* bSizer53;
-	bSizer53 = new wxBoxSizer( wxVERTICAL );
-	
-	m_scrolledWindowCodeInfo = new wxScrolledWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxDOUBLE_BORDER|wxHSCROLL|wxVSCROLL );
-	m_scrolledWindowCodeInfo->SetScrollRate( 5, 5 );
-	m_scrolledWindowCodeInfo->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-	m_scrolledWindowCodeInfo->SetMinSize( wxSize( -1,120 ) );
-	
-	bSizerCodeInfo = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText72 = new wxStaticText( m_scrolledWindowCodeInfo, wxID_ANY, _("Source code written completely in C++ utilizing:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText72->Wrap( -1 );
-	m_staticText72->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizerCodeInfo->Add( m_staticText72, 0, wxTOP|wxBOTTOM|wxLEFT|wxEXPAND, 5 );
-	
-	m_staticText73 = new wxStaticText( m_scrolledWindowCodeInfo, wxID_ANY, _("  MinGW \t- Windows port of GNU Compiler Collection\n  wxWidgets \t- Open-Source GUI framework\n  wxFormBuilder\t- wxWidgets GUI-builder\n  CodeBlocks \t- Open-Source IDE"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText73->Wrap( -1 );
-	bSizerCodeInfo->Add( m_staticText73, 0, wxALL|wxEXPAND, 5 );
-	
-	m_hyperlink21 = new wxHyperlinkCtrl( m_scrolledWindowCodeInfo, 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_scrolledWindowCodeInfo->SetSizer( bSizerCodeInfo );
-	m_scrolledWindowCodeInfo->Layout();
-	bSizerCodeInfo->Fit( m_scrolledWindowCodeInfo );
-	bSizer53->Add( m_scrolledWindowCodeInfo, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxBOTTOM, 10 );
-	
-	m_scrolledWindowTranslators = new wxScrolledWindow( this, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxDOUBLE_BORDER|wxHSCROLL|wxVSCROLL );
-	m_scrolledWindowTranslators->SetScrollRate( 5, 5 );
-	m_scrolledWindowTranslators->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-	m_scrolledWindowTranslators->SetMinSize( wxSize( -1,140 ) );
-	m_scrolledWindowTranslators->SetMaxSize( wxSize( -1,145 ) );
-	
-	bSizerTranslators = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText54 = new wxStaticText( m_scrolledWindowTranslators, wxID_ANY, _("Big thanks for localizing FreeFileSync goes out to:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText54->Wrap( -1 );
-	m_staticText54->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizerTranslators->Add( m_staticText54, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxBOTTOM, 5 );
-	
-	
-	bSizerTranslators->Add( 0, 5, 0, 0, 5 );
-	
-	fgSizerTranslators = new wxFlexGridSizer( 50, 3, 5, 20 );
-	fgSizerTranslators->SetFlexibleDirection( wxBOTH );
-	fgSizerTranslators->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	bSizerTranslators->Add( fgSizerTranslators, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_scrolledWindowTranslators->SetSizer( bSizerTranslators );
-	m_scrolledWindowTranslators->Layout();
-	bSizerTranslators->Fit( m_scrolledWindowTranslators );
-	bSizer53->Add( m_scrolledWindowTranslators, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxBOTTOM, 5 );
-	
-	bSizer31->Add( bSizer53, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT|wxEXPAND, 25 );
-	
-	m_staticline3 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer31->Add( m_staticline3, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
-	
-	m_staticText131 = new wxStaticText( this, wxID_ANY, _("Feedback and suggestions are welcome at:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText131->Wrap( -1 );
-	m_staticText131->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer31->Add( m_staticText131, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_staticline12 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer31->Add( m_staticline12, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
-	
-	wxBoxSizer* bSizer156;
-	bSizer156 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmap9 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 );
-	m_bitmap9->SetToolTip( _("FreeFileSync at Sourceforge") );
-	
-	bSizer156->Add( m_bitmap9, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-	
-	m_hyperlink1 = new wxHyperlinkCtrl( this, wxID_ANY, _("Homepage"), wxT("http://sourceforge.net/projects/freefilesync/"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink1->SetFont( wxFont( 10, 70, 90, 92, true, wxEmptyString ) );
-	m_hyperlink1->SetToolTip( _("http://sourceforge.net/projects/freefilesync/") );
-	
-	bSizer156->Add( m_hyperlink1, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer156->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_hyperlink3 = new wxHyperlinkCtrl( this, wxID_ANY, _("If you like FFS"), wxT("https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=zhnmju123%40gmx%2ede&no_shipping=0&no_note=1&tax=0&currency_code=EUR&lc=EN&bn=PP%2dDonationsBF&charset=UTF%2d8"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink3->SetFont( wxFont( 10, 70, 90, 92, true, wxEmptyString ) );
-	m_hyperlink3->SetToolTip( _("https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=zhnmju123%40gmx%2ede&no_shipping=0&no_note=1&tax=0&currency_code=EUR&lc=EN&bn=PP%2dDonationsBF&charset=UTF%2d8") );
-	
-	bSizer156->Add( m_hyperlink3, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_animationControl1 = new wxAnimationCtrl( this, wxID_ANY, wxNullAnimation, wxDefaultPosition, wxSize( -1,-1 ), wxAC_DEFAULT_STYLE ); 
-	m_animationControl1->SetToolTip( _("Donate with PayPal") );
-	m_animationControl1->SetMinSize( wxSize( 48,48 ) );
-	
-	bSizer156->Add( m_animationControl1, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-	
-	bSizer31->Add( bSizer156, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxRIGHT|wxLEFT, 10 );
-	
-	wxBoxSizer* bSizer158;
-	bSizer158 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmap10 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 );
-	m_bitmap10->SetToolTip( _("Email") );
-	
-	bSizer158->Add( m_bitmap10, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-	
-	m_hyperlink2 = new wxHyperlinkCtrl( this, wxID_ANY, _("Email"), wxT("mailto:zhnmju123@gmx.de"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink2->SetFont( wxFont( 10, 70, 90, 92, true, wxEmptyString ) );
-	m_hyperlink2->SetToolTip( _("zhnmju123@gmx.de") );
-	
-	bSizer158->Add( m_hyperlink2, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer158->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_hyperlink6 = new wxHyperlinkCtrl( this, wxID_ANY, _("Report translation error"), wxT("http://sourceforge.net/projects/freefilesync/forums/forum/976976"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	m_hyperlink6->SetFont( wxFont( 10, 70, 90, 92, true, wxEmptyString ) );
-	m_hyperlink6->SetToolTip( _("http://sourceforge.net/projects/freefilesync/forums/forum/976976") );
-	
-	bSizer158->Add( m_hyperlink6, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bitmapTransl = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 );
-	m_bitmapTransl->SetToolTip( _("Report translation error") );
-	
-	bSizer158->Add( m_bitmapTransl, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-	
-	bSizer31->Add( bSizer158, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxRIGHT|wxLEFT, 10 );
-	
-	m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer31->Add( m_staticline2, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
-	
-	wxStaticBoxSizer* sbSizer14;
-	sbSizer14 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Published under the GNU General Public License:") ), wxHORIZONTAL );
-	
-	
-	sbSizer14->Add( 0, 0, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bitmap13 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 88,31 ), 0 );
-	sbSizer14->Add( m_bitmap13, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_hyperlink5 = new wxHyperlinkCtrl( this, wxID_ANY, _("http://www.gnu.org/licenses/gpl.html"), wxT("http://www.gnu.org/licenses/gpl.html"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
-	sbSizer14->Add( m_hyperlink5, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	sbSizer14->Add( 0, 0, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer31->Add( sbSizer14, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
-	
-	m_buttonOkay = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( 100,32 ), 0 );
-	m_buttonOkay->SetDefault(); 
-	m_buttonOkay->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer31->Add( m_buttonOkay, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
-	
-	this->SetSizer( bSizer31 );
-	this->Layout();
-	bSizer31->Fit( this );
-	
-	this->Centre( wxBOTH );
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( AboutDlgGenerated::OnClose ) );
-	m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::OnOK ), NULL, this );
+    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+
+    wxBoxSizer* bSizer31;
+    bSizer31 = new wxBoxSizer( wxVERTICAL );
+
+
+    bSizer31->Add( 0, 5, 0, 0, 5 );
+
+    m_panel5 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxSIMPLE_BORDER|wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer36;
+    bSizer36 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmap11 = new wxStaticBitmap( m_panel5, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 404,55 ), 0 );
+    bSizer36->Add( m_bitmap11, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_panel5->SetSizer( bSizer36 );
+    m_panel5->Layout();
+    bSizer36->Fit( m_panel5 );
+    bSizer31->Add( m_panel5, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_build = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_build->Wrap( -1 );
+    m_build->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer31->Add( m_build, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+
+    bSizer31->Add( 0, 10, 0, 0, 5 );
+
+    wxBoxSizer* bSizer53;
+    bSizer53 = new wxBoxSizer( wxVERTICAL );
+
+    m_scrolledWindowCodeInfo = new wxScrolledWindow( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxDOUBLE_BORDER|wxHSCROLL|wxVSCROLL );
+    m_scrolledWindowCodeInfo->SetScrollRate( 5, 5 );
+    m_scrolledWindowCodeInfo->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+    m_scrolledWindowCodeInfo->SetMinSize( wxSize( -1,120 ) );
+
+    bSizerCodeInfo = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText72 = new wxStaticText( m_scrolledWindowCodeInfo, wxID_ANY, _("Source code written completely in C++ utilizing:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText72->Wrap( -1 );
+    m_staticText72->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
+
+    bSizerCodeInfo->Add( m_staticText72, 0, wxTOP|wxBOTTOM|wxLEFT|wxEXPAND, 5 );
+
+    m_staticText73 = new wxStaticText( m_scrolledWindowCodeInfo, wxID_ANY, _("  MinGW \t- Windows port of GNU Compiler Collection\n  wxWidgets \t- Open-Source GUI framework\n  wxFormBuilder\t- wxWidgets GUI-builder\n  CodeBlocks \t- Open-Source IDE"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText73->Wrap( -1 );
+    bSizerCodeInfo->Add( m_staticText73, 0, wxALL|wxEXPAND, 5 );
+
+    m_hyperlink21 = new wxHyperlinkCtrl( m_scrolledWindowCodeInfo, 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_scrolledWindowCodeInfo->SetSizer( bSizerCodeInfo );
+    m_scrolledWindowCodeInfo->Layout();
+    bSizerCodeInfo->Fit( m_scrolledWindowCodeInfo );
+    bSizer53->Add( m_scrolledWindowCodeInfo, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxBOTTOM, 10 );
+
+    m_scrolledWindowTranslators = new wxScrolledWindow( this, wxID_ANY, wxDefaultPosition, wxSize( -1,-1 ), wxDOUBLE_BORDER|wxHSCROLL|wxVSCROLL );
+    m_scrolledWindowTranslators->SetScrollRate( 5, 5 );
+    m_scrolledWindowTranslators->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+    m_scrolledWindowTranslators->SetMinSize( wxSize( -1,140 ) );
+    m_scrolledWindowTranslators->SetMaxSize( wxSize( -1,145 ) );
+
+    bSizerTranslators = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText54 = new wxStaticText( m_scrolledWindowTranslators, wxID_ANY, _("Big thanks for localizing FreeFileSync goes out to:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText54->Wrap( -1 );
+    m_staticText54->SetFont( wxFont( 8, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizerTranslators->Add( m_staticText54, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxBOTTOM, 5 );
+
+
+    bSizerTranslators->Add( 0, 5, 0, 0, 5 );
+
+    fgSizerTranslators = new wxFlexGridSizer( 50, 3, 5, 20 );
+    fgSizerTranslators->SetFlexibleDirection( wxBOTH );
+    fgSizerTranslators->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+    bSizerTranslators->Add( fgSizerTranslators, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_scrolledWindowTranslators->SetSizer( bSizerTranslators );
+    m_scrolledWindowTranslators->Layout();
+    bSizerTranslators->Fit( m_scrolledWindowTranslators );
+    bSizer53->Add( m_scrolledWindowTranslators, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxBOTTOM, 5 );
+
+    bSizer31->Add( bSizer53, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT|wxEXPAND, 25 );
+
+    m_staticline3 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer31->Add( m_staticline3, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
+
+    m_staticText131 = new wxStaticText( this, wxID_ANY, _("Feedback and suggestions are welcome at:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText131->Wrap( -1 );
+    m_staticText131->SetFont( wxFont( 11, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer31->Add( m_staticText131, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_staticline12 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer31->Add( m_staticline12, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
+
+    wxBoxSizer* bSizer156;
+    bSizer156 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmap9 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 );
+    m_bitmap9->SetToolTip( _("FreeFileSync at Sourceforge") );
+
+    bSizer156->Add( m_bitmap9, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+
+    m_hyperlink1 = new wxHyperlinkCtrl( this, wxID_ANY, _("Homepage"), wxT("http://sourceforge.net/projects/freefilesync/"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink1->SetFont( wxFont( 10, 70, 90, 92, true, wxEmptyString ) );
+    m_hyperlink1->SetToolTip( _("http://sourceforge.net/projects/freefilesync/") );
+
+    bSizer156->Add( m_hyperlink1, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer156->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_hyperlink3 = new wxHyperlinkCtrl( this, wxID_ANY, _("If you like FFS"), wxT("https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=zhnmju123%40gmx%2ede&no_shipping=0&no_note=1&tax=0&currency_code=EUR&lc=EN&bn=PP%2dDonationsBF&charset=UTF%2d8"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink3->SetFont( wxFont( 10, 70, 90, 92, true, wxEmptyString ) );
+    m_hyperlink3->SetToolTip( _("https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=zhnmju123%40gmx%2ede&no_shipping=0&no_note=1&tax=0&currency_code=EUR&lc=EN&bn=PP%2dDonationsBF&charset=UTF%2d8") );
+
+    bSizer156->Add( m_hyperlink3, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_animationControl1 = new wxAnimationCtrl( this, wxID_ANY, wxNullAnimation, wxDefaultPosition, wxSize( -1,-1 ), wxAC_DEFAULT_STYLE );
+    m_animationControl1->SetToolTip( _("Donate with PayPal") );
+    m_animationControl1->SetMinSize( wxSize( 48,48 ) );
+
+    bSizer156->Add( m_animationControl1, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+
+    bSizer31->Add( bSizer156, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxRIGHT|wxLEFT, 10 );
+
+    wxBoxSizer* bSizer158;
+    bSizer158 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmap10 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 );
+    m_bitmap10->SetToolTip( _("Email") );
+
+    bSizer158->Add( m_bitmap10, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+
+    m_hyperlink2 = new wxHyperlinkCtrl( this, wxID_ANY, _("Email"), wxT("mailto:zhnmju123@gmx.de"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink2->SetFont( wxFont( 10, 70, 90, 92, true, wxEmptyString ) );
+    m_hyperlink2->SetToolTip( _("zhnmju123@gmx.de") );
+
+    bSizer158->Add( m_hyperlink2, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer158->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_hyperlink6 = new wxHyperlinkCtrl( this, wxID_ANY, _("Report translation error"), wxT("http://sourceforge.net/projects/freefilesync/forums/forum/976976"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    m_hyperlink6->SetFont( wxFont( 10, 70, 90, 92, true, wxEmptyString ) );
+    m_hyperlink6->SetToolTip( _("http://sourceforge.net/projects/freefilesync/forums/forum/976976") );
+
+    bSizer158->Add( m_hyperlink6, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bitmapTransl = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 );
+    m_bitmapTransl->SetToolTip( _("Report translation error") );
+
+    bSizer158->Add( m_bitmapTransl, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+
+    bSizer31->Add( bSizer158, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxRIGHT|wxLEFT, 10 );
+
+    m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer31->Add( m_staticline2, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
+
+    wxStaticBoxSizer* sbSizer14;
+    sbSizer14 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Published under the GNU General Public License:") ), wxHORIZONTAL );
+
+
+    sbSizer14->Add( 0, 0, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bitmap13 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 88,31 ), 0 );
+    sbSizer14->Add( m_bitmap13, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_hyperlink5 = new wxHyperlinkCtrl( this, wxID_ANY, _("http://www.gnu.org/licenses/gpl.html"), wxT("http://www.gnu.org/licenses/gpl.html"), wxDefaultPosition, wxDefaultSize, wxHL_DEFAULT_STYLE );
+    sbSizer14->Add( m_hyperlink5, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    sbSizer14->Add( 0, 0, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer31->Add( sbSizer14, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
+
+    m_buttonOkay = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( 100,32 ), 0 );
+    m_buttonOkay->SetDefault();
+    m_buttonOkay->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer31->Add( m_buttonOkay, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+
+    this->SetSizer( bSizer31 );
+    this->Layout();
+    bSizer31->Fit( this );
+
+    this->Centre( wxBOTH );
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( AboutDlgGenerated::OnClose ) );
+    m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::OnOK ), NULL, this );
 }
 
 AboutDlgGenerated::~AboutDlgGenerated()
 {
-	// Disconnect Events
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( AboutDlgGenerated::OnClose ) );
-	m_buttonOkay->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::OnOK ), NULL, this );
-	
+    // Disconnect Events
+    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( AboutDlgGenerated::OnClose ) );
+    m_buttonOkay->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( AboutDlgGenerated::OnOK ), NULL, this );
+
 }
 
 ErrorDlgGenerated::ErrorDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-	
-	wxBoxSizer* bSizer24;
-	bSizer24 = new wxBoxSizer( wxVERTICAL );
-	
-	
-	bSizer24->Add( 0, 10, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer26;
-	bSizer26 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmap10 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 );
-	bSizer26->Add( m_bitmap10, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_textCtrl8 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE|wxTE_READONLY );
-	m_textCtrl8->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-	
-	bSizer26->Add( m_textCtrl8, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
-	
-	bSizer24->Add( bSizer26, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	m_checkBoxIgnoreErrors = new wxCheckBox( this, wxID_ANY, _("Ignore subsequent errors"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_checkBoxIgnoreErrors->SetToolTip( _("Hide further error messages during the current process") );
-	
-	bSizer24->Add( m_checkBoxIgnoreErrors, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP, 10 );
-	
-	
-	bSizer24->Add( 0, 5, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer25;
-	bSizer25 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_buttonIgnore = new wxButton( this, wxID_OK, _("&Ignore"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_buttonIgnore->SetDefault(); 
-	m_buttonIgnore->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer25->Add( m_buttonIgnore, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
-	
-	m_buttonRetry = new wxButton( this, wxID_RETRY, _("&Retry"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_buttonRetry->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer25->Add( m_buttonRetry, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
-	
-	m_buttonAbort = new wxButton( this, wxID_CANCEL, _("&Abort"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_buttonAbort->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer25->Add( m_buttonAbort, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
-	
-	
-	bSizer25->Add( 5, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer24->Add( bSizer25, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	this->SetSizer( bSizer24 );
-	this->Layout();
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( ErrorDlgGenerated::OnClose ) );
-	m_buttonIgnore->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ErrorDlgGenerated::OnIgnore ), NULL, this );
-	m_buttonRetry->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ErrorDlgGenerated::OnRetry ), NULL, this );
-	m_buttonAbort->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ErrorDlgGenerated::OnAbort ), NULL, this );
+    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+
+    wxBoxSizer* bSizer24;
+    bSizer24 = new wxBoxSizer( wxVERTICAL );
+
+
+    bSizer24->Add( 0, 10, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer26;
+    bSizer26 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmap10 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 );
+    bSizer26->Add( m_bitmap10, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_textCtrl8 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE|wxTE_READONLY );
+    m_textCtrl8->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+
+    bSizer26->Add( m_textCtrl8, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
+
+    bSizer24->Add( bSizer26, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+    m_checkBoxIgnoreErrors = new wxCheckBox( this, wxID_ANY, _("Ignore subsequent errors"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_checkBoxIgnoreErrors->SetToolTip( _("Hide further error messages during the current process") );
+
+    bSizer24->Add( m_checkBoxIgnoreErrors, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP, 10 );
+
+
+    bSizer24->Add( 0, 5, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer25;
+    bSizer25 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_buttonIgnore = new wxButton( this, wxID_OK, _("&Ignore"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_buttonIgnore->SetDefault();
+    m_buttonIgnore->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer25->Add( m_buttonIgnore, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+    m_buttonRetry = new wxButton( this, wxID_RETRY, _("&Retry"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_buttonRetry->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer25->Add( m_buttonRetry, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+    m_buttonAbort = new wxButton( this, wxID_CANCEL, _("&Abort"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_buttonAbort->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer25->Add( m_buttonAbort, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+
+    bSizer25->Add( 5, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer24->Add( bSizer25, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    this->SetSizer( bSizer24 );
+    this->Layout();
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( ErrorDlgGenerated::OnClose ) );
+    m_buttonIgnore->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ErrorDlgGenerated::OnIgnore ), NULL, this );
+    m_buttonRetry->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ErrorDlgGenerated::OnRetry ), NULL, this );
+    m_buttonAbort->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ErrorDlgGenerated::OnAbort ), NULL, this );
 }
 
 ErrorDlgGenerated::~ErrorDlgGenerated()
 {
-	// Disconnect Events
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( ErrorDlgGenerated::OnClose ) );
-	m_buttonIgnore->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ErrorDlgGenerated::OnIgnore ), NULL, this );
-	m_buttonRetry->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ErrorDlgGenerated::OnRetry ), NULL, this );
-	m_buttonAbort->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ErrorDlgGenerated::OnAbort ), NULL, this );
-	
+    // Disconnect Events
+    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( ErrorDlgGenerated::OnClose ) );
+    m_buttonIgnore->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ErrorDlgGenerated::OnIgnore ), NULL, this );
+    m_buttonRetry->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ErrorDlgGenerated::OnRetry ), NULL, this );
+    m_buttonAbort->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( ErrorDlgGenerated::OnAbort ), NULL, this );
+
 }
 
 WarningDlgGenerated::WarningDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-	
-	wxBoxSizer* bSizer24;
-	bSizer24 = new wxBoxSizer( wxVERTICAL );
-	
-	
-	bSizer24->Add( 0, 10, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer26;
-	bSizer26 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmap10 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 );
-	bSizer26->Add( m_bitmap10, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_textCtrl8 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE|wxTE_READONLY );
-	m_textCtrl8->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-	
-	bSizer26->Add( m_textCtrl8, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
-	
-	bSizer24->Add( bSizer26, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	m_checkBoxDontShowAgain = new wxCheckBox( this, wxID_ANY, _("Do not show this dialog again"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer24->Add( m_checkBoxDontShowAgain, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP, 10 );
-	
-	
-	bSizer24->Add( 0, 5, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer25;
-	bSizer25 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_buttonIgnore = new wxButton( this, wxID_IGNORE, _("&Ignore"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_buttonIgnore->SetDefault(); 
-	m_buttonIgnore->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer25->Add( m_buttonIgnore, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
-	
-	m_buttonSwitch = new wxButton( this, wxID_MORE, _("&Switch"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_buttonSwitch->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer25->Add( m_buttonSwitch, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
-	
-	m_buttonAbort = new wxButton( this, wxID_CANCEL, _("&Abort"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_buttonAbort->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer25->Add( m_buttonAbort, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
-	
-	
-	bSizer25->Add( 5, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer24->Add( bSizer25, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	this->SetSizer( bSizer24 );
-	this->Layout();
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( WarningDlgGenerated::OnClose ) );
-	m_buttonIgnore->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarningDlgGenerated::OnIgnore ), NULL, this );
-	m_buttonSwitch->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarningDlgGenerated::OnSwitch ), NULL, this );
-	m_buttonAbort->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarningDlgGenerated::OnAbort ), NULL, this );
+    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+
+    wxBoxSizer* bSizer24;
+    bSizer24 = new wxBoxSizer( wxVERTICAL );
+
+
+    bSizer24->Add( 0, 10, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer26;
+    bSizer26 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmap10 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 );
+    bSizer26->Add( m_bitmap10, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_textCtrl8 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE|wxTE_READONLY );
+    m_textCtrl8->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+
+    bSizer26->Add( m_textCtrl8, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
+
+    bSizer24->Add( bSizer26, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+    m_checkBoxDontShowAgain = new wxCheckBox( this, wxID_ANY, _("Do not show this dialog again"), wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer24->Add( m_checkBoxDontShowAgain, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP, 10 );
+
+
+    bSizer24->Add( 0, 5, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer25;
+    bSizer25 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_buttonIgnore = new wxButton( this, wxID_IGNORE, _("&Ignore"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_buttonIgnore->SetDefault();
+    m_buttonIgnore->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer25->Add( m_buttonIgnore, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+    m_buttonSwitch = new wxButton( this, wxID_MORE, _("&Switch"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_buttonSwitch->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer25->Add( m_buttonSwitch, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+    m_buttonAbort = new wxButton( this, wxID_CANCEL, _("&Abort"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_buttonAbort->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer25->Add( m_buttonAbort, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+
+    bSizer25->Add( 5, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer24->Add( bSizer25, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    this->SetSizer( bSizer24 );
+    this->Layout();
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( WarningDlgGenerated::OnClose ) );
+    m_buttonIgnore->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarningDlgGenerated::OnIgnore ), NULL, this );
+    m_buttonSwitch->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarningDlgGenerated::OnSwitch ), NULL, this );
+    m_buttonAbort->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarningDlgGenerated::OnAbort ), NULL, this );
 }
 
 WarningDlgGenerated::~WarningDlgGenerated()
 {
-	// Disconnect Events
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( WarningDlgGenerated::OnClose ) );
-	m_buttonIgnore->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarningDlgGenerated::OnIgnore ), NULL, this );
-	m_buttonSwitch->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarningDlgGenerated::OnSwitch ), NULL, this );
-	m_buttonAbort->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarningDlgGenerated::OnAbort ), NULL, this );
-	
+    // Disconnect Events
+    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( WarningDlgGenerated::OnClose ) );
+    m_buttonIgnore->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarningDlgGenerated::OnIgnore ), NULL, this );
+    m_buttonSwitch->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarningDlgGenerated::OnSwitch ), NULL, this );
+    m_buttonAbort->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( WarningDlgGenerated::OnAbort ), NULL, this );
+
 }
 
 QuestionDlgGenerated::QuestionDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-	
-	wxBoxSizer* bSizer24;
-	bSizer24 = new wxBoxSizer( wxVERTICAL );
-	
-	
-	bSizer24->Add( 0, 10, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer26;
-	bSizer26 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmap10 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 );
-	bSizer26->Add( m_bitmap10, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_textCtrl8 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE|wxTE_READONLY );
-	m_textCtrl8->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-	
-	bSizer26->Add( m_textCtrl8, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
-	
-	bSizer24->Add( bSizer26, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	m_checkBoxDontAskAgain = new wxCheckBox( this, wxID_ANY, _("Do not show this dialog again"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer24->Add( m_checkBoxDontAskAgain, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP, 10 );
-	
-	
-	bSizer24->Add( 0, 5, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer25;
-	bSizer25 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_buttonYes = new wxButton( this, wxID_YES, _("&Yes"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_buttonYes->SetDefault(); 
-	m_buttonYes->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer25->Add( m_buttonYes, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
-	
-	m_buttonNo = new wxButton( this, wxID_NO, _("&No"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_buttonNo->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer25->Add( m_buttonNo, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
-	
-	m_buttonCancel = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_buttonCancel->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer25->Add( m_buttonCancel, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
-	
-	
-	bSizer25->Add( 5, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer24->Add( bSizer25, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	this->SetSizer( bSizer24 );
-	this->Layout();
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( QuestionDlgGenerated::OnClose ) );
-	m_buttonYes->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( QuestionDlgGenerated::OnYes ), NULL, this );
-	m_buttonNo->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( QuestionDlgGenerated::OnNo ), NULL, this );
-	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( QuestionDlgGenerated::OnCancel ), NULL, this );
+    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+
+    wxBoxSizer* bSizer24;
+    bSizer24 = new wxBoxSizer( wxVERTICAL );
+
+
+    bSizer24->Add( 0, 10, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer26;
+    bSizer26 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmap10 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 48,48 ), 0 );
+    bSizer26->Add( m_bitmap10, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_textCtrl8 = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE|wxTE_READONLY );
+    m_textCtrl8->SetBackgroundColour( wxColour( 208, 208, 208 ) );
+
+    bSizer26->Add( m_textCtrl8, 1, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
+
+    bSizer24->Add( bSizer26, 1, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+    m_checkBoxDontAskAgain = new wxCheckBox( this, wxID_ANY, _("Do not show this dialog again"), wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer24->Add( m_checkBoxDontAskAgain, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP, 10 );
+
+
+    bSizer24->Add( 0, 5, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer25;
+    bSizer25 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_buttonYes = new wxButton( this, wxID_YES, _("&Yes"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_buttonYes->SetDefault();
+    m_buttonYes->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer25->Add( m_buttonYes, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+    m_buttonNo = new wxButton( this, wxID_NO, _("&No"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_buttonNo->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer25->Add( m_buttonNo, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+    m_buttonCancel = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_buttonCancel->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer25->Add( m_buttonCancel, 0, wxTOP|wxBOTTOM|wxLEFT, 5 );
+
+
+    bSizer25->Add( 5, 0, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer24->Add( bSizer25, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    this->SetSizer( bSizer24 );
+    this->Layout();
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( QuestionDlgGenerated::OnClose ) );
+    m_buttonYes->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( QuestionDlgGenerated::OnYes ), NULL, this );
+    m_buttonNo->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( QuestionDlgGenerated::OnNo ), NULL, this );
+    m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( QuestionDlgGenerated::OnCancel ), NULL, this );
 }
 
 QuestionDlgGenerated::~QuestionDlgGenerated()
 {
-	// Disconnect Events
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( QuestionDlgGenerated::OnClose ) );
-	m_buttonYes->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( QuestionDlgGenerated::OnYes ), NULL, this );
-	m_buttonNo->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( QuestionDlgGenerated::OnNo ), NULL, this );
-	m_buttonCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( QuestionDlgGenerated::OnCancel ), NULL, this );
-	
+    // Disconnect Events
+    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( QuestionDlgGenerated::OnClose ) );
+    m_buttonYes->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( QuestionDlgGenerated::OnYes ), NULL, this );
+    m_buttonNo->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( QuestionDlgGenerated::OnNo ), NULL, this );
+    m_buttonCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( QuestionDlgGenerated::OnCancel ), NULL, this );
+
 }
 
 DeleteDlgGenerated::DeleteDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-	
-	wxBoxSizer* bSizer24;
-	bSizer24 = new wxBoxSizer( wxVERTICAL );
-	
-	
-	bSizer24->Add( 0, 10, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer41;
-	bSizer41 = new wxBoxSizer( wxHORIZONTAL );
-	
-	
-	bSizer41->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_bitmap12 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), 0 );
-	bSizer41->Add( m_bitmap12, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticTextHeader = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTextHeader->Wrap( -1 );
-	m_staticTextHeader->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer41->Add( m_staticTextHeader, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	
-	bSizer41->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	bSizer24->Add( bSizer41, 0, wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer99;
-	bSizer99 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_checkBoxDeleteBothSides = new wxCheckBox( this, wxID_ANY, _("Delete on both sides"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_checkBoxDeleteBothSides->SetToolTip( _("Delete on both sides even if the file is selected on one side only") );
-	
-	bSizer99->Add( m_checkBoxDeleteBothSides, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer99->Add( 0, 0, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_checkBoxUseRecycler = new wxCheckBox( this, wxID_ANY, _("Use Recycle Bin"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_checkBoxUseRecycler->SetValue(true); 
-	bSizer99->Add( m_checkBoxUseRecycler, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer24->Add( bSizer99, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 10 );
-	
-	m_textCtrlMessage = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE|wxTE_READONLY );
-	m_textCtrlMessage->SetBackgroundColour( 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_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( wxDefaultSize, wxDefaultSize );
-	
-	wxBoxSizer* bSizer21;
-	bSizer21 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer86;
-	bSizer86 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmap26 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), 0 );
-	bSizer86->Add( m_bitmap26, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-	
-	m_panel8 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER|wxTAB_TRAVERSAL );
-	m_panel8->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DLIGHT ) );
-	
-	wxBoxSizer* bSizer72;
-	bSizer72 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticTexHeader = new wxStaticText( m_panel8, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticTexHeader->Wrap( -1 );
-	m_staticTexHeader->SetFont( wxFont( 16, 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer72->Add( m_staticTexHeader, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
-	
-	m_panel8->SetSizer( bSizer72 );
-	m_panel8->Layout();
-	bSizer72->Fit( m_panel8 );
-	bSizer86->Add( m_panel8, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	
-	bSizer86->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer21->Add( bSizer86, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM, 5 );
-	
-	wxBoxSizer* bSizer70;
-	bSizer70 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText44 = new wxStaticText( this, wxID_ANY, _("Only files/directories that pass filtering will be selected for synchronization. The filter will be applied to the name relative(!) to the base synchronization directories."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText44->Wrap( 400 );
-	bSizer70->Add( m_staticText44, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_bpButtonHelp = new wxBitmapButton( this, wxID_HELP, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	m_bpButtonHelp->SetToolTip( _("Help") );
-	
-	bSizer70->Add( m_bpButtonHelp, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
-	bSizer21->Add( bSizer70, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 10 );
-	
-	
-	bSizer21->Add( 0, 5, 0, 0, 5 );
-	
-	m_panel13 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
-	wxBoxSizer* bSizer69;
-	bSizer69 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticline10 = new wxStaticLine( m_panel13, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer69->Add( m_staticline10, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
-	
-	wxBoxSizer* bSizer52;
-	bSizer52 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText45 = new wxStaticText( m_panel13, wxID_ANY, _("Hints:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText45->Wrap( -1 );
-	m_staticText45->SetFont( wxFont( 10, 70, 90, 92, true, wxEmptyString ) );
-	
-	bSizer52->Add( m_staticText45, 0, wxBOTTOM, 5 );
-	
-	m_staticText83 = new wxStaticText( m_panel13, wxID_ANY, _("1. Enter relative file or directory names separated by ';' or a new line."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText83->Wrap( -1 );
-	bSizer52->Add( m_staticText83, 0, 0, 5 );
-	
-	m_staticText84 = new wxStaticText( m_panel13, wxID_ANY, _("2. Use wildcard characters '*' and '?'."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText84->Wrap( -1 );
-	bSizer52->Add( m_staticText84, 0, 0, 5 );
-	
-	m_staticText85 = new wxStaticText( m_panel13, wxID_ANY, _("3. Exclude files directly on main grid via context menu."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText85->Wrap( -1 );
-	bSizer52->Add( m_staticText85, 0, 0, 5 );
-	
-	bSizer69->Add( bSizer52, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 10 );
-	
-	wxStaticBoxSizer* sbSizer21;
-	sbSizer21 = new wxStaticBoxSizer( new wxStaticBox( m_panel13, wxID_ANY, _("Example") ), wxVERTICAL );
-	
-	wxBoxSizer* bSizer66;
-	bSizer66 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText181 = new wxStaticText( m_panel13, wxID_ANY, _("Include: *.doc;*.zip;*.exe\nExclude: \\stuff\\temp\\*"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText181->Wrap( -1 );
-	bSizer66->Add( m_staticText181, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_staticText1811 = new wxStaticText( m_panel13, wxID_ANY, _("Synchronize all .doc, .zip and .exe files except everything in subfolder \"temp\"."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText1811->Wrap( 250 );
-	m_staticText1811->SetFont( wxFont( 8, 70, 93, 90, false, wxEmptyString ) );
-	
-	bSizer66->Add( m_staticText1811, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-	
-	sbSizer21->Add( bSizer66, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 5 );
-	
-	bSizer69->Add( sbSizer21, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxRIGHT|wxLEFT, 5 );
-	
-	m_panel13->SetSizer( bSizer69 );
-	m_panel13->Layout();
-	bSizer69->Fit( m_panel13 );
-	bSizer21->Add( m_panel13, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxEXPAND, 5 );
-	
-	wxStaticBoxSizer* sbSizer8;
-	sbSizer8 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxEmptyString ), wxVERTICAL );
-	
-	wxFlexGridSizer* fgSizer3;
-	fgSizer3 = new wxFlexGridSizer( 2, 2, 0, 0 );
-	fgSizer3->AddGrowableCol( 1 );
-	fgSizer3->AddGrowableRow( 1 );
-	fgSizer3->SetFlexibleDirection( wxBOTH );
-	fgSizer3->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	
-	fgSizer3->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticText15 = new wxStaticText( this, wxID_ANY, _("Include"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText15->Wrap( -1 );
-	m_staticText15->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
-	
-	fgSizer3->Add( m_staticText15, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-	
-	m_bitmap8 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), 0 );
-	fgSizer3->Add( m_bitmap8, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_textCtrlInclude = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE );
-	fgSizer3->Add( m_textCtrlInclude, 1, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	sbSizer8->Add( fgSizer3, 1, wxEXPAND, 5 );
-	
-	wxFlexGridSizer* fgSizer4;
-	fgSizer4 = new wxFlexGridSizer( 2, 2, 0, 0 );
-	fgSizer4->AddGrowableCol( 1 );
-	fgSizer4->AddGrowableRow( 1 );
-	fgSizer4->SetFlexibleDirection( wxBOTH );
-	fgSizer4->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	
-	fgSizer4->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_staticText16 = new wxStaticText( this, wxID_ANY, _("Exclude"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText16->Wrap( -1 );
-	m_staticText16->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
-	
-	fgSizer4->Add( m_staticText16, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-	
-	m_bitmap9 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), 0 );
-	fgSizer4->Add( m_bitmap9, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_textCtrlExclude = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE );
-	fgSizer4->Add( m_textCtrlExclude, 1, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	sbSizer8->Add( fgSizer4, 1, wxEXPAND, 5 );
-	
-	bSizer21->Add( sbSizer8, 1, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-	
-	
-	bSizer21->Add( 0, 0, 0, 0, 5 );
-	
-	wxBoxSizer* bSizer22;
-	bSizer22 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_button9 = new wxButton( this, wxID_DEFAULT, _("&Default"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_button9->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer22->Add( m_button9, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer22->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_button10 = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_button10->SetDefault(); 
-	m_button10->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer22->Add( m_button10, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_button17 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_button17->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer22->Add( m_button17, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-	
-	bSizer21->Add( bSizer22, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxBOTTOM|wxEXPAND, 5 );
-	
-	this->SetSizer( bSizer21 );
-	this->Layout();
-	bSizer21->Fit( this );
-	
-	this->Centre( wxBOTH );
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( FilterDlgGenerated::OnClose ) );
-	m_bpButtonHelp->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnHelp ), NULL, this );
-	m_button9->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnDefault ), NULL, this );
-	m_button10->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnApply ), NULL, this );
-	m_button17->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnCancel ), NULL, this );
+    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+
+    wxBoxSizer* bSizer21;
+    bSizer21 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer86;
+    bSizer86 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmap26 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), 0 );
+    bSizer86->Add( m_bitmap26, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+
+    m_panel8 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER|wxTAB_TRAVERSAL );
+    m_panel8->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DLIGHT ) );
+
+    wxBoxSizer* bSizer72;
+    bSizer72 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticTexHeader = new wxStaticText( m_panel8, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTexHeader->Wrap( -1 );
+    m_staticTexHeader->SetFont( wxFont( 16, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer72->Add( m_staticTexHeader, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+
+    m_panel8->SetSizer( bSizer72 );
+    m_panel8->Layout();
+    bSizer72->Fit( m_panel8 );
+    bSizer86->Add( m_panel8, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+
+    bSizer86->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer21->Add( bSizer86, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM, 5 );
+
+    wxBoxSizer* bSizer70;
+    bSizer70 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText44 = new wxStaticText( this, wxID_ANY, _("Only files/directories that pass filtering will be selected for synchronization. The filter will be applied to the name relative(!) to the base synchronization directories."), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText44->Wrap( 400 );
+    bSizer70->Add( m_staticText44, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bpButtonHelp = new wxBitmapButton( this, wxID_HELP, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    m_bpButtonHelp->SetToolTip( _("Help") );
+
+    bSizer70->Add( m_bpButtonHelp, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+
+    bSizer21->Add( bSizer70, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 10 );
+
+
+    bSizer21->Add( 0, 5, 0, 0, 5 );
+
+    m_panel13 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
+    wxBoxSizer* bSizer69;
+    bSizer69 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticline10 = new wxStaticLine( m_panel13, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer69->Add( m_staticline10, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
+
+    wxBoxSizer* bSizer52;
+    bSizer52 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText45 = new wxStaticText( m_panel13, wxID_ANY, _("Hints:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText45->Wrap( -1 );
+    m_staticText45->SetFont( wxFont( 10, 70, 90, 92, true, wxEmptyString ) );
+
+    bSizer52->Add( m_staticText45, 0, wxBOTTOM, 5 );
+
+    m_staticText83 = new wxStaticText( m_panel13, wxID_ANY, _("1. Enter relative file or directory names separated by ';' or a new line."), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText83->Wrap( -1 );
+    bSizer52->Add( m_staticText83, 0, 0, 5 );
+
+    m_staticText84 = new wxStaticText( m_panel13, wxID_ANY, _("2. Use wildcard characters '*' and '?'."), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText84->Wrap( -1 );
+    bSizer52->Add( m_staticText84, 0, 0, 5 );
+
+    m_staticText85 = new wxStaticText( m_panel13, wxID_ANY, _("3. Exclude files directly on main grid via context menu."), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText85->Wrap( -1 );
+    bSizer52->Add( m_staticText85, 0, 0, 5 );
+
+    bSizer69->Add( bSizer52, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 10 );
+
+    wxStaticBoxSizer* sbSizer21;
+    sbSizer21 = new wxStaticBoxSizer( new wxStaticBox( m_panel13, wxID_ANY, _("Example") ), wxVERTICAL );
+
+    wxBoxSizer* bSizer66;
+    bSizer66 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText181 = new wxStaticText( m_panel13, wxID_ANY, _("Include: *.doc;*.zip;*.exe\nExclude: \\stuff\\temp\\*"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText181->Wrap( -1 );
+    bSizer66->Add( m_staticText181, 0, wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticText1811 = new wxStaticText( m_panel13, wxID_ANY, _("Synchronize all .doc, .zip and .exe files except everything in subfolder \"temp\"."), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText1811->Wrap( 250 );
+    m_staticText1811->SetFont( wxFont( 8, 70, 93, 90, false, wxEmptyString ) );
+
+    bSizer66->Add( m_staticText1811, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+
+    sbSizer21->Add( bSizer66, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 5 );
+
+    bSizer69->Add( sbSizer21, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxRIGHT|wxLEFT, 5 );
+
+    m_panel13->SetSizer( bSizer69 );
+    m_panel13->Layout();
+    bSizer69->Fit( m_panel13 );
+    bSizer21->Add( m_panel13, 0, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM|wxEXPAND, 5 );
+
+    wxStaticBoxSizer* sbSizer8;
+    sbSizer8 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxEmptyString ), wxVERTICAL );
+
+    wxFlexGridSizer* fgSizer3;
+    fgSizer3 = new wxFlexGridSizer( 2, 2, 0, 0 );
+    fgSizer3->AddGrowableCol( 1 );
+    fgSizer3->AddGrowableRow( 1 );
+    fgSizer3->SetFlexibleDirection( wxBOTH );
+    fgSizer3->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+
+    fgSizer3->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticText15 = new wxStaticText( this, wxID_ANY, _("Include"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText15->Wrap( -1 );
+    m_staticText15->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
+
+    fgSizer3->Add( m_staticText15, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+
+    m_bitmap8 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), 0 );
+    fgSizer3->Add( m_bitmap8, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_textCtrlInclude = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE );
+    fgSizer3->Add( m_textCtrlInclude, 1, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    sbSizer8->Add( fgSizer3, 1, wxEXPAND, 5 );
+
+    wxFlexGridSizer* fgSizer4;
+    fgSizer4 = new wxFlexGridSizer( 2, 2, 0, 0 );
+    fgSizer4->AddGrowableCol( 1 );
+    fgSizer4->AddGrowableRow( 1 );
+    fgSizer4->SetFlexibleDirection( wxBOTH );
+    fgSizer4->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+
+    fgSizer4->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_staticText16 = new wxStaticText( this, wxID_ANY, _("Exclude"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText16->Wrap( -1 );
+    m_staticText16->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
+
+    fgSizer4->Add( m_staticText16, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+
+    m_bitmap9 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 30,30 ), 0 );
+    fgSizer4->Add( m_bitmap9, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_textCtrlExclude = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), wxTE_MULTILINE );
+    fgSizer4->Add( m_textCtrlExclude, 1, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+    sbSizer8->Add( fgSizer4, 1, wxEXPAND, 5 );
+
+    bSizer21->Add( sbSizer8, 1, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+
+
+    bSizer21->Add( 0, 0, 0, 0, 5 );
+
+    wxBoxSizer* bSizer22;
+    bSizer22 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_button9 = new wxButton( this, wxID_DEFAULT, _("&Default"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_button9->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer22->Add( m_button9, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer22->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_button10 = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_button10->SetDefault();
+    m_button10->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer22->Add( m_button10, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_button17 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_button17->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer22->Add( m_button17, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    bSizer21->Add( bSizer22, 0, wxALIGN_CENTER_HORIZONTAL|wxTOP|wxBOTTOM|wxEXPAND, 5 );
+
+    this->SetSizer( bSizer21 );
+    this->Layout();
+    bSizer21->Fit( this );
+
+    this->Centre( wxBOTH );
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( FilterDlgGenerated::OnClose ) );
+    m_bpButtonHelp->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnHelp ), NULL, this );
+    m_button9->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnDefault ), NULL, this );
+    m_button10->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnApply ), NULL, this );
+    m_button17->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnCancel ), NULL, this );
 }
 
 FilterDlgGenerated::~FilterDlgGenerated()
 {
-	// Disconnect Events
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( FilterDlgGenerated::OnClose ) );
-	m_bpButtonHelp->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnHelp ), NULL, this );
-	m_button9->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnDefault ), NULL, this );
-	m_button10->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnApply ), NULL, this );
-	m_button17->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnCancel ), NULL, this );
-	
+    // Disconnect Events
+    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( FilterDlgGenerated::OnClose ) );
+    m_bpButtonHelp->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnHelp ), NULL, this );
+    m_button9->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnDefault ), NULL, this );
+    m_button10->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnApply ), NULL, this );
+    m_button17->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( FilterDlgGenerated::OnCancel ), NULL, this );
+
 }
 
 CustomizeColsDlgGenerated::CustomizeColsDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-	
-	wxBoxSizer* bSizer96;
-	bSizer96 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer99;
-	bSizer99 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxArrayString m_checkListColumnsChoices;
-	m_checkListColumns = new wxCheckListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_checkListColumnsChoices, 0 );
-	bSizer99->Add( m_checkListColumns, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	wxBoxSizer* bSizer98;
-	bSizer98 = new wxBoxSizer( wxVERTICAL );
-	
-	m_bpButton29 = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	m_bpButton29->SetToolTip( _("Move column up") );
-	
-	bSizer98->Add( m_bpButton29, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
-	
-	m_bpButton30 = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
-	m_bpButton30->SetToolTip( _("Move column down") );
-	
-	bSizer98->Add( m_bpButton30, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-	
-	bSizer99->Add( bSizer98, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer96->Add( bSizer99, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	wxBoxSizer* bSizer97;
-	bSizer97 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_button9 = new wxButton( this, wxID_DEFAULT, _("&Default"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_button9->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer97->Add( m_button9, 0, wxALL, 5 );
-	
-	
-	bSizer97->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_button28 = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_button28->SetDefault(); 
-	m_button28->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer97->Add( m_button28, 0, wxALL, 5 );
-	
-	m_button29 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_button29->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer97->Add( m_button29, 0, wxALL, 5 );
-	
-	bSizer96->Add( bSizer97, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-	
-	this->SetSizer( bSizer96 );
-	this->Layout();
-	bSizer96->Fit( this );
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CustomizeColsDlgGenerated::OnClose ) );
-	m_bpButton29->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnMoveUp ), NULL, this );
-	m_bpButton30->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnMoveDown ), NULL, this );
-	m_button9->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnDefault ), NULL, this );
-	m_button28->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnOkay ), NULL, this );
-	m_button29->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnCancel ), NULL, this );
+    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+
+    wxBoxSizer* bSizer96;
+    bSizer96 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer99;
+    bSizer99 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxArrayString m_checkListColumnsChoices;
+    m_checkListColumns = new wxCheckListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_checkListColumnsChoices, 0 );
+    bSizer99->Add( m_checkListColumns, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    wxBoxSizer* bSizer98;
+    bSizer98 = new wxBoxSizer( wxVERTICAL );
+
+    m_bpButton29 = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    m_bpButton29->SetToolTip( _("Move column up") );
+
+    bSizer98->Add( m_bpButton29, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
+
+    m_bpButton30 = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), wxBU_AUTODRAW );
+    m_bpButton30->SetToolTip( _("Move column down") );
+
+    bSizer98->Add( m_bpButton30, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+    bSizer99->Add( bSizer98, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer96->Add( bSizer99, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    wxBoxSizer* bSizer97;
+    bSizer97 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_button9 = new wxButton( this, wxID_DEFAULT, _("&Default"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_button9->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer97->Add( m_button9, 0, wxALL, 5 );
+
+
+    bSizer97->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_button28 = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_button28->SetDefault();
+    m_button28->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer97->Add( m_button28, 0, wxALL, 5 );
+
+    m_button29 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_button29->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer97->Add( m_button29, 0, wxALL, 5 );
+
+    bSizer96->Add( bSizer97, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+
+    this->SetSizer( bSizer96 );
+    this->Layout();
+    bSizer96->Fit( this );
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CustomizeColsDlgGenerated::OnClose ) );
+    m_bpButton29->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnMoveUp ), NULL, this );
+    m_bpButton30->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnMoveDown ), NULL, this );
+    m_button9->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnDefault ), NULL, this );
+    m_button28->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnOkay ), NULL, this );
+    m_button29->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnCancel ), NULL, this );
 }
 
 CustomizeColsDlgGenerated::~CustomizeColsDlgGenerated()
 {
-	// Disconnect Events
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CustomizeColsDlgGenerated::OnClose ) );
-	m_bpButton29->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnMoveUp ), NULL, this );
-	m_bpButton30->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnMoveDown ), NULL, this );
-	m_button9->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnDefault ), NULL, this );
-	m_button28->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnOkay ), NULL, this );
-	m_button29->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnCancel ), NULL, this );
-	
+    // Disconnect Events
+    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( CustomizeColsDlgGenerated::OnClose ) );
+    m_bpButton29->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnMoveUp ), NULL, this );
+    m_bpButton30->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnMoveDown ), NULL, this );
+    m_button9->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnDefault ), NULL, this );
+    m_button28->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnOkay ), NULL, this );
+    m_button29->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( CustomizeColsDlgGenerated::OnCancel ), NULL, this );
+
 }
 
 GlobalSettingsDlgGenerated::GlobalSettingsDlgGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-	this->SetSizeHints( wxSize( 280,230 ), wxDefaultSize );
-	
-	wxBoxSizer* bSizer95;
-	bSizer95 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer86;
-	bSizer86 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_bitmapSettings = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), 0 );
-	bSizer86->Add( m_bitmapSettings, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
-	
-	
-	bSizer86->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_panel8 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER|wxTAB_TRAVERSAL );
-	m_panel8->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DLIGHT ) );
-	
-	wxBoxSizer* bSizer72;
-	bSizer72 = new wxBoxSizer( wxVERTICAL );
-	
-	m_staticText56 = new wxStaticText( m_panel8, wxID_ANY, _("Global settings"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText56->Wrap( -1 );
-	m_staticText56->SetFont( wxFont( 16, 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_checkBoxCopyLocked = new wxCheckBox( this, wxID_ANY, _("Copy locked files"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_checkBoxCopyLocked->SetToolTip( _("Copy shared or locked files using Volume Shadow Copy Service\n(Requires Administrator rights)") );
-	
-	sbSizer23->Add( m_checkBoxCopyLocked, 0, wxALL|wxEXPAND, 5 );
-	
-	m_checkBoxCopyPermissions = new wxCheckBox( this, wxID_ANY, _("Copy filesystem permissions"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_checkBoxCopyPermissions->SetToolTip( _("Transfer file and directory permissions\n(Requires Administrator rights)") );
-	
-	sbSizer23->Add( m_checkBoxCopyPermissions, 0, wxALL|wxEXPAND, 5 );
-	
-	m_staticline10 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	sbSizer23->Add( m_staticline10, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxTOP|wxBOTTOM, 5 );
-	
-	wxBoxSizer* bSizer101;
-	bSizer101 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText100 = new wxStaticText( this, wxID_ANY, _("Hidden dialogs:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText100->Wrap( -1 );
-	bSizer101->Add( m_staticText100, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer101->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	m_buttonResetDialogs = new wxButtonWithImage( this, wxID_ANY, _("Reset"), wxDefaultPosition, wxSize( 80,-1 ), 0 );
-	m_buttonResetDialogs->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	m_buttonResetDialogs->SetToolTip( _("Show hidden dialogs") );
-	
-	bSizer101->Add( m_buttonResetDialogs, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	sbSizer23->Add( bSizer101, 0, wxEXPAND, 5 );
-	
-	bSizer95->Add( sbSizer23, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-	
-	
-	bSizer95->Add( 0, 10, 0, 0, 5 );
-	
-	wxStaticBoxSizer* sbSizer26;
-	sbSizer26 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("External applications") ), wxHORIZONTAL );
-	
-	
-	sbSizer26->Add( 5, 0, 0, 0, 5 );
-	
-	m_gridCustomCommand = new wxGrid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
-	
-	// Grid
-	m_gridCustomCommand->CreateGrid( 5, 2 );
-	m_gridCustomCommand->EnableEditing( true );
-	m_gridCustomCommand->EnableGridLines( true );
-	m_gridCustomCommand->EnableDragGridSize( false );
-	m_gridCustomCommand->SetMargins( 0, 0 );
-	
-	// Columns
-	m_gridCustomCommand->SetColSize( 0, 129 );
-	m_gridCustomCommand->SetColSize( 1, 179 );
-	m_gridCustomCommand->EnableDragColMove( false );
-	m_gridCustomCommand->EnableDragColSize( true );
-	m_gridCustomCommand->SetColLabelSize( 20 );
-	m_gridCustomCommand->SetColLabelValue( 0, _("Description") );
-	m_gridCustomCommand->SetColLabelValue( 1, _("Command line") );
-	m_gridCustomCommand->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
-	// Rows
-	m_gridCustomCommand->EnableDragRowSize( false );
-	m_gridCustomCommand->SetRowLabelSize( 0 );
-	m_gridCustomCommand->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
-	
-	// Label Appearance
-	
-	// Cell Defaults
-	m_gridCustomCommand->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
-	sbSizer26->Add( m_gridCustomCommand, 1, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer157;
-	bSizer157 = new wxBoxSizer( wxVERTICAL );
-	
-	m_bpButtonAddRow = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
-	bSizer157->Add( m_bpButtonAddRow, 0, 0, 5 );
-	
-	m_bpButtonRemoveRow = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
-	bSizer157->Add( m_bpButtonRemoveRow, 0, 0, 5 );
-	
-	sbSizer26->Add( bSizer157, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	
-	sbSizer26->Add( 5, 0, 0, 0, 5 );
-	
-	bSizer95->Add( sbSizer26, 1, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-	
-	wxBoxSizer* bSizer97;
-	bSizer97 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_button9 = new wxButton( this, wxID_DEFAULT, _("&Default"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_button9->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer97->Add( m_button9, 0, wxALL, 5 );
-	
-	
-	bSizer97->Add( 0, 0, 1, 0, 5 );
-	
-	m_buttonOkay = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_buttonOkay->SetDefault(); 
-	m_buttonOkay->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer97->Add( m_buttonOkay, 0, wxALL, 5 );
-	
-	m_button29 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_button29->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer97->Add( m_button29, 0, wxALL, 5 );
-	
-	bSizer95->Add( bSizer97, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
-	
-	this->SetSizer( bSizer95 );
-	this->Layout();
-	bSizer95->Fit( this );
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( GlobalSettingsDlgGenerated::OnClose ) );
-	m_buttonResetDialogs->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnResetDialogs ), NULL, this );
-	m_bpButtonAddRow->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnAddRow ), NULL, this );
-	m_bpButtonRemoveRow->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnRemoveRow ), NULL, this );
-	m_button9->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnDefault ), NULL, this );
-	m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnOkay ), NULL, this );
-	m_button29->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnCancel ), NULL, this );
+    this->SetSizeHints( wxSize( 280,230 ), wxDefaultSize );
+
+    wxBoxSizer* bSizer95;
+    bSizer95 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer86;
+    bSizer86 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_bitmapSettings = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 40,40 ), 0 );
+    bSizer86->Add( m_bitmapSettings, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
+
+
+    bSizer86->Add( 0, 0, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_panel8 = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER|wxTAB_TRAVERSAL );
+    m_panel8->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_3DLIGHT ) );
+
+    wxBoxSizer* bSizer72;
+    bSizer72 = new wxBoxSizer( wxVERTICAL );
+
+    m_staticText56 = new wxStaticText( m_panel8, wxID_ANY, _("Global settings"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText56->Wrap( -1 );
+    m_staticText56->SetFont( wxFont( 16, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer72->Add( m_staticText56, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+
+    m_panel8->SetSizer( bSizer72 );
+    m_panel8->Layout();
+    bSizer72->Fit( m_panel8 );
+    bSizer86->Add( m_panel8, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    bSizer95->Add( bSizer86, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    bSizer95->Add( 0, 10, 0, 0, 5 );
+
+    wxStaticBoxSizer* sbSizer23;
+    sbSizer23 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxEmptyString ), wxVERTICAL );
+
+    m_checkBoxCopyLocked = new wxCheckBox( this, wxID_ANY, _("Copy locked files"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_checkBoxCopyLocked->SetToolTip( _("Copy shared or locked files using Volume Shadow Copy Service\n(Requires Administrator rights)") );
+
+    sbSizer23->Add( m_checkBoxCopyLocked, 0, wxALL|wxEXPAND, 5 );
+
+    m_checkBoxCopyPermissions = new wxCheckBox( this, wxID_ANY, _("Copy filesystem permissions"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_checkBoxCopyPermissions->SetToolTip( _("Transfer file and directory permissions\n(Requires Administrator rights)") );
+
+    sbSizer23->Add( m_checkBoxCopyPermissions, 0, wxALL|wxEXPAND, 5 );
+
+    m_staticline10 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    sbSizer23->Add( m_staticline10, 0, wxEXPAND|wxALIGN_CENTER_HORIZONTAL|wxTOP|wxBOTTOM, 5 );
+
+    wxBoxSizer* bSizer101;
+    bSizer101 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText100 = new wxStaticText( this, wxID_ANY, _("Hidden dialogs:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText100->Wrap( -1 );
+    bSizer101->Add( m_staticText100, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+
+    bSizer101->Add( 0, 0, 1, wxEXPAND, 5 );
+
+    m_buttonResetDialogs = new wxButtonWithImage( this, wxID_ANY, _("Reset"), wxDefaultPosition, wxSize( 80,-1 ), 0 );
+    m_buttonResetDialogs->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+    m_buttonResetDialogs->SetToolTip( _("Show hidden dialogs") );
+
+    bSizer101->Add( m_buttonResetDialogs, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
+
+    sbSizer23->Add( bSizer101, 0, wxEXPAND, 5 );
+
+    bSizer95->Add( sbSizer23, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+
+
+    bSizer95->Add( 0, 10, 0, 0, 5 );
+
+    wxStaticBoxSizer* sbSizer26;
+    sbSizer26 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("External applications") ), wxHORIZONTAL );
+
+
+    sbSizer26->Add( 5, 0, 0, 0, 5 );
+
+    m_gridCustomCommand = new wxGrid( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
+
+    // Grid
+    m_gridCustomCommand->CreateGrid( 5, 2 );
+    m_gridCustomCommand->EnableEditing( true );
+    m_gridCustomCommand->EnableGridLines( true );
+    m_gridCustomCommand->EnableDragGridSize( false );
+    m_gridCustomCommand->SetMargins( 0, 0 );
+
+    // Columns
+    m_gridCustomCommand->SetColSize( 0, 129 );
+    m_gridCustomCommand->SetColSize( 1, 179 );
+    m_gridCustomCommand->EnableDragColMove( false );
+    m_gridCustomCommand->EnableDragColSize( true );
+    m_gridCustomCommand->SetColLabelSize( 20 );
+    m_gridCustomCommand->SetColLabelValue( 0, _("Description") );
+    m_gridCustomCommand->SetColLabelValue( 1, _("Command line") );
+    m_gridCustomCommand->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
+
+    // Rows
+    m_gridCustomCommand->EnableDragRowSize( false );
+    m_gridCustomCommand->SetRowLabelSize( 0 );
+    m_gridCustomCommand->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE );
+
+    // Label Appearance
+
+    // Cell Defaults
+    m_gridCustomCommand->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
+    sbSizer26->Add( m_gridCustomCommand, 1, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer157;
+    bSizer157 = new wxBoxSizer( wxVERTICAL );
+
+    m_bpButtonAddRow = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
+    bSizer157->Add( m_bpButtonAddRow, 0, 0, 5 );
+
+    m_bpButtonRemoveRow = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( 19,21 ), wxBU_AUTODRAW );
+    bSizer157->Add( m_bpButtonRemoveRow, 0, 0, 5 );
+
+    sbSizer26->Add( bSizer157, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
+
+
+    sbSizer26->Add( 5, 0, 0, 0, 5 );
+
+    bSizer95->Add( sbSizer26, 1, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT|wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer97;
+    bSizer97 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_button9 = new wxButton( this, wxID_DEFAULT, _("&Default"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_button9->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer97->Add( m_button9, 0, wxALL, 5 );
+
+
+    bSizer97->Add( 0, 0, 1, 0, 5 );
+
+    m_buttonOkay = new wxButton( this, wxID_OK, _("&OK"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_buttonOkay->SetDefault();
+    m_buttonOkay->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer97->Add( m_buttonOkay, 0, wxALL, 5 );
+
+    m_button29 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_button29->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer97->Add( m_button29, 0, wxALL, 5 );
+
+    bSizer95->Add( bSizer97, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+    this->SetSizer( bSizer95 );
+    this->Layout();
+    bSizer95->Fit( this );
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( GlobalSettingsDlgGenerated::OnClose ) );
+    m_buttonResetDialogs->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnResetDialogs ), NULL, this );
+    m_bpButtonAddRow->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnAddRow ), NULL, this );
+    m_bpButtonRemoveRow->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnRemoveRow ), NULL, this );
+    m_button9->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnDefault ), NULL, this );
+    m_buttonOkay->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnOkay ), NULL, this );
+    m_button29->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( GlobalSettingsDlgGenerated::OnCancel ), NULL, this );
 }
 
 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 );
-	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 );
-	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 );
-	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 );
-	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 );
-	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 );
-	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_READONLY );
-	m_textCtrlData->SetFont( wxFont( 8, 70, 90, 90, false, wxEmptyString ) );
-	m_textCtrlData->SetBackgroundColour( wxColour( 208, 208, 208 ) );
-	m_textCtrlData->SetToolTip( _("Total amount of data that will be transferred") );
-	
-	bSizer156->Add( m_textCtrlData, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer156->Add( 0, 0, 1, wxEXPAND, 5 );
-	
-	sbSizer161->Add( bSizer156, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT|wxEXPAND, 5 );
-	
-	bSizer141->Add( sbSizer161, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
-	
-	bSizer134->Add( bSizer141, 0, wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	m_staticline12 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
-	bSizer134->Add( m_staticline12, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
-	
-	wxBoxSizer* bSizer142;
-	bSizer142 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_checkBoxDontShowAgain = new wxCheckBox( this, wxID_ANY, _("Do not show this dialog again"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer142->Add( m_checkBoxDontShowAgain, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	bSizer142->Add( 10, 0, 1, 0, 5 );
-	
-	m_button16 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_button16->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer142->Add( m_button16, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
-	
-	bSizer134->Add( bSizer142, 0, wxEXPAND, 5 );
-	
-	this->SetSizer( bSizer134 );
-	this->Layout();
-	bSizer134->Fit( this );
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SyncPreviewDlgGenerated::OnClose ) );
-	m_buttonStartSync->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncPreviewDlgGenerated::OnStartSync ), NULL, this );
-	m_button16->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SyncPreviewDlgGenerated::OnCancel ), NULL, this );
+    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+
+    wxBoxSizer* bSizer134;
+    bSizer134 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer158;
+    bSizer158 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_buttonStartSync = new wxButtonWithImage( this, wxID_ANY, _("Start"), wxDefaultPosition, wxSize( -1,40 ), 0 );
+    m_buttonStartSync->SetDefault();
+    m_buttonStartSync->SetFont( wxFont( 14, 70, 90, 92, false, wxT("Arial Black") ) );
+    m_buttonStartSync->SetToolTip( _("Start synchronization") );
+
+    bSizer158->Add( m_buttonStartSync, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_staticline16 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_VERTICAL );
+    bSizer158->Add( m_staticline16, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
+
+    wxStaticBoxSizer* sbSizer28;
+    sbSizer28 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Variant") ), wxVERTICAL );
+
+    m_staticTextVariant = new wxStaticText( this, wxID_ANY, _("dummy"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticTextVariant->Wrap( -1 );
+    m_staticTextVariant->SetFont( wxFont( 10, 70, 90, 92, false, wxT("Arial Black") ) );
+
+    sbSizer28->Add( m_staticTextVariant, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    bSizer158->Add( sbSizer28, 1, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
+
+    bSizer134->Add( bSizer158, 0, wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );
+
+    m_staticline14 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
+    bSizer134->Add( m_staticline14, 0, wxEXPAND, 5 );
+
+    wxBoxSizer* bSizer141;
+    bSizer141 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxStaticBoxSizer* sbSizer161;
+    sbSizer161 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Statistics") ), wxVERTICAL );
+
+    wxBoxSizer* bSizer157;
+    bSizer157 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxFlexGridSizer* fgSizer5;
+    fgSizer5 = new wxFlexGridSizer( 4, 2, 0, 5 );
+    fgSizer5->SetFlexibleDirection( wxHORIZONTAL );
+    fgSizer5->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+
+
+    fgSizer5->Add( 0, 0, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_staticText94 = new wxStaticText( this, wxID_ANY, _("Left"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText94->Wrap( -1 );
+    m_staticText94->SetFont( wxFont( 9, 70, 90, 92, false, wxEmptyString ) );
+
+    fgSizer5->Add( m_staticText94, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_bitmapCreate = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+    m_bitmapCreate->SetToolTip( _("Number of files and directories that will be created") );
+
+    fgSizer5->Add( m_bitmapCreate, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 );
+
+    m_textCtrlCreateL = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 80,-1 ), wxTE_READONLY );
+    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 );
+    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 );
+    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 );
+    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 );
+    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 );
+    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_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()
@@ -3695,67 +3695,67 @@ PopupFrameGenerated1::~PopupFrameGenerated1()
 
 SearchDialogGenerated::SearchDialogGenerated( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
 {
-	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-	
-	wxBoxSizer* bSizer161;
-	bSizer161 = new wxBoxSizer( wxHORIZONTAL );
-	
-	wxBoxSizer* bSizer166;
-	bSizer166 = new wxBoxSizer( wxVERTICAL );
-	
-	wxBoxSizer* bSizer162;
-	bSizer162 = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_staticText101 = new wxStaticText( this, wxID_ANY, _("Find what:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText101->Wrap( -1 );
-	bSizer162->Add( m_staticText101, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_textCtrlSearchTxt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 220,-1 ), 0 );
-	bSizer162->Add( m_textCtrlSearchTxt, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	bSizer166->Add( bSizer162, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
-	
-	
-	bSizer166->Add( 0, 10, 0, 0, 5 );
-	
-	m_checkBoxMatchCase = new wxCheckBox( this, wxID_ANY, _("Match case"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer166->Add( m_checkBoxMatchCase, 0, wxALL, 5 );
-	
-	bSizer161->Add( bSizer166, 1, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	wxBoxSizer* bSizer97;
-	bSizer97 = new wxBoxSizer( wxVERTICAL );
-	
-	m_buttonFindNext = new wxButton( this, wxID_OK, _("&Find next"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_buttonFindNext->SetDefault(); 
-	m_buttonFindNext->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
-	
-	bSizer97->Add( m_buttonFindNext, 0, wxALL|wxEXPAND, 5 );
-	
-	m_button29 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
-	m_button29->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
-	
-	bSizer97->Add( m_button29, 0, wxALL|wxEXPAND, 5 );
-	
-	bSizer161->Add( bSizer97, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	this->SetSizer( bSizer161 );
-	this->Layout();
-	bSizer161->Fit( this );
-	
-	// Connect Events
-	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SearchDialogGenerated::OnClose ) );
-	m_textCtrlSearchTxt->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( SearchDialogGenerated::OnText ), NULL, this );
-	m_buttonFindNext->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SearchDialogGenerated::OnFindNext ), NULL, this );
-	m_button29->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SearchDialogGenerated::OnCancel ), NULL, this );
+    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+
+    wxBoxSizer* bSizer161;
+    bSizer161 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxBoxSizer* bSizer166;
+    bSizer166 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer* bSizer162;
+    bSizer162 = new wxBoxSizer( wxHORIZONTAL );
+
+    m_staticText101 = new wxStaticText( this, wxID_ANY, _("Find what:"), wxDefaultPosition, wxDefaultSize, 0 );
+    m_staticText101->Wrap( -1 );
+    bSizer162->Add( m_staticText101, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    m_textCtrlSearchTxt = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 220,-1 ), 0 );
+    bSizer162->Add( m_textCtrlSearchTxt, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+    bSizer166->Add( bSizer162, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+
+    bSizer166->Add( 0, 10, 0, 0, 5 );
+
+    m_checkBoxMatchCase = new wxCheckBox( this, wxID_ANY, _("Match case"), wxDefaultPosition, wxDefaultSize, 0 );
+    bSizer166->Add( m_checkBoxMatchCase, 0, wxALL, 5 );
+
+    bSizer161->Add( bSizer166, 1, wxALIGN_CENTER_VERTICAL, 5 );
+
+    wxBoxSizer* bSizer97;
+    bSizer97 = new wxBoxSizer( wxVERTICAL );
+
+    m_buttonFindNext = new wxButton( this, wxID_OK, _("&Find next"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_buttonFindNext->SetDefault();
+    m_buttonFindNext->SetFont( wxFont( 10, 70, 90, 92, false, wxEmptyString ) );
+
+    bSizer97->Add( m_buttonFindNext, 0, wxALL|wxEXPAND, 5 );
+
+    m_button29 = new wxButton( this, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxSize( -1,30 ), 0 );
+    m_button29->SetFont( wxFont( 10, 70, 90, 90, false, wxEmptyString ) );
+
+    bSizer97->Add( m_button29, 0, wxALL|wxEXPAND, 5 );
+
+    bSizer161->Add( bSizer97, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    this->SetSizer( bSizer161 );
+    this->Layout();
+    bSizer161->Fit( this );
+
+    // Connect Events
+    this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SearchDialogGenerated::OnClose ) );
+    m_textCtrlSearchTxt->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( SearchDialogGenerated::OnText ), NULL, this );
+    m_buttonFindNext->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SearchDialogGenerated::OnFindNext ), NULL, this );
+    m_button29->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SearchDialogGenerated::OnCancel ), NULL, this );
 }
 
 SearchDialogGenerated::~SearchDialogGenerated()
 {
-	// Disconnect Events
-	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SearchDialogGenerated::OnClose ) );
-	m_textCtrlSearchTxt->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( SearchDialogGenerated::OnText ), NULL, this );
-	m_buttonFindNext->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SearchDialogGenerated::OnFindNext ), NULL, this );
-	m_button29->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SearchDialogGenerated::OnCancel ), NULL, this );
-	
+    // Disconnect Events
+    this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( SearchDialogGenerated::OnClose ) );
+    m_textCtrlSearchTxt->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( SearchDialogGenerated::OnText ), NULL, this );
+    m_buttonFindNext->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SearchDialogGenerated::OnFindNext ), NULL, this );
+    m_button29->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( SearchDialogGenerated::OnCancel ), NULL, this );
+
 }
diff --git a/ui/gui_generated.h b/ui/gui_generated.h
index 4a70820a..621ad1fe 100644
--- a/ui/gui_generated.h
+++ b/ui/gui_generated.h
@@ -62,1045 +62,1045 @@ class wxButtonWithImage;
 ///////////////////////////////////////////////////////////////////////////////
 /// Class MainDialogGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class MainDialogGenerated : public wxFrame 
+class MainDialogGenerated : public wxFrame
 {
-	private:
-	
-	protected:
-		wxMenuBar* m_menubar1;
-		wxMenu* m_menuFile;
-		wxMenuItem* m_menuItem10;
-		wxMenuItem* m_menuItem11;
-		wxMenuItem* m_menuItemSwitchView;
-		wxMenuItem* m_menuItemNew;
-		wxMenuItem* m_menuItemSave;
-		wxMenuItem* m_menuItemLoad;
-		wxMenu* m_menuAdvanced;
-		wxMenu* m_menuLanguages;
-		wxMenuItem* m_menuItemGlobSett;
-		wxMenuItem* m_menuItem7;
-		wxMenu* m_menuHelp;
-		wxMenuItem* m_menuItemCheckVer;
-		wxMenuItem* m_menuItemAbout;
-		wxBoxSizer* bSizerPanelHolder;
-		wxPanel* m_panelTopButtons;
-		wxBoxSizer* bSizerTopButtons;
-		
-		wxStaticText* m_staticTextCmpVariant;
-		
-		wxButtonWithImage* m_buttonCompare;
-		wxButton* m_buttonAbort;
-		wxBitmapButton* m_bpButtonCmpConfig;
-		
-		
-		wxStaticText* m_staticTextSyncVariant;
-		wxBitmapButton* m_bpButtonSyncConfig;
-		wxButtonWithImage* m_buttonStartSync;
-		
-		wxPanel* m_panelDirectoryPairs;
-		wxStaticBoxSizer* sbSizerDirLeft;
-		wxPanel* m_panelTopMiddle;
-		
-		wxBitmapButton* m_bpButtonSwapSides;
-		
-		
-		
-		wxStaticBoxSizer* sbSizerDirRight;
-		wxBitmapButton* m_bpButtonAddPair;
-		wxScrolledWindow* m_scrolledWindowFolderPairs;
-		wxBoxSizer* bSizerAddFolderPairs;
-		wxPanel* m_panelGrids;
-		wxBoxSizer* bSizerGridHolder;
-		CustomGridLeft* m_gridLeft;
-		wxPanel* m_panelMiddle;
-		CustomGridMiddle* m_gridMiddle;
-		CustomGridRight* m_gridRight;
-		wxPanel* m_panelConfig;
-		wxBoxSizer* bSizerConfig;
-		
-		wxBitmapButton* m_bpButtonSave;
-		wxBitmapButton* m_bpButtonLoad;
-		wxListBox* m_listBoxHistory;
-		wxPanel* m_panelFilter;
-		
-		wxBitmapButton* m_bpButtonFilter;
-		wxCheckBox* m_checkBoxHideFilt;
-		wxPanel* m_panelStatistics;
-		wxBoxSizer* bSizerStatistics;
-		
-		wxStaticBitmap* m_bitmapCreate;
-		wxTextCtrl* m_textCtrlCreate;
-		wxStaticBitmap* m_bitmapUpdate;
-		wxTextCtrl* m_textCtrlUpdate;
-		wxStaticBitmap* m_bitmapDelete;
-		wxTextCtrl* m_textCtrlDelete;
-		wxStaticBitmap* m_bitmapData;
-		wxTextCtrl* m_textCtrlData;
-		
-		wxPanel* m_panelViewFilter;
-		wxBoxSizer* bSizerViewFilter;
-		
-		ToggleButton* m_bpButtonSyncCreateLeft;
-		ToggleButton* m_bpButtonSyncDirOverwLeft;
-		ToggleButton* m_bpButtonSyncDeleteLeft;
-		ToggleButton* m_bpButtonLeftOnly;
-		ToggleButton* m_bpButtonLeftNewer;
-		ToggleButton* m_bpButtonEqual;
-		ToggleButton* m_bpButtonDifferent;
-		ToggleButton* m_bpButtonSyncDirNone;
-		ToggleButton* m_bpButtonRightNewer;
-		ToggleButton* m_bpButtonRightOnly;
-		ToggleButton* m_bpButtonSyncDeleteRight;
-		ToggleButton* m_bpButtonSyncDirOverwRight;
-		ToggleButton* m_bpButtonSyncCreateRight;
-		ToggleButton* m_bpButtonConflict;
-		
-		wxPanel* m_panelStatusBar;
-		
-		wxStaticText* m_staticTextStatusLeft;
-		
-		wxStaticLine* m_staticline9;
-		
-		wxStaticText* m_staticTextStatusMiddle;
-		
-		wxStaticLine* m_staticline10;
-		
-		wxStaticText* m_staticTextStatusRight;
-		
-		wxStaticBitmap* m_bitmap15;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnCompare( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnStartSync( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSwitchView( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnNewConfig( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSaveConfig( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnLoadConfig( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnMenuQuit( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnMenuGlobalSettings( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnMenuBatchJob( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnMenuExportFileList( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnShowHelp( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnMenuCheckVersion( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnMenuAbout( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCmpSettings( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSyncSettings( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnDirSelected( wxFileDirPickerEvent& event ) { event.Skip(); }
-		virtual void OnSwapSides( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnAddFolderPair( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnRemoveTopFolderPair( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnLeftGridDoubleClick( wxGridEvent& event ) { event.Skip(); }
-		virtual void OnContextRim( wxGridEvent& event ) { event.Skip(); }
-		virtual void OnSortLeftGrid( wxGridEvent& event ) { event.Skip(); }
-		virtual void OnContextRimLabelLeft( wxGridEvent& event ) { event.Skip(); }
-		virtual void OnContextMiddle( wxGridEvent& event ) { event.Skip(); }
-		virtual void OnSortMiddleGrid( wxGridEvent& event ) { event.Skip(); }
-		virtual void OnContextMiddleLabel( wxGridEvent& event ) { event.Skip(); }
-		virtual void OnRightGridDoubleClick( wxGridEvent& event ) { event.Skip(); }
-		virtual void OnSortRightGrid( wxGridEvent& event ) { event.Skip(); }
-		virtual void OnContextRimLabelRight( wxGridEvent& event ) { event.Skip(); }
-		virtual void OnCfgHistoryKeyEvent( wxKeyEvent& event ) { event.Skip(); }
-		virtual void OnLoadFromHistory( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnConfigureFilter( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnHideFilteredButton( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSyncCreateLeft( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSyncDirLeft( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSyncDeleteLeft( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnLeftOnlyFiles( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnLeftNewerFiles( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnEqualFiles( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnDifferentFiles( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSyncDirNone( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnRightNewerFiles( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnRightOnlyFiles( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSyncDeleteRight( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSyncDirRight( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSyncCreateRight( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnConflictFiles( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		wxPanel* m_panelTopLeft;
-		CustomComboBox* m_directoryLeft;
-		FfsDirPickerCtrl* m_dirPickerLeft;
-		wxBitmapButton* m_bpButtonLocalFilter;
-		wxBitmapButton* m_bpButtonAltSyncCfg;
-		wxPanel* m_panelTopRight;
-		wxBitmapButton* m_bpButtonRemovePair;
-		CustomComboBox* m_directoryRight;
-		FfsDirPickerCtrl* m_dirPickerRight;
-		wxPanel* m_panelLeft;
-		wxPanel* m_panelRight;
-		
-		MainDialogGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
-		
-		~MainDialogGenerated();
-	
+private:
+
+protected:
+    wxMenuBar* m_menubar1;
+    wxMenu* m_menuFile;
+    wxMenuItem* m_menuItem10;
+    wxMenuItem* m_menuItem11;
+    wxMenuItem* m_menuItemSwitchView;
+    wxMenuItem* m_menuItemNew;
+    wxMenuItem* m_menuItemSave;
+    wxMenuItem* m_menuItemLoad;
+    wxMenu* m_menuAdvanced;
+    wxMenu* m_menuLanguages;
+    wxMenuItem* m_menuItemGlobSett;
+    wxMenuItem* m_menuItem7;
+    wxMenu* m_menuHelp;
+    wxMenuItem* m_menuItemCheckVer;
+    wxMenuItem* m_menuItemAbout;
+    wxBoxSizer* bSizerPanelHolder;
+    wxPanel* m_panelTopButtons;
+    wxBoxSizer* bSizerTopButtons;
+
+    wxStaticText* m_staticTextCmpVariant;
+
+    wxButtonWithImage* m_buttonCompare;
+    wxButton* m_buttonAbort;
+    wxBitmapButton* m_bpButtonCmpConfig;
+
+
+    wxStaticText* m_staticTextSyncVariant;
+    wxBitmapButton* m_bpButtonSyncConfig;
+    wxButtonWithImage* m_buttonStartSync;
+
+    wxPanel* m_panelDirectoryPairs;
+    wxStaticBoxSizer* sbSizerDirLeft;
+    wxPanel* m_panelTopMiddle;
+
+    wxBitmapButton* m_bpButtonSwapSides;
+
+
+
+    wxStaticBoxSizer* sbSizerDirRight;
+    wxBitmapButton* m_bpButtonAddPair;
+    wxScrolledWindow* m_scrolledWindowFolderPairs;
+    wxBoxSizer* bSizerAddFolderPairs;
+    wxPanel* m_panelGrids;
+    wxBoxSizer* bSizerGridHolder;
+    CustomGridLeft* m_gridLeft;
+    wxPanel* m_panelMiddle;
+    CustomGridMiddle* m_gridMiddle;
+    CustomGridRight* m_gridRight;
+    wxPanel* m_panelConfig;
+    wxBoxSizer* bSizerConfig;
+
+    wxBitmapButton* m_bpButtonSave;
+    wxBitmapButton* m_bpButtonLoad;
+    wxListBox* m_listBoxHistory;
+    wxPanel* m_panelFilter;
+
+    wxBitmapButton* m_bpButtonFilter;
+    wxCheckBox* m_checkBoxHideFilt;
+    wxPanel* m_panelStatistics;
+    wxBoxSizer* bSizerStatistics;
+
+    wxStaticBitmap* m_bitmapCreate;
+    wxTextCtrl* m_textCtrlCreate;
+    wxStaticBitmap* m_bitmapUpdate;
+    wxTextCtrl* m_textCtrlUpdate;
+    wxStaticBitmap* m_bitmapDelete;
+    wxTextCtrl* m_textCtrlDelete;
+    wxStaticBitmap* m_bitmapData;
+    wxTextCtrl* m_textCtrlData;
+
+    wxPanel* m_panelViewFilter;
+    wxBoxSizer* bSizerViewFilter;
+
+    ToggleButton* m_bpButtonSyncCreateLeft;
+    ToggleButton* m_bpButtonSyncDirOverwLeft;
+    ToggleButton* m_bpButtonSyncDeleteLeft;
+    ToggleButton* m_bpButtonLeftOnly;
+    ToggleButton* m_bpButtonLeftNewer;
+    ToggleButton* m_bpButtonEqual;
+    ToggleButton* m_bpButtonDifferent;
+    ToggleButton* m_bpButtonSyncDirNone;
+    ToggleButton* m_bpButtonRightNewer;
+    ToggleButton* m_bpButtonRightOnly;
+    ToggleButton* m_bpButtonSyncDeleteRight;
+    ToggleButton* m_bpButtonSyncDirOverwRight;
+    ToggleButton* m_bpButtonSyncCreateRight;
+    ToggleButton* m_bpButtonConflict;
+
+    wxPanel* m_panelStatusBar;
+
+    wxStaticText* m_staticTextStatusLeft;
+
+    wxStaticLine* m_staticline9;
+
+    wxStaticText* m_staticTextStatusMiddle;
+
+    wxStaticLine* m_staticline10;
+
+    wxStaticText* m_staticTextStatusRight;
+
+    wxStaticBitmap* m_bitmap15;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void OnCompare( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnStartSync( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSwitchView( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnNewConfig( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSaveConfig( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnLoadConfig( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnMenuQuit( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnMenuGlobalSettings( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnMenuBatchJob( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnMenuExportFileList( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnShowHelp( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnMenuCheckVersion( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnMenuAbout( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCmpSettings( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSyncSettings( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnDirSelected( wxFileDirPickerEvent& event ) { event.Skip(); }
+    virtual void OnSwapSides( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnAddFolderPair( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnRemoveTopFolderPair( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnLeftGridDoubleClick( wxGridEvent& event ) { event.Skip(); }
+    virtual void OnContextRim( wxGridEvent& event ) { event.Skip(); }
+    virtual void OnSortLeftGrid( wxGridEvent& event ) { event.Skip(); }
+    virtual void OnContextRimLabelLeft( wxGridEvent& event ) { event.Skip(); }
+    virtual void OnContextMiddle( wxGridEvent& event ) { event.Skip(); }
+    virtual void OnSortMiddleGrid( wxGridEvent& event ) { event.Skip(); }
+    virtual void OnContextMiddleLabel( wxGridEvent& event ) { event.Skip(); }
+    virtual void OnRightGridDoubleClick( wxGridEvent& event ) { event.Skip(); }
+    virtual void OnSortRightGrid( wxGridEvent& event ) { event.Skip(); }
+    virtual void OnContextRimLabelRight( wxGridEvent& event ) { event.Skip(); }
+    virtual void OnCfgHistoryKeyEvent( wxKeyEvent& event ) { event.Skip(); }
+    virtual void OnLoadFromHistory( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnConfigureFilter( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnHideFilteredButton( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSyncCreateLeft( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSyncDirLeft( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSyncDeleteLeft( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnLeftOnlyFiles( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnLeftNewerFiles( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnEqualFiles( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnDifferentFiles( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSyncDirNone( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnRightNewerFiles( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnRightOnlyFiles( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSyncDeleteRight( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSyncDirRight( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSyncCreateRight( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnConflictFiles( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+    wxPanel* m_panelTopLeft;
+    CustomComboBox* m_directoryLeft;
+    FfsDirPickerCtrl* m_dirPickerLeft;
+    wxBitmapButton* m_bpButtonLocalFilter;
+    wxBitmapButton* m_bpButtonAltSyncCfg;
+    wxPanel* m_panelTopRight;
+    wxBitmapButton* m_bpButtonRemovePair;
+    CustomComboBox* m_directoryRight;
+    FfsDirPickerCtrl* m_dirPickerRight;
+    wxPanel* m_panelLeft;
+    wxPanel* m_panelRight;
+
+    MainDialogGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
+
+    ~MainDialogGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class FolderPairGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class FolderPairGenerated : public wxPanel 
+class FolderPairGenerated : public wxPanel
 {
-	private:
-	
-	protected:
-		
-		
-		
-	
-	public:
-		wxPanel* m_panelLeft;
-		wxTextCtrl* m_directoryLeft;
-		FfsDirPickerCtrl* m_dirPickerLeft;
-		wxPanel* m_panel20;
-		wxBitmapButton* m_bpButtonLocalFilter;
-		wxBitmapButton* m_bpButtonAltSyncCfg;
-		wxPanel* m_panelRight;
-		wxBitmapButton* m_bpButtonRemovePair;
-		wxTextCtrl* m_directoryRight;
-		FfsDirPickerCtrl* m_dirPickerRight;
-		
-		FolderPairGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL ); 
-		~FolderPairGenerated();
-	
+private:
+
+protected:
+
+
+
+
+public:
+    wxPanel* m_panelLeft;
+    wxTextCtrl* m_directoryLeft;
+    FfsDirPickerCtrl* m_dirPickerLeft;
+    wxPanel* m_panel20;
+    wxBitmapButton* m_bpButtonLocalFilter;
+    wxBitmapButton* m_bpButtonAltSyncCfg;
+    wxPanel* m_panelRight;
+    wxBitmapButton* m_bpButtonRemovePair;
+    wxTextCtrl* m_directoryRight;
+    FfsDirPickerCtrl* m_dirPickerRight;
+
+    FolderPairGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );
+    ~FolderPairGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class BatchFolderPairGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class BatchFolderPairGenerated : public wxPanel 
+class BatchFolderPairGenerated : public wxPanel
 {
-	private:
-	
-	protected:
-		wxPanel* m_panel32;
-		wxStaticText* m_staticText53;
-		wxStaticText* m_staticText541;
-		wxPanel* m_panelLeft;
-		wxPanel* m_panelRight;
-		
-	
-	public:
-		wxBitmapButton* m_bpButtonRemovePair;
-		wxTextCtrl* m_directoryLeft;
-		FfsDirPickerCtrl* m_dirPickerLeft;
-		wxBitmapButton* m_bpButtonLocalFilter;
-		wxTextCtrl* m_directoryRight;
-		FfsDirPickerCtrl* m_dirPickerRight;
-		wxBitmapButton* m_bpButtonAltSyncCfg;
-		
-		BatchFolderPairGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL ); 
-		~BatchFolderPairGenerated();
-	
+private:
+
+protected:
+    wxPanel* m_panel32;
+    wxStaticText* m_staticText53;
+    wxStaticText* m_staticText541;
+    wxPanel* m_panelLeft;
+    wxPanel* m_panelRight;
+
+
+public:
+    wxBitmapButton* m_bpButtonRemovePair;
+    wxTextCtrl* m_directoryLeft;
+    FfsDirPickerCtrl* m_dirPickerLeft;
+    wxBitmapButton* m_bpButtonLocalFilter;
+    wxTextCtrl* m_directoryRight;
+    FfsDirPickerCtrl* m_dirPickerRight;
+    wxBitmapButton* m_bpButtonAltSyncCfg;
+
+    BatchFolderPairGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );
+    ~BatchFolderPairGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class BatchDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class BatchDlgGenerated : public wxDialog 
+class BatchDlgGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		wxBoxSizer* bSizer69;
-		wxStaticBitmap* m_bitmap27;
-		wxPanel* m_panel8;
-		wxStaticText* m_staticText56;
-		
-		
-		wxStaticText* m_staticText44;
-		wxBitmapButton* m_bpButtonHelp;
-		
-		wxStaticLine* m_staticline10;
-		wxStaticText* m_staticText531;
-		wxNotebook* m_notebookSettings;
-		wxPanel* m_panelOverview;
-		wxBitmapButton* m_bpButtonCmpConfig;
-		
-		wxStaticText* m_staticTextCmpVariant;
-		
-		wxBitmapButton* m_bpButtonFilter;
-		
-		wxStaticText* m_staticTextSyncVariant;
-		
-		wxBitmapButton* m_bpButtonSyncConfig;
-		
-		wxBoxSizer* sbSizerMainPair;
-		wxPanel* m_panelMainPair;
-		wxStaticText* m_staticText532;
-		wxStaticText* m_staticText5411;
-		wxBoxSizer* bSizerAddFolderPairs;
-		
-		
-		wxCheckBox* m_checkBoxSilent;
-		
-		wxChoice* m_choiceHandleError;
-		wxPanel* m_panelLogging;
-		wxStaticText* m_staticText120;
-		wxStaticBoxSizer* sbSizerLogfileDir;
-		wxTextCtrl* m_textCtrlLogfileDir;
-		FfsDirPickerCtrl* m_dirPickerLogfileDir;
-		wxStaticText* m_staticText96;
-		
-		wxSpinCtrl* m_spinCtrlLogCountMax;
-		wxButton* m_buttonSave;
-		wxButton* m_buttonLoad;
-		wxButton* m_button6;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnHelp( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCmpSettings( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnConfigureFilter( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSyncSettings( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnAddFolderPair( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnRemoveTopFolderPair( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCheckSilent( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnChangeErrorHandling( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnChangeMaxLogCountTxt( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSaveBatchJob( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnLoadBatchJob( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		wxScrolledWindow* m_scrolledWindow6;
-		wxBitmapButton* m_bpButtonAddPair;
-		wxBitmapButton* m_bpButtonRemovePair;
-		wxPanel* m_panelLeft;
-		wxTextCtrl* m_directoryLeft;
-		FfsDirPickerCtrl* m_dirPickerLeft;
-		wxBitmapButton* m_bpButtonLocalFilter;
-		wxPanel* m_panelRight;
-		wxTextCtrl* m_directoryRight;
-		FfsDirPickerCtrl* m_dirPickerRight;
-		wxBitmapButton* m_bpButtonAltSyncCfg;
-		
-		BatchDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Create a batch job"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
-		~BatchDlgGenerated();
-	
+private:
+
+protected:
+    wxBoxSizer* bSizer69;
+    wxStaticBitmap* m_bitmap27;
+    wxPanel* m_panel8;
+    wxStaticText* m_staticText56;
+
+
+    wxStaticText* m_staticText44;
+    wxBitmapButton* m_bpButtonHelp;
+
+    wxStaticLine* m_staticline10;
+    wxStaticText* m_staticText531;
+    wxNotebook* m_notebookSettings;
+    wxPanel* m_panelOverview;
+    wxBitmapButton* m_bpButtonCmpConfig;
+
+    wxStaticText* m_staticTextCmpVariant;
+
+    wxBitmapButton* m_bpButtonFilter;
+
+    wxStaticText* m_staticTextSyncVariant;
+
+    wxBitmapButton* m_bpButtonSyncConfig;
+
+    wxBoxSizer* sbSizerMainPair;
+    wxPanel* m_panelMainPair;
+    wxStaticText* m_staticText532;
+    wxStaticText* m_staticText5411;
+    wxBoxSizer* bSizerAddFolderPairs;
+
+
+    wxCheckBox* m_checkBoxSilent;
+
+    wxChoice* m_choiceHandleError;
+    wxPanel* m_panelLogging;
+    wxStaticText* m_staticText120;
+    wxStaticBoxSizer* sbSizerLogfileDir;
+    wxTextCtrl* m_textCtrlLogfileDir;
+    FfsDirPickerCtrl* m_dirPickerLogfileDir;
+    wxStaticText* m_staticText96;
+
+    wxSpinCtrl* m_spinCtrlLogCountMax;
+    wxButton* m_buttonSave;
+    wxButton* m_buttonLoad;
+    wxButton* m_button6;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void OnHelp( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCmpSettings( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnConfigureFilter( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSyncSettings( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnAddFolderPair( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnRemoveTopFolderPair( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCheckSilent( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnChangeErrorHandling( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnChangeMaxLogCountTxt( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSaveBatchJob( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnLoadBatchJob( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+    wxScrolledWindow* m_scrolledWindow6;
+    wxBitmapButton* m_bpButtonAddPair;
+    wxBitmapButton* m_bpButtonRemovePair;
+    wxPanel* m_panelLeft;
+    wxTextCtrl* m_directoryLeft;
+    FfsDirPickerCtrl* m_dirPickerLeft;
+    wxBitmapButton* m_bpButtonLocalFilter;
+    wxPanel* m_panelRight;
+    wxTextCtrl* m_directoryRight;
+    FfsDirPickerCtrl* m_dirPickerRight;
+    wxBitmapButton* m_bpButtonAltSyncCfg;
+
+    BatchDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Create a batch job"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+    ~BatchDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class CompareStatusGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class CompareStatusGenerated : public wxPanel 
+class CompareStatusGenerated : public wxPanel
 {
-	private:
-	
-	protected:
-		
-		wxBoxSizer* bSizer42;
-		wxBoxSizer* bSizerFilesFound;
-		wxStaticText* m_staticText321;
-		wxStaticText* m_staticTextScanned;
-		wxBoxSizer* bSizerFilesRemaining;
-		wxStaticText* m_staticText46;
-		wxStaticText* m_staticTextFilesRemaining;
-		wxStaticText* m_staticText117;
-		wxStaticText* m_staticTextDataRemaining;
-		wxStaticText* m_staticText118;
-		
-		wxBoxSizer* sSizerSpeed;
-		wxStaticText* m_staticText104;
-		wxStaticText* m_staticTextSpeed;
-		
-		wxBoxSizer* sSizerTimeRemaining;
-		wxStaticText* m_staticTextTimeRemFixed;
-		wxStaticText* m_staticTextTimeRemaining;
-		
-		wxBoxSizer* sSizerTimeElapsed;
-		wxStaticText* m_staticTextTimeElapsed;
-		wxStaticText* m_staticText30;
-		wxTextCtrl* m_textCtrlStatus;
-		wxGauge* m_gauge2;
-		
-	
-	public:
-		
-		CompareStatusGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxRAISED_BORDER|wxTAB_TRAVERSAL ); 
-		~CompareStatusGenerated();
-	
+private:
+
+protected:
+
+    wxBoxSizer* bSizer42;
+    wxBoxSizer* bSizerFilesFound;
+    wxStaticText* m_staticText321;
+    wxStaticText* m_staticTextScanned;
+    wxBoxSizer* bSizerFilesRemaining;
+    wxStaticText* m_staticText46;
+    wxStaticText* m_staticTextFilesRemaining;
+    wxStaticText* m_staticText117;
+    wxStaticText* m_staticTextDataRemaining;
+    wxStaticText* m_staticText118;
+
+    wxBoxSizer* sSizerSpeed;
+    wxStaticText* m_staticText104;
+    wxStaticText* m_staticTextSpeed;
+
+    wxBoxSizer* sSizerTimeRemaining;
+    wxStaticText* m_staticTextTimeRemFixed;
+    wxStaticText* m_staticTextTimeRemaining;
+
+    wxBoxSizer* sSizerTimeElapsed;
+    wxStaticText* m_staticTextTimeElapsed;
+    wxStaticText* m_staticText30;
+    wxTextCtrl* m_textCtrlStatus;
+    wxGauge* m_gauge2;
+
+
+public:
+
+    CompareStatusGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxRAISED_BORDER|wxTAB_TRAVERSAL );
+    ~CompareStatusGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class SyncCfgDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class SyncCfgDlgGenerated : public wxDialog 
+class SyncCfgDlgGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		wxStaticText* m_staticText1;
-		wxRadioButton* m_radioBtnAutomatic;
-		wxButton* m_buttonAutomatic;
-		wxStaticText* m_staticText81;
-		wxRadioButton* m_radioBtnMirror;
-		wxButton* m_buttonOneWay;
-		wxStaticText* m_staticText8;
-		wxRadioButton* m_radioBtnUpdate;
-		wxButton* m_buttonUpdate;
-		wxStaticText* m_staticText101;
-		wxRadioButton* m_radioBtnCustom;
-		
-		wxStaticText* m_staticText23;
-		
-		wxStaticText* m_staticText9;
-		
-		wxBoxSizer* bSizer201;
-		wxStaticBoxSizer* sbSizerErrorHandling;
-		wxChoice* m_choiceHandleError;
-		wxStaticBoxSizer* sbSizerCustDelDir;
-		wxChoice* m_choiceHandleDeletion;
-		wxPanel* m_panelCustomDeletionDir;
-		wxTextCtrl* m_textCtrlCustomDelFolder;
-		FfsDirPickerCtrl* m_dirPickerCustomDelFolder;
-		
-		wxButton* m_buttonOK;
-		wxButton* m_button16;
-		
-		
-		wxStaticBoxSizer* sbSizerSyncDirections;
-		wxStaticText* m_staticText21;
-		wxStaticText* m_staticText31;
-		wxStaticLine* m_staticline3;
-		wxStaticBitmap* m_bitmapLeftOnly;
-		
-		wxBitmapButton* m_bpButtonLeftOnly;
-		wxStaticBitmap* m_bitmapRightOnly;
-		
-		wxBitmapButton* m_bpButtonRightOnly;
-		wxStaticBitmap* m_bitmapLeftNewer;
-		
-		wxBitmapButton* m_bpButtonLeftNewer;
-		wxStaticBitmap* m_bitmapRightNewer;
-		
-		wxBitmapButton* m_bpButtonRightNewer;
-		wxStaticBitmap* m_bitmapDifferent;
-		
-		wxBitmapButton* m_bpButtonDifferent;
-		wxStaticBitmap* m_bitmapConflict;
-		
-		wxBitmapButton* m_bpButtonConflict;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnSyncAutomatic( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSyncLeftToRight( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSyncUpdate( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSyncCustom( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnChangeErrorHandling( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnChangeDeletionHandling( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnApply( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnExLeftSideOnly( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnExRightSideOnly( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnLeftNewer( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnRightNewer( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnDifferent( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnConflict( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		SyncCfgDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Synchronization settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE ); 
-		~SyncCfgDlgGenerated();
-	
+private:
+
+protected:
+    wxStaticText* m_staticText1;
+    wxRadioButton* m_radioBtnAutomatic;
+    wxButton* m_buttonAutomatic;
+    wxStaticText* m_staticText81;
+    wxRadioButton* m_radioBtnMirror;
+    wxButton* m_buttonOneWay;
+    wxStaticText* m_staticText8;
+    wxRadioButton* m_radioBtnUpdate;
+    wxButton* m_buttonUpdate;
+    wxStaticText* m_staticText101;
+    wxRadioButton* m_radioBtnCustom;
+
+    wxStaticText* m_staticText23;
+
+    wxStaticText* m_staticText9;
+
+    wxBoxSizer* bSizer201;
+    wxStaticBoxSizer* sbSizerErrorHandling;
+    wxChoice* m_choiceHandleError;
+    wxStaticBoxSizer* sbSizerCustDelDir;
+    wxChoice* m_choiceHandleDeletion;
+    wxPanel* m_panelCustomDeletionDir;
+    wxTextCtrl* m_textCtrlCustomDelFolder;
+    FfsDirPickerCtrl* m_dirPickerCustomDelFolder;
+
+    wxButton* m_buttonOK;
+    wxButton* m_button16;
+
+
+    wxStaticBoxSizer* sbSizerSyncDirections;
+    wxStaticText* m_staticText21;
+    wxStaticText* m_staticText31;
+    wxStaticLine* m_staticline3;
+    wxStaticBitmap* m_bitmapLeftOnly;
+
+    wxBitmapButton* m_bpButtonLeftOnly;
+    wxStaticBitmap* m_bitmapRightOnly;
+
+    wxBitmapButton* m_bpButtonRightOnly;
+    wxStaticBitmap* m_bitmapLeftNewer;
+
+    wxBitmapButton* m_bpButtonLeftNewer;
+    wxStaticBitmap* m_bitmapRightNewer;
+
+    wxBitmapButton* m_bpButtonRightNewer;
+    wxStaticBitmap* m_bitmapDifferent;
+
+    wxBitmapButton* m_bpButtonDifferent;
+    wxStaticBitmap* m_bitmapConflict;
+
+    wxBitmapButton* m_bpButtonConflict;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void OnSyncAutomatic( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSyncLeftToRight( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSyncUpdate( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSyncCustom( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnChangeErrorHandling( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnChangeDeletionHandling( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnApply( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnExLeftSideOnly( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnExRightSideOnly( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnLeftNewer( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnRightNewer( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnDifferent( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnConflict( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+
+    SyncCfgDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Synchronization settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
+    ~SyncCfgDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class CmpCfgDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class CmpCfgDlgGenerated : public wxDialog 
+class CmpCfgDlgGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		wxRadioButton* m_radioBtnSizeDate;
-		wxStaticBitmap* m_bitmapByTime;
-		wxButton* m_buttonTimeSize;
-		wxRadioButton* m_radioBtnContent;
-		wxStaticBitmap* m_bitmapByContent;
-		wxButton* m_buttonContent;
-		wxStaticLine* m_staticline14;
-		wxBitmapButton* m_bpButtonHelp;
-		
-		wxChoice* m_choiceHandleSymlinks;
-		wxButton* m_button10;
-		wxButton* m_button6;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnTimeSize( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnContent( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnShowHelp( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnChangeErrorHandling( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		CmpCfgDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Comparison settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); 
-		~CmpCfgDlgGenerated();
-	
+private:
+
+protected:
+    wxRadioButton* m_radioBtnSizeDate;
+    wxStaticBitmap* m_bitmapByTime;
+    wxButton* m_buttonTimeSize;
+    wxRadioButton* m_radioBtnContent;
+    wxStaticBitmap* m_bitmapByContent;
+    wxButton* m_buttonContent;
+    wxStaticLine* m_staticline14;
+    wxBitmapButton* m_bpButtonHelp;
+
+    wxChoice* m_choiceHandleSymlinks;
+    wxButton* m_button10;
+    wxButton* m_button6;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void OnTimeSize( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnContent( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnShowHelp( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnChangeErrorHandling( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+
+    CmpCfgDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Comparison settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+    ~CmpCfgDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class SyncStatusDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class SyncStatusDlgGenerated : public wxFrame 
+class SyncStatusDlgGenerated : public wxFrame
 {
-	private:
-	
-	protected:
-		
-		
-		wxStaticBitmap* m_bitmapStatus;
-		wxStaticText* m_staticTextStatus;
-		wxAnimationCtrl* m_animationControl1;
-		
-		wxBoxSizer* bSizer31;
-		wxBoxSizer* bSizerObjectsRemaining;
-		wxStaticText* m_staticText25;
-		wxStaticText* m_staticTextRemainingObj;
-		wxStaticText* m_staticText96;
-		wxStaticText* m_staticTextDataRemaining;
-		wxStaticText* m_staticText97;
-		wxBoxSizer* bSizerObjectsProcessed;
-		wxStaticText* m_staticText251;
-		wxStaticText* m_staticTextProcessedObj;
-		wxStaticText* m_staticText98;
-		wxStaticText* m_staticTextDataProcessed;
-		wxStaticText* m_staticText99;
-		
-		wxStaticText* m_staticText55;
-		wxStaticText* m_staticTextTimeElapsed;
-		wxBoxSizer* bSizerProgressText;
-		wxTextCtrl* m_textCtrlInfo;
-		wxBoxSizer* bSizer28;
-		wxBoxSizer* bSizerSpeed;
-		wxStaticText* m_staticText108;
-		wxStaticText* m_staticTextSpeed;
-		
-		
-		wxButton* m_buttonOK;
-		wxButton* m_buttonPause;
-		wxButton* m_buttonAbort;
-		
-		wxBoxSizer* bSizerRemTime;
-		
-		wxStaticText* m_staticText21;
-		wxStaticText* m_staticTextTimeRemaining;
-		
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnIconize( wxIconizeEvent& event ) { event.Skip(); }
-		virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnPause( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnAbort( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		wxGauge* m_gauge1;
-		
-		SyncStatusDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 638,350 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
-		
-		~SyncStatusDlgGenerated();
-	
+private:
+
+protected:
+
+
+    wxStaticBitmap* m_bitmapStatus;
+    wxStaticText* m_staticTextStatus;
+    wxAnimationCtrl* m_animationControl1;
+
+    wxBoxSizer* bSizer31;
+    wxBoxSizer* bSizerObjectsRemaining;
+    wxStaticText* m_staticText25;
+    wxStaticText* m_staticTextRemainingObj;
+    wxStaticText* m_staticText96;
+    wxStaticText* m_staticTextDataRemaining;
+    wxStaticText* m_staticText97;
+    wxBoxSizer* bSizerObjectsProcessed;
+    wxStaticText* m_staticText251;
+    wxStaticText* m_staticTextProcessedObj;
+    wxStaticText* m_staticText98;
+    wxStaticText* m_staticTextDataProcessed;
+    wxStaticText* m_staticText99;
+
+    wxStaticText* m_staticText55;
+    wxStaticText* m_staticTextTimeElapsed;
+    wxBoxSizer* bSizerProgressText;
+    wxTextCtrl* m_textCtrlInfo;
+    wxBoxSizer* bSizer28;
+    wxBoxSizer* bSizerSpeed;
+    wxStaticText* m_staticText108;
+    wxStaticText* m_staticTextSpeed;
+
+
+    wxButton* m_buttonOK;
+    wxButton* m_buttonPause;
+    wxButton* m_buttonAbort;
+
+    wxBoxSizer* bSizerRemTime;
+
+    wxStaticText* m_staticText21;
+    wxStaticText* m_staticTextTimeRemaining;
+
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void OnIconize( wxIconizeEvent& event ) { event.Skip(); }
+    virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnPause( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnAbort( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+    wxGauge* m_gauge1;
+
+    SyncStatusDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 638,350 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
+
+    ~SyncStatusDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class LogControlGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class LogControlGenerated : public wxPanel 
+class LogControlGenerated : public wxPanel
 {
-	private:
-	
-	protected:
-		ToggleButton* m_bpButtonErrors;
-		ToggleButton* m_bpButtonWarnings;
-		ToggleButton* m_bpButtonInfo;
-		wxTextCtrl* m_textCtrlInfo;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnErrors( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnWarnings( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnInfo( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		LogControlGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL ); 
-		~LogControlGenerated();
-	
+private:
+
+protected:
+    ToggleButton* m_bpButtonErrors;
+    ToggleButton* m_bpButtonWarnings;
+    ToggleButton* m_bpButtonInfo;
+    wxTextCtrl* m_textCtrlInfo;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnErrors( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnWarnings( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnInfo( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+
+    LogControlGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL );
+    ~LogControlGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class HelpDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class HelpDlgGenerated : public wxDialog 
+class HelpDlgGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		
-		wxStaticBitmap* m_bitmap25;
-		wxPanel* m_panel8;
-		
-		wxStaticText* m_staticText56;
-		
-		
-		wxNotebook* m_notebook1;
-		wxScrolledWindow* m_scrolledWindow1;
-		wxStaticText* m_staticText59;
-		wxStaticText* m_staticText60;
-		wxStaticText* m_staticText61;
-		wxTreeCtrl* m_treeCtrl1;
-		wxStaticText* m_staticText63;
-		wxStaticText* m_staticText75;
-		wxStaticText* m_staticText76;
-		wxStaticText* m_staticText77;
-		wxStaticText* m_staticText79;
-		wxStaticText* m_staticText80;
-		wxStaticText* m_staticText78;
-		wxScrolledWindow* m_scrolledWindow5;
-		wxStaticText* m_staticText65;
-		wxStaticText* m_staticText66;
-		wxTreeCtrl* m_treeCtrl2;
-		wxStaticText* m_staticText69;
-		wxStaticText* m_staticText81;
-		wxStaticText* m_staticText82;
-		wxStaticText* m_staticText83;
-		wxStaticText* m_staticText84;
-		wxButton* m_button8;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnOK( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		HelpDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 579,543 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
-		~HelpDlgGenerated();
-	
+private:
+
+protected:
+
+    wxStaticBitmap* m_bitmap25;
+    wxPanel* m_panel8;
+
+    wxStaticText* m_staticText56;
+
+
+    wxNotebook* m_notebook1;
+    wxScrolledWindow* m_scrolledWindow1;
+    wxStaticText* m_staticText59;
+    wxStaticText* m_staticText60;
+    wxStaticText* m_staticText61;
+    wxTreeCtrl* m_treeCtrl1;
+    wxStaticText* m_staticText63;
+    wxStaticText* m_staticText75;
+    wxStaticText* m_staticText76;
+    wxStaticText* m_staticText77;
+    wxStaticText* m_staticText79;
+    wxStaticText* m_staticText80;
+    wxStaticText* m_staticText78;
+    wxScrolledWindow* m_scrolledWindow5;
+    wxStaticText* m_staticText65;
+    wxStaticText* m_staticText66;
+    wxTreeCtrl* m_treeCtrl2;
+    wxStaticText* m_staticText69;
+    wxStaticText* m_staticText81;
+    wxStaticText* m_staticText82;
+    wxStaticText* m_staticText83;
+    wxStaticText* m_staticText84;
+    wxButton* m_button8;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void OnOK( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+
+    HelpDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 579,543 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+    ~HelpDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class AboutDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class AboutDlgGenerated : public wxDialog 
+class AboutDlgGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		
-		wxPanel* m_panel5;
-		wxStaticBitmap* m_bitmap11;
-		wxStaticText* m_build;
-		
-		wxScrolledWindow* m_scrolledWindowCodeInfo;
-		wxBoxSizer* bSizerCodeInfo;
-		wxStaticText* m_staticText72;
-		wxStaticText* m_staticText73;
-		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;
+
+    wxScrolledWindow* m_scrolledWindowCodeInfo;
+    wxBoxSizer* bSizerCodeInfo;
+    wxStaticText* m_staticText72;
+    wxStaticText* m_staticText73;
+    wxHyperlinkCtrl* m_hyperlink21;
+    wxScrolledWindow* m_scrolledWindowTranslators;
+    wxBoxSizer* bSizerTranslators;
+    wxStaticText* m_staticText54;
+
+    wxFlexGridSizer* fgSizerTranslators;
+    wxStaticLine* m_staticline3;
+    wxStaticText* m_staticText131;
+    wxStaticLine* m_staticline12;
+    wxStaticBitmap* m_bitmap9;
+    wxHyperlinkCtrl* m_hyperlink1;
+
+    wxHyperlinkCtrl* m_hyperlink3;
+    wxAnimationCtrl* m_animationControl1;
+    wxStaticBitmap* m_bitmap10;
+    wxHyperlinkCtrl* m_hyperlink2;
+
+    wxHyperlinkCtrl* m_hyperlink6;
+    wxStaticBitmap* m_bitmapTransl;
+    wxStaticLine* m_staticline2;
+
+    wxStaticBitmap* m_bitmap13;
+    wxHyperlinkCtrl* m_hyperlink5;
+
+    wxButton* m_buttonOkay;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void OnOK( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+
+    AboutDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("About"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
+    ~AboutDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class ErrorDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class ErrorDlgGenerated : public wxDialog 
+class ErrorDlgGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		
-		wxStaticBitmap* m_bitmap10;
-		wxTextCtrl* m_textCtrl8;
-		wxCheckBox* m_checkBoxIgnoreErrors;
-		
-		wxButton* m_buttonIgnore;
-		wxButton* m_buttonRetry;
-		wxButton* m_buttonAbort;
-		
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnIgnore( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnRetry( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnAbort( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		ErrorDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Error"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 460,250 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER ); 
-		~ErrorDlgGenerated();
-	
+private:
+
+protected:
+
+    wxStaticBitmap* m_bitmap10;
+    wxTextCtrl* m_textCtrl8;
+    wxCheckBox* m_checkBoxIgnoreErrors;
+
+    wxButton* m_buttonIgnore;
+    wxButton* m_buttonRetry;
+    wxButton* m_buttonAbort;
+
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void OnIgnore( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnRetry( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnAbort( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+
+    ErrorDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Error"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 460,250 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER );
+    ~ErrorDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class WarningDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class WarningDlgGenerated : public wxDialog 
+class WarningDlgGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		
-		wxTextCtrl* m_textCtrl8;
-		wxCheckBox* m_checkBoxDontShowAgain;
-		
-		wxButton* m_buttonIgnore;
-		wxButton* m_buttonSwitch;
-		wxButton* m_buttonAbort;
-		
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnIgnore( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSwitch( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnAbort( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		wxStaticBitmap* m_bitmap10;
-		
-		WarningDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Warning"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 460,250 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER ); 
-		~WarningDlgGenerated();
-	
+private:
+
+protected:
+
+    wxTextCtrl* m_textCtrl8;
+    wxCheckBox* m_checkBoxDontShowAgain;
+
+    wxButton* m_buttonIgnore;
+    wxButton* m_buttonSwitch;
+    wxButton* m_buttonAbort;
+
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void OnIgnore( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnSwitch( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnAbort( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+    wxStaticBitmap* m_bitmap10;
+
+    WarningDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Warning"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 460,250 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER );
+    ~WarningDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class QuestionDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class QuestionDlgGenerated : public wxDialog 
+class QuestionDlgGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		
-		wxStaticBitmap* m_bitmap10;
-		wxTextCtrl* m_textCtrl8;
-		wxCheckBox* m_checkBoxDontAskAgain;
-		
-		wxButton* m_buttonYes;
-		wxButton* m_buttonNo;
-		wxButton* m_buttonCancel;
-		
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnYes( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnNo( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		QuestionDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Question"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 420,198 ), long style = wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER ); 
-		~QuestionDlgGenerated();
-	
+private:
+
+protected:
+
+    wxStaticBitmap* m_bitmap10;
+    wxTextCtrl* m_textCtrl8;
+    wxCheckBox* m_checkBoxDontAskAgain;
+
+    wxButton* m_buttonYes;
+    wxButton* m_buttonNo;
+    wxButton* m_buttonCancel;
+
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void 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;
-		
-		wxStaticText* m_staticText15;
-		wxStaticBitmap* m_bitmap8;
-		wxTextCtrl* m_textCtrlInclude;
-		
-		wxStaticText* m_staticText16;
-		wxStaticBitmap* m_bitmap9;
-		wxTextCtrl* m_textCtrlExclude;
-		
-		wxButton* m_button9;
-		
-		wxButton* m_button10;
-		wxButton* m_button17;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnHelp( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnDefault( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnApply( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		FilterDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Configure filter"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
-		~FilterDlgGenerated();
-	
+private:
+
+protected:
+    wxStaticBitmap* m_bitmap26;
+    wxPanel* m_panel8;
+    wxStaticText* m_staticTexHeader;
+
+    wxStaticText* m_staticText44;
+    wxBitmapButton* m_bpButtonHelp;
+
+    wxPanel* m_panel13;
+    wxStaticLine* m_staticline10;
+    wxStaticText* m_staticText45;
+    wxStaticText* m_staticText83;
+    wxStaticText* m_staticText84;
+    wxStaticText* m_staticText85;
+    wxStaticText* m_staticText181;
+    wxStaticText* m_staticText1811;
+
+    wxStaticText* m_staticText15;
+    wxStaticBitmap* m_bitmap8;
+    wxTextCtrl* m_textCtrlInclude;
+
+    wxStaticText* m_staticText16;
+    wxStaticBitmap* m_bitmap9;
+    wxTextCtrl* m_textCtrlExclude;
+
+    wxButton* m_button9;
+
+    wxButton* m_button10;
+    wxButton* m_button17;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void OnHelp( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnDefault( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnApply( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+
+    FilterDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Configure filter"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+    ~FilterDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class CustomizeColsDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class CustomizeColsDlgGenerated : public wxDialog 
+class CustomizeColsDlgGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		wxCheckListBox* m_checkListColumns;
-		wxBitmapButton* m_bpButton29;
-		wxBitmapButton* m_bpButton30;
-		wxButton* m_button9;
-		
-		wxButton* m_button28;
-		wxButton* m_button29;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnMoveUp( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnMoveDown( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnDefault( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		CustomizeColsDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Customize columns"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); 
-		~CustomizeColsDlgGenerated();
-	
+private:
+
+protected:
+    wxCheckListBox* m_checkListColumns;
+    wxBitmapButton* m_bpButton29;
+    wxBitmapButton* m_bpButton30;
+    wxButton* m_button9;
+
+    wxButton* m_button28;
+    wxButton* m_button29;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void OnMoveUp( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnMoveDown( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnDefault( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+
+    CustomizeColsDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Customize columns"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+    ~CustomizeColsDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class GlobalSettingsDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class GlobalSettingsDlgGenerated : public wxDialog 
+class GlobalSettingsDlgGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		wxStaticBitmap* m_bitmapSettings;
-		
-		wxPanel* m_panel8;
-		wxStaticText* m_staticText56;
-		
-		wxCheckBox* m_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_checkBoxCopyLocked;
+    wxCheckBox* m_checkBoxCopyPermissions;
+    wxStaticLine* m_staticline10;
+    wxStaticText* m_staticText100;
+
+    wxButtonWithImage* m_buttonResetDialogs;
+
+
+    wxGrid* m_gridCustomCommand;
+    wxBitmapButton* m_bpButtonAddRow;
+    wxBitmapButton* m_bpButtonRemoveRow;
+
+    wxButton* m_button9;
+
+    wxButton* m_buttonOkay;
+    wxButton* m_button29;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void OnResetDialogs( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnAddRow( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnRemoveRow( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnDefault( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnOkay( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+
+    GlobalSettingsDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Global settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
+    ~GlobalSettingsDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class SyncPreviewDlgGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class SyncPreviewDlgGenerated : public wxDialog 
+class SyncPreviewDlgGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		wxButtonWithImage* m_buttonStartSync;
-		wxStaticLine* m_staticline16;
-		wxStaticText* m_staticTextVariant;
-		wxStaticLine* m_staticline14;
-		
-		wxStaticText* m_staticText94;
-		wxStaticBitmap* m_bitmapCreate;
-		wxTextCtrl* m_textCtrlCreateL;
-		wxStaticBitmap* m_bitmapUpdate;
-		wxTextCtrl* m_textCtrlUpdateL;
-		wxStaticBitmap* m_bitmapDelete;
-		wxTextCtrl* m_textCtrlDeleteL;
-		wxStaticText* m_staticText95;
-		wxTextCtrl* m_textCtrlCreateR;
-		wxTextCtrl* m_textCtrlUpdateR;
-		wxTextCtrl* m_textCtrlDeleteR;
-		
-		wxStaticBitmap* m_bitmapData;
-		
-		wxTextCtrl* m_textCtrlData;
-		
-		wxStaticLine* m_staticline12;
-		wxCheckBox* m_checkBoxDontShowAgain;
-		
-		wxButton* m_button16;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnStartSync( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		SyncPreviewDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Synchronization Preview"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); 
-		~SyncPreviewDlgGenerated();
-	
+private:
+
+protected:
+    wxButtonWithImage* m_buttonStartSync;
+    wxStaticLine* m_staticline16;
+    wxStaticText* m_staticTextVariant;
+    wxStaticLine* m_staticline14;
+
+    wxStaticText* m_staticText94;
+    wxStaticBitmap* m_bitmapCreate;
+    wxTextCtrl* m_textCtrlCreateL;
+    wxStaticBitmap* m_bitmapUpdate;
+    wxTextCtrl* m_textCtrlUpdateL;
+    wxStaticBitmap* m_bitmapDelete;
+    wxTextCtrl* m_textCtrlDeleteL;
+    wxStaticText* m_staticText95;
+    wxTextCtrl* m_textCtrlCreateR;
+    wxTextCtrl* m_textCtrlUpdateR;
+    wxTextCtrl* m_textCtrlDeleteR;
+
+    wxStaticBitmap* m_bitmapData;
+
+    wxTextCtrl* m_textCtrlData;
+
+    wxStaticLine* m_staticline12;
+    wxCheckBox* m_checkBoxDontShowAgain;
+
+    wxButton* m_button16;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void OnStartSync( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+
+    SyncPreviewDlgGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Synchronization Preview"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE );
+    ~SyncPreviewDlgGenerated();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class PopupFrameGenerated1
 ///////////////////////////////////////////////////////////////////////////////
-class PopupFrameGenerated1 : public wxFrame 
+class PopupFrameGenerated1 : public wxFrame
 {
-	private:
-	
-	protected:
-	
-	public:
-		wxStaticBitmap* m_bitmapLeft;
-		wxStaticText* m_staticTextMain;
-		
-		PopupFrameGenerated1( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP|wxSTATIC_BORDER );
-		
-		~PopupFrameGenerated1();
-	
+private:
+
+protected:
+
+public:
+    wxStaticBitmap* m_bitmapLeft;
+    wxStaticText* m_staticTextMain;
+
+    PopupFrameGenerated1( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxFRAME_NO_TASKBAR|wxSTAY_ON_TOP|wxSTATIC_BORDER );
+
+    ~PopupFrameGenerated1();
+
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 /// Class SearchDialogGenerated
 ///////////////////////////////////////////////////////////////////////////////
-class SearchDialogGenerated : public wxDialog 
+class SearchDialogGenerated : public wxDialog
 {
-	private:
-	
-	protected:
-		wxStaticText* m_staticText101;
-		wxTextCtrl* m_textCtrlSearchTxt;
-		
-		wxCheckBox* m_checkBoxMatchCase;
-		wxButton* m_buttonFindNext;
-		wxButton* m_button29;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnText( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnFindNext( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		SearchDialogGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Find"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE ); 
-		~SearchDialogGenerated();
-	
+private:
+
+protected:
+    wxStaticText* m_staticText101;
+    wxTextCtrl* m_textCtrlSearchTxt;
+
+    wxCheckBox* m_checkBoxMatchCase;
+    wxButton* m_buttonFindNext;
+    wxButton* m_button29;
+
+    // Virtual event handlers, overide them in your derived class
+    virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+    virtual void OnText( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnFindNext( wxCommandEvent& event ) { event.Skip(); }
+    virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }
+
+
+public:
+
+    SearchDialogGenerated( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Find"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE );
+    ~SearchDialogGenerated();
+
 };
 
 #endif //__gui_generated__
diff --git a/ui/main_dlg.cpp b/ui/main_dlg.cpp
index d394b9fe..8eae6fb1 100644
--- a/ui/main_dlg.cpp
+++ b/ui/main_dlg.cpp
@@ -903,9 +903,8 @@ std::set<size_t> MainDialog::getSelectedRows() const
 class ManualDeletionHandler : private wxEvtHandler, public DeleteFilesHandler
 {
 public:
-    ManualDeletionHandler(MainDialog* main, size_t totalObjToDel) :
+    ManualDeletionHandler(MainDialog* main) :
         mainDlg(main),
-        totalObjToDelete(totalObjToDel),
         abortRequested(false),
         ignoreErrors(false),
         deletionCount(0)
@@ -955,15 +954,14 @@ public:
         return DeleteFilesHandler::IGNORE_ERROR; //dummy return value
     }
 
-    virtual void deletionSuccessful(size_t deletedItems)  //called for each file/folder that has been deleted
+    virtual void notifyDeletion(const Zstring& currentObject)  //called for each file/folder that has been deleted
     {
-        deletionCount += deletedItems;
+        ++deletionCount;
 
         if (updateUiIsAllowed())  //test if specific time span between ui updates is over
         {
-            wxString statusMessage = _("%x / %y objects deleted successfully");
+            wxString statusMessage = _("%x objects deleted successfully");
             statusMessage.Replace(wxT("%x"), ffs3::numberToStringSep(deletionCount), false);
-            statusMessage.Replace(wxT("%y"), ffs3::numberToStringSep(totalObjToDelete), false);
 
             if (mainDlg->m_staticTextStatusMiddle->GetLabel() != statusMessage)
             {
@@ -995,8 +993,6 @@ private:
 
     MainDialog* const mainDlg;
 
-    const size_t totalObjToDelete;
-
     bool abortRequested;
     bool ignoreErrors;
     size_t deletionCount;
@@ -1019,14 +1015,12 @@ void MainDialog::deleteSelectedFiles()
         gridDataView->getAllFileRef(viewSelectionRight, compRefRight);
 
 
-        int totalDeleteCount = 0;
         wxWindow* oldFocus = wxWindow::FindFocus();
 
         if (ffs3::showDeleteDialog(compRefLeft,
                                    compRefRight,
                                    globalSettings->gui.deleteOnBothSides,
-                                   globalSettings->gui.useRecyclerForManualDeletion,
-                                   totalDeleteCount) == DefaultReturnCode::BUTTON_OKAY)
+                                   globalSettings->gui.useRecyclerForManualDeletion) == DefaultReturnCode::BUTTON_OKAY)
         {
             if (globalSettings->gui.useRecyclerForManualDeletion && !ffs3::recycleBinExists())
             {
@@ -1037,7 +1031,7 @@ void MainDialog::deleteSelectedFiles()
             try
             {
                 //handle errors when deleting files/folders
-                ManualDeletionHandler statusHandler(this, totalDeleteCount);
+                ManualDeletionHandler statusHandler(this);
 
                 ffs3::deleteFromGridAndHD(gridDataView->getDataTentative(),
                                           compRefLeft,
diff --git a/ui/progress_indicator.cpp b/ui/progress_indicator.cpp
index 6e86fbba..aa25d07a 100644
--- a/ui/progress_indicator.cpp
+++ b/ui/progress_indicator.cpp
@@ -728,6 +728,8 @@ void SyncStatus::SyncStatusImpl::resetGauge(int totalObjectsToProcess, wxLongLon
 
 void SyncStatus::SyncStatusImpl::incProgressIndicator_NoUpdate(int objectsProcessed, wxLongLong dataProcessed)
 {
+    //assert(dataProcessed >= 0);
+
     currentData    +=    dataProcessed;
     currentObjects += objectsProcessed;
 }
diff --git a/ui/small_dlgs.cpp b/ui/small_dlgs.cpp
index 598580e3..58eac33f 100644
--- a/ui/small_dlgs.cpp
+++ b/ui/small_dlgs.cpp
@@ -334,8 +334,7 @@ public:
                  const std::vector<ffs3::FileSystemObject*>& rowsOnLeft,
                  const std::vector<ffs3::FileSystemObject*>& rowsOnRight,
                  bool& deleteOnBothSides,
-                 bool& useRecycleBin,
-                 int& totalDeleteCount);
+                 bool& useRecycleBin);
 
     enum
     {
@@ -356,7 +355,6 @@ private:
     const std::vector<ffs3::FileSystemObject*>& rowsToDeleteOnRight;
     bool& m_deleteOnBothSides;
     bool& m_useRecycleBin;
-    int&  totalDelCount;
 };
 
 
@@ -364,14 +362,12 @@ DeleteDialog::DeleteDialog(wxWindow* main,
                            const std::vector<FileSystemObject*>& rowsOnLeft,
                            const std::vector<FileSystemObject*>& rowsOnRight,
                            bool& deleteOnBothSides,
-                           bool& useRecycleBin,
-                           int& totalDeleteCount) :
+                           bool& useRecycleBin) :
     DeleteDlgGenerated(main),
     rowsToDeleteOnLeft(rowsOnLeft),
     rowsToDeleteOnRight(rowsOnRight),
     m_deleteOnBothSides(deleteOnBothSides),
-    m_useRecycleBin(useRecycleBin),
-    totalDelCount(totalDeleteCount)
+    m_useRecycleBin(useRecycleBin)
 {
 #ifdef FFS_WIN
     new MouseMoveWindow(*this, //allow moving main dialog by clicking (nearly) anywhere...
@@ -405,7 +401,11 @@ void DeleteDialog::updateTexts()
                                                  m_checkBoxDeleteBothSides->GetValue());
 
     const wxString filesToDelete = delInfo.first;
-    totalDelCount = delInfo.second;
+
+    #ifndef _MSC_VER
+    #warning do something with this number: ("Do you really want to delete the following %x object(s)?"));
+    //totalDelCount = delInfo.second;
+    #endif
 
     m_textCtrlMessage->SetValue(filesToDelete);
 
@@ -444,8 +444,7 @@ void DeleteDialog::OnUseRecycler(wxCommandEvent& event)
 DefaultReturnCode::Response ffs3::showDeleteDialog(const std::vector<ffs3::FileSystemObject*>& rowsOnLeft,
                                                    const std::vector<ffs3::FileSystemObject*>& rowsOnRight,
                                                    bool& deleteOnBothSides,
-                                                   bool& useRecycleBin,
-                                                   int& totalDeleteCount)
+                                                   bool& useRecycleBin)
 {
     DefaultReturnCode::Response rv = DefaultReturnCode::BUTTON_CANCEL;
 
@@ -453,8 +452,7 @@ DefaultReturnCode::Response ffs3::showDeleteDialog(const std::vector<ffs3::FileS
                                  rowsOnLeft,
                                  rowsOnRight,
                                  deleteOnBothSides,
-                                 useRecycleBin,
-                                 totalDeleteCount);
+                                 useRecycleBin);
     if (confirmDeletion.ShowModal() == DeleteDialog::BUTTON_OKAY)
         rv = DefaultReturnCode::BUTTON_OKAY;
     return rv;
diff --git a/ui/small_dlgs.h b/ui/small_dlgs.h
index 2c120c54..d4fce824 100644
--- a/ui/small_dlgs.h
+++ b/ui/small_dlgs.h
@@ -36,8 +36,7 @@ DefaultReturnCode::Response showDeleteDialog(
     const std::vector<FileSystemObject*>& rowsOnLeft,
     const std::vector<FileSystemObject*>& rowsOnRight,
     bool& deleteOnBothSides,
-    bool& useRecycleBin,
-    int& totalDeleteCount);
+    bool& useRecycleBin);
 
 DefaultReturnCode::Response showCustomizeColsDlg(xmlAccess::ColumnAttributes& attr);
 
diff --git a/version/version.h b/version/version.h
index 29953689..32e29ea9 100644
--- a/version/version.h
+++ b/version/version.h
@@ -2,5 +2,5 @@
 
 namespace ffs3
 {
-const wxString currentVersion = wxT("3.15"); //internal linkage!
+const wxString currentVersion = wxT("3.16"); //internal linkage!
 }
diff --git a/version/version.rc b/version/version.rc
index 69e9e6cc..fa44c3f7 100644
--- a/version/version.rc
+++ b/version/version.rc
@@ -1,2 +1,2 @@
-#define VER_FREEFILESYNC     3,15,0,0
-#define VER_FREEFILESYNC_STR "3.15\0"
+#define VER_FREEFILESYNC     3,16,0,0
+#define VER_FREEFILESYNC_STR "3.16\0"