5.8

27 files changed, 30 insertions, 428 deletions

diff --git a/wx+/app_main.h b/wx+/app_main.h
index 47331982..a13a122d 100644
--- a/wx+/app_main.h
+++ b/wx+/app_main.h
@@ -1,7 +1,7 @@
 // **************************************************************************
 // * This file is part of the FreeFileSync project. It is distributed under *
 // * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
-// * Copyright (C) ZenJu (zenju AT gmx DOT de) - All Rights Reserved        *
+// * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved        *
 // **************************************************************************
 
 #ifndef APPMAIN_H_INCLUDED
diff --git a/wx+/button.cpp b/wx+/button.cpp
index c710c158..8fce99f4 100644
--- a/wx+/button.cpp
+++ b/wx+/button.cpp
@@ -1,7 +1,7 @@
 // **************************************************************************
 // * This file is part of the FreeFileSync project. It is distributed under *
 // * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
-// * Copyright (C) ZenJu (zenju AT gmx DOT de) - All Rights Reserved        *
+// * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved        *
 // **************************************************************************
 
 #include "button.h"
diff --git a/wx+/button.h b/wx+/button.h
index 89e376a2..6aba0788 100644
--- a/wx+/button.h
+++ b/wx+/button.h
@@ -1,7 +1,7 @@
 // **************************************************************************
 // * This file is part of the FreeFileSync project. It is distributed under *
 // * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
-// * Copyright (C) ZenJu (zenju AT gmx DOT de) - All Rights Reserved        *
+// * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved        *
 // **************************************************************************
 
 #ifndef CUSTOMBUTTON_H_INCLUDED
diff --git a/wx+/choice_enum.h b/wx+/choice_enum.h
index e591a67f..adef88cc 100644
--- a/wx+/choice_enum.h
+++ b/wx+/choice_enum.h
@@ -1,7 +1,7 @@
 // **************************************************************************
 // * This file is part of the FreeFileSync project. It is distributed under *
 // * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
-// * Copyright (C) ZenJu (zenju AT gmx DOT de) - All Rights Reserved        *
+// * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved        *
 // **************************************************************************
 
 #ifndef WX_CHOICE_ENUM_H_INCLUDED
diff --git a/wx+/context_menu.h b/wx+/context_menu.h
index a2534291..2557737a 100644
--- a/wx+/context_menu.h
+++ b/wx+/context_menu.h
@@ -1,7 +1,7 @@
 // **************************************************************************
 // * This file is part of the FreeFileSync project. It is distributed under *
 // * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
-// * Copyright (C) ZenJu (zenju AT gmx DOT de) - All Rights Reserved        *
+// * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved        *
 // **************************************************************************
 
 #ifndef CONTEXT_HEADER_18047302153418174632141234
diff --git a/wx+/create_pch.cpp b/wx+/create_pch.cpp
index 406ce5b4..ad4cabd9 100644
--- a/wx+/create_pch.cpp
+++ b/wx+/create_pch.cpp
@@ -1,7 +1,7 @@
 // **************************************************************************
 // * This file is part of the FreeFileSync project. It is distributed under *
 // * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
-// * Copyright (C) ZenJu (zenju AT gmx DOT de) - All Rights Reserved        *
+// * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved        *
 // **************************************************************************
 
 //dummy file for Visual Studio to compile precompiled header:
diff --git a/wx+/file_drop.h b/wx+/file_drop.h
index 1d905c7a..22a6542c 100644
--- a/wx+/file_drop.h
+++ b/wx+/file_drop.h
@@ -1,7 +1,7 @@
 // **************************************************************************
 // * This file is part of the FreeFileSync project. It is distributed under *
 // * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
-// * Copyright (C) ZenJu (zenju AT gmx DOT de) - All Rights Reserved        *
+// * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved        *
 // **************************************************************************
 
 #ifndef FILE_DROP_H_INCLUDED
diff --git a/wx+/format_unit.cpp b/wx+/format_unit.cpp
deleted file mode 100644
index a2190397..00000000
--- a/wx+/format_unit.cpp
+++ /dev/null
@@ -1,342 +0,0 @@
-// **************************************************************************
-// * This file is part of the FreeFileSync project. It is distributed under *
-// * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
-// * Copyright (C) ZenJu (zenju AT gmx DOT de) - All Rights Reserved        *
-// **************************************************************************
-
-#include "format_unit.h"
-#include <zen/basic_math.h>
-#include <zen/i18n.h>
-#include <zen/time.h>
-#include <cwchar>  //swprintf
-#include <ctime>
-#include <cstdio>
-
-#ifdef FFS_WIN
-#include <zen/win.h> //includes "windows.h"
-#include <zen/win_ver.h>
-
-#elif defined FFS_LINUX
-#include <clocale>    //thousands separator
-#include <zen/utf.h> //
-#endif
-
-using namespace zen;
-
-
-std::wstring zen::filesizeToShortString(Int64 size)
-{
-    //if (size < 0) return _("Error"); -> really? there's at least one exceptional case: a failed rename operation falls-back to copy + delete, reducing "bytes transferred" to potentially < 0!
-
-    if (numeric::abs(size) <= 999)
-        return replaceCpy(_P("1 Byte", "%x Bytes", to<int>(size)),
-                          L"%x",
-                          numberTo<std::wstring>(size));
-    else
-    {
-        double filesize = to<double>(size);
-
-        filesize /= 1024;
-        std::wstring output = _("%x KB");
-        if (numeric::abs(filesize) > 999)
-        {
-            filesize /= 1024;
-            output = _("%x MB");
-            if (numeric::abs(filesize) > 999)
-            {
-                filesize /= 1024;
-                output = _("%x GB");
-                if (numeric::abs(filesize) > 999)
-                {
-                    filesize /= 1024;
-                    output = _("%x TB");
-                    if (numeric::abs(filesize) > 999)
-                    {
-                        filesize /= 1024;
-                        output = _("%x PB");
-                    }
-                }
-            }
-        }
-        //print just three significant digits: 0,01 | 0,11 | 1,11 | 11,1 | 111
-        const size_t fullunits = static_cast<size_t>(numeric::abs(filesize));
-        const int precisionDigits = fullunits < 10 ? 2 : fullunits < 100 ? 1 : 0; //sprintf requires "int"
-
-        wchar_t buffer[50];
-#ifdef __MINGW32__
-        int charsWritten =   ::snwprintf(buffer, 50, L"%.*f", precisionDigits, filesize); //MinGW does not comply to the C standard here
-#else
-        int charsWritten = std::swprintf(buffer, 50, L"%.*f", precisionDigits, filesize);
-#endif
-        return charsWritten > 0 ? replaceCpy(output, L"%x", std::wstring(buffer, charsWritten)) : _("Error");
-    }
-}
-
-
-enum UnitRemTime
-{
-    URT_SEC,
-    URT_MIN,
-    URT_HOUR,
-    URT_DAY
-};
-
-std::wstring zen::remainingTimeToShortString(double timeInSec)
-{
-    double remainingTime = timeInSec;
-
-    //determine preferred unit
-    UnitRemTime unit = URT_SEC;
-    if (remainingTime > 59)
-    {
-        unit = URT_MIN;
-        remainingTime /= 60;
-        if (remainingTime > 59)
-        {
-            unit = URT_HOUR;
-            remainingTime /= 60;
-            if (remainingTime > 23)
-            {
-                unit = URT_DAY;
-                remainingTime /= 24;
-            }
-        }
-    }
-
-    int formattedTime = numeric::round(remainingTime);
-
-    //reduce precision to 5 seconds
-    if (unit == URT_SEC)
-        formattedTime = static_cast<int>(std::ceil(formattedTime / 5.0) * 5);
-
-    //generate output message
-    std::wstring output;
-    switch (unit)
-    {
-        case URT_SEC:
-            output = _P("1 sec", "%x sec", formattedTime);
-            break;
-        case URT_MIN:
-            output = _P("1 min", "%x min", formattedTime);
-            break;
-        case URT_HOUR:
-            output = _P("1 hour", "%x hours", formattedTime);
-            break;
-        case URT_DAY:
-            output = _P("1 day", "%x days", formattedTime);
-            break;
-    }
-    return replaceCpy(output, L"%x", zen::numberTo<std::wstring>(formattedTime));
-}
-
-
-std::wstring zen::fractionToShortString(double fraction)
-{
-    //return replaceCpy(_("%x%"), L"%x", printNumber<std::wstring>(L"%3.2f", fraction * 100.0), false);
-    return printNumber<std::wstring>(L"%3.2f", fraction * 100.0) + L'%'; //no need to internationalize fraction!?
-}
-
-
-#ifdef FFS_WIN
-namespace
-{
-bool getUserSetting(LCTYPE lt, UINT& setting)
-{
-    return ::GetLocaleInfo(LOCALE_USER_DEFAULT,                  //__in   LCID Locale,
-                           lt | LOCALE_RETURN_NUMBER,            //__in   LCTYPE LCType,
-                           reinterpret_cast<LPTSTR>(&setting),   //__out  LPTSTR lpLCData,
-                           sizeof(setting) / sizeof(TCHAR)) > 0; //__in   int cchData
-}
-
-
-bool getUserSetting(LCTYPE lt, std::wstring& setting)
-{
-    int bufferSize = ::GetLocaleInfo(LOCALE_USER_DEFAULT, lt, nullptr, 0);
-    if (bufferSize > 0)
-    {
-        std::vector<wchar_t> buffer(bufferSize);
-        if (::GetLocaleInfo(LOCALE_USER_DEFAULT, //__in   LCID Locale,
-                            lt,                  //__in   LCTYPE LCType,
-                            &buffer[0],          //__out  LPTSTR lpLCData,
-                            bufferSize) > 0)     //__in   int cchData
-        {
-            setting = &buffer[0]; //GetLocaleInfo() returns char count *including* 0-termination!
-            return true;
-        }
-    }
-    return false;
-}
-
-class IntegerFormat
-{
-public:
-    static const NUMBERFMT& get() { return getInst().fmt; }
-    static bool isValid() { return getInst().valid_; }
-
-private:
-    static const IntegerFormat& getInst()
-    {
-        static IntegerFormat inst; //not threadsafe in MSVC until C++11, but not required right now
-        return inst;
-    }
-
-    IntegerFormat() : fmt(), valid_(false)
-    {
-        //all we want is default NUMBERFMT, but set NumDigits to 0
-        fmt.NumDigits = 0;
-
-        //what a disgrace:
-        std::wstring grouping;
-        if (getUserSetting(LOCALE_ILZERO,     fmt.LeadingZero) &&
-            getUserSetting(LOCALE_SGROUPING,  grouping)        &&
-            getUserSetting(LOCALE_SDECIMAL,   decimalSep)      &&
-            getUserSetting(LOCALE_STHOUSAND,  thousandSep)     &&
-            getUserSetting(LOCALE_INEGNUMBER, fmt.NegativeOrder))
-        {
-            fmt.lpDecimalSep  = &decimalSep[0]; //not used
-            fmt.lpThousandSep = &thousandSep[0];
-
-            //convert LOCALE_SGROUPING to Grouping: http://blogs.msdn.com/b/oldnewthing/archive/2006/04/18/578251.aspx
-            replace(grouping, L';', L"");
-            if (endsWith(grouping, L'0'))
-                grouping.resize(grouping.size() - 1);
-            else
-                grouping += L'0';
-            fmt.Grouping = stringTo<UINT>(grouping);
-            valid_ = true;
-        }
-    }
-
-    NUMBERFMT fmt;
-    std::wstring thousandSep;
-    std::wstring decimalSep;
-    bool valid_;
-};
-}
-#endif
-
-
-std::wstring zen::ffs_Impl::includeNumberSeparator(const std::wstring& number)
-{
-#ifdef FFS_WIN
-    if (IntegerFormat::isValid())
-    {
-        int bufferSize = ::GetNumberFormat(LOCALE_USER_DEFAULT, 0, number.c_str(), &IntegerFormat::get(), nullptr, 0);
-        if (bufferSize > 0)
-        {
-            std::vector<wchar_t> buffer(bufferSize);
-            if (::GetNumberFormat(LOCALE_USER_DEFAULT,   //__in       LCID Locale,
-                                  0,                     //__in       DWORD dwFlags,
-                                  number.c_str(),        //__in       LPCTSTR lpValue,
-                                  &IntegerFormat::get(), //__in_opt   const NUMBERFMT *lpFormat,
-                                  &buffer[0],            //__out_opt  LPTSTR lpNumberStr,
-                                  bufferSize) > 0)       //__in       int cchNumber
-                return &buffer[0]; //GetNumberFormat() returns char count *including* 0-termination!
-        }
-    }
-    return number;
-
-#else
-    //we have to include thousands separator ourselves; this doesn't work for all countries (e.g india), but is better than nothing
-
-    //::setlocale (LC_ALL, ""); -> implicitly called by wxLocale
-    const lconv* localInfo = ::localeconv(); //always bound according to doc
-    const std::wstring& thousandSep = utfCvrtTo<std::wstring>(localInfo->thousands_sep);
-
-    // THOUSANDS_SEPARATOR = std::use_facet<std::numpunct<wchar_t> >(std::locale("")).thousands_sep(); - why not working?
-    // DECIMAL_POINT       = std::use_facet<std::numpunct<wchar_t> >(std::locale("")).decimal_point();
-
-    std::wstring output(number);
-    size_t i = output.size();
-    for (;;)
-    {
-        if (i <= 3)
-            break;
-        i -= 3;
-        if (!isDigit(output[i - 1]))
-            break;
-        output.insert(i, thousandSep);
-    }
-    return output;
-#endif
-}
-
-/*
-#include <wx/scrolwin.h>
-
-void zen::scrollToBottom(wxScrolledWindow* scrWindow)
-{
-    int height = 0;
-    scrWindow->GetClientSize(nullptr, &height);
-
-    int pixelPerLine = 0;
-    scrWindow->GetScrollPixelsPerUnit(nullptr, &pixelPerLine);
-
-    if (height > 0 && pixelPerLine > 0)
-    {
-        const int scrollLinesTotal    = scrWindow->GetScrollLines(wxVERTICAL);
-        const int scrollLinesOnScreen = height / pixelPerLine;
-        const int scrollPosBottom     = scrollLinesTotal - scrollLinesOnScreen;
-
-        if (0 <= scrollPosBottom)
-            scrWindow->Scroll(0, scrollPosBottom);
-    }
-}
-*/
-
-#ifdef FFS_WIN
-namespace
-{
-const bool useNewLocalTimeCalculation = zen::vistaOrLater();
-}
-#endif
-
-
-std::wstring zen::utcToLocalTimeString(Int64 utcTime)
-{
-    auto errorMsg = [&] { return _("Error") + L" (time_t: " + numberTo<std::wstring>(utcTime) + L")"; };
-
-#ifdef FFS_WIN
-    FILETIME lastWriteTimeUtc = tofiletime(utcTime); //convert ansi C time to FILETIME
-
-    SYSTEMTIME systemTimeLocal = {};
-
-    if (useNewLocalTimeCalculation) //use DST setting from source date (like in Windows 7, see http://msdn.microsoft.com/en-us/library/ms724277(VS.85).aspx)
-    {
-        SYSTEMTIME systemTimeUtc = {};
-        if (!::FileTimeToSystemTime(&lastWriteTimeUtc, //__in   const FILETIME *lpFileTime,
-                                    &systemTimeUtc))   //__out  LPSYSTEMTIME lpSystemTime
-            return errorMsg();
-
-        if (!::SystemTimeToTzSpecificLocalTime(nullptr,              //__in_opt  LPTIME_ZONE_INFORMATION lpTimeZone,
-                                               &systemTimeUtc,    //__in      LPSYSTEMTIME lpUniversalTime,
-                                               &systemTimeLocal)) //__out     LPSYSTEMTIME lpLocalTime
-            return errorMsg();
-    }
-    else //use DST setting (like in Windows 2000 and XP)
-    {
-        FILETIME fileTimeLocal = {};
-        if (!::FileTimeToLocalFileTime(&lastWriteTimeUtc,  //pointer to UTC file time to convert
-                                       &fileTimeLocal))    //pointer to converted file time
-            return errorMsg();
-
-        if (!::FileTimeToSystemTime(&fileTimeLocal,  //pointer to file time to convert
-                                    &systemTimeLocal)) //pointer to structure to receive system time
-            return errorMsg();
-    }
-
-    zen::TimeComp loc;
-    loc.year   = systemTimeLocal.wYear;
-    loc.month  = systemTimeLocal.wMonth;
-    loc.day    = systemTimeLocal.wDay;
-    loc.hour   = systemTimeLocal.wHour;
-    loc.minute = systemTimeLocal.wMinute;
-    loc.second = systemTimeLocal.wSecond;
-
-#elif defined FFS_LINUX
-    zen::TimeComp loc = zen::localTime(to<time_t>(utcTime));
-#endif
-
-    std::wstring dateString = formatTime<std::wstring>(L"%x  %X", loc);
-    return !dateString.empty() ? dateString : errorMsg();
-}
diff --git a/wx+/format_unit.h b/wx+/format_unit.h
deleted file mode 100644
index 6d29d9a8..00000000
--- a/wx+/format_unit.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// **************************************************************************
-// * This file is part of the FreeFileSync project. It is distributed under *
-// * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
-// * Copyright (C) ZenJu (zenju AT gmx DOT de) - All Rights Reserved        *
-// **************************************************************************
-
-#ifndef UTIL_H_INCLUDED
-#define UTIL_H_INCLUDED
-
-#include <string>
-#include <zen/string_tools.h>
-#include <zen/int64.h>
-
-namespace zen
-{
-std::wstring filesizeToShortString(Int64 filesize);
-std::wstring remainingTimeToShortString(double timeInSec);
-std::wstring fractionToShortString(double fraction); //within [0, 1]
-
-template <class NumberType>
-std::wstring toGuiString(NumberType number); //format integer number including thousands separator
-
-std::wstring utcToLocalTimeString(Int64 utcTime);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-//--------------- inline impelementation -------------------------------------------
-namespace ffs_Impl
-{
-std::wstring includeNumberSeparator(const std::wstring& number);
-}
-
-template <class NumberType> inline
-std::wstring toGuiString(NumberType number)
-{
-    //assert_static(IsInteger<NumberType>::value); -> doesn't work for UInt64
-    return ffs_Impl::includeNumberSeparator(zen::numberTo<std::wstring>(number));
-}
-}
-
-#endif // UTIL_H_INCLUDED
diff --git a/wx+/graph.cpp b/wx+/graph.cpp
index b69173bb..a50f3c34 100644
--- a/wx+/graph.cpp
+++ b/wx+/graph.cpp
@@ -1,7 +1,7 @@
 // **************************************************************************
 // * This file is part of the FreeFileSync project. It is distributed under *
 // * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
-// * Copyright (C) ZenJu (zenju AT gmx DOT de) - All Rights Reserved        *
+// * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved        *
 // **************************************************************************
 
 #include "graph.h"
diff --git a/wx+/graph.h b/wx+/graph.h
index d500dcc0..ddcc1e33 100644
--- a/wx+/graph.h
+++ b/wx+/graph.h
@@ -1,7 +1,7 @@
 // **************************************************************************
 // * This file is part of the FreeFileSync project. It is distributed under *
 // * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
-// * Copyright (C) ZenJu (zenju AT gmx DOT de) - All Rights Reserved        *
+// * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved        *
 // **************************************************************************
 
 #ifndef WX_PLOT_HEADER_2344252459
diff --git a/wx+/grid.cpp b/wx+/grid.cpp
index 5f49b9fa..9f94b7f0 100644
--- a/wx+/grid.cpp
+++ b/wx+/grid.cpp
@@ -1,7 +1,7 @@
 // **************************************************************************
 // * This file is part of the FreeFileSync project. It is distributed under *
 // * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
-// * Copyright (C) ZenJu (zenju AT gmx DOT de) - All Rights Reserved        *
+// * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved        *
 // **************************************************************************
 
 #include "grid.h"
@@ -17,7 +17,7 @@
 #include <zen/string_tools.h>
 #include <zen/scope_guard.h>
 #include <zen/utf.h>
-#include "format_unit.h"
+#include <zen/format_unit.h>
 #include "image_tools.h"
 
 #ifdef FFS_LINUX
diff --git a/wx+/grid.h b/wx+/grid.h
index 448e5486..fd07d2c7 100644
--- a/wx+/grid.h
+++ b/wx+/grid.h
@@ -1,7 +1,7 @@
 // **************************************************************************
 // * This file is part of the FreeFileSync project. It is distributed under *
 // * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
-// * Copyright (C) ZenJu (zenju AT gmx DOT de) - All Rights Reserved        *
+// * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved        *
 // **************************************************************************
 
 #ifndef GENERIC_GRID_HEADER_83470213483173
diff --git a/wx+/image_tools.h b/wx+/image_tools.h
index c5011634..9de93c26 100644
--- a/wx+/image_tools.h
+++ b/wx+/image_tools.h
@@ -1,7 +1,7 @@
 // **************************************************************************
 // * This file is part of the FreeFileSync project. It is distributed under *
 // * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
-// * Copyright (C) ZenJu (zenju AT gmx DOT de) - All Rights Reserved        *
+// * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved        *
 // **************************************************************************
 
 #ifndef IMAGE_TOOLS_HEADER_45782456427634254
@@ -121,7 +121,10 @@ wxBitmap layOver(const wxBitmap& foreground, const wxBitmap& background)
     {
         wxMemoryDC dc;
         dc.SelectObject(output);
-        dc.DrawBitmap(foreground, 0, 0, true);
+
+        const int offsetX = (background.GetWidth () - foreground.GetWidth ()) / 2;
+        const int offsetY = (background.GetHeight() - foreground.GetHeight()) / 2;
+        dc.DrawBitmap(foreground, offsetX, offsetY, true);
         dc.SelectObject(wxNullBitmap);
     }
     return output;
diff --git a/wx+/mouse_move_dlg.cpp b/wx+/mouse_move_dlg.cpp
index 72e464d6..e64e5da1 100644
--- a/wx+/mouse_move_dlg.cpp
+++ b/wx+/mouse_move_dlg.cpp
@@ -1,7 +1,7 @@
 // **************************************************************************
 // * This file is part of the FreeFileSync project. It is distributed under *
 // * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
-// * Copyright (C) ZenJu (zenju AT gmx DOT de) - All Rights Reserved        *
+// * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved        *
 // **************************************************************************
 
 #include "mouse_move_dlg.h"
diff --git a/wx+/mouse_move_dlg.h b/wx+/mouse_move_dlg.h
index 29e62cd9..18cd38d6 100644
--- a/wx+/mouse_move_dlg.h
+++ b/wx+/mouse_move_dlg.h
@@ -1,7 +1,7 @@
 // **************************************************************************
 // * This file is part of the FreeFileSync project. It is distributed under *
 // * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
-// * Copyright (C) ZenJu (zenju AT gmx DOT de) - All Rights Reserved        *
+// * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved        *
 // **************************************************************************
 
 #ifndef MOUSEMOVEWINDOW_H_INCLUDED
diff --git a/wx+/no_flicker.h b/wx+/no_flicker.h
index d96e0134..fb315de0 100644
--- a/wx+/no_flicker.h
+++ b/wx+/no_flicker.h
@@ -1,7 +1,7 @@
 // **************************************************************************
 // * This file is part of the FreeFileSync project. It is distributed under *
 // * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
-// * Copyright (C) ZenJu (zenju AT gmx DOT de) - All Rights Reserved        *
+// * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved        *
 // **************************************************************************
 
 #ifndef NO_FLICKER_HEADER_893421590321532
diff --git a/wx+/pch.h b/wx+/pch.h
index ff014056..b27cc656 100644
--- a/wx+/pch.h
+++ b/wx+/pch.h
@@ -1,7 +1,7 @@
 // **************************************************************************
 // * This file is part of the FreeFileSync project. It is distributed under *
 // * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
-// * Copyright (C) ZenJu (zenju AT gmx DOT de) - All Rights Reserved        *
+// * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved        *
 // **************************************************************************
 
 #ifndef FFS_PRECOMPILED_HEADER
diff --git a/wx+/rtl.h b/wx+/rtl.h
index eff05823..f89bb86e 100644
--- a/wx+/rtl.h
+++ b/wx+/rtl.h
@@ -1,7 +1,7 @@
 // **************************************************************************
 // * This file is part of the FreeFileSync project. It is distributed under *
 // * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
-// * Copyright (C) ZenJu (zenju AT gmx DOT de) - All Rights Reserved        *
+// * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved        *
 // **************************************************************************
 
 #ifndef RTL_H_0183487180058718273432148
diff --git a/wx+/shell_execute.h b/wx+/shell_execute.h
index 62b6ab41..6a2920e9 100644
--- a/wx+/shell_execute.h
+++ b/wx+/shell_execute.h
@@ -1,7 +1,7 @@
 // **************************************************************************
 // * This file is part of the FreeFileSync project. It is distributed under *
 // * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
-// * Copyright (C) ZenJu (zenju AT gmx DOT de) - All Rights Reserved        *
+// * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved        *
 // **************************************************************************
 
 #ifndef EXECUTE_HEADER_23482134578134134
diff --git a/wx+/string_conv.h b/wx+/string_conv.h
index 815cf881..b919a3ee 100644
--- a/wx+/string_conv.h
+++ b/wx+/string_conv.h
@@ -1,7 +1,7 @@
 // **************************************************************************
 // * This file is part of the FreeFileSync project. It is distributed under *
 // * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
-// * Copyright (C) ZenJu (zenju AT gmx DOT de) - All Rights Reserved        *
+// * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved        *
 // **************************************************************************
 
 #ifndef STRINGCONV_H_INCLUDED
diff --git a/wx+/timespan.h b/wx+/timespan.h
index 56f0a2db..28c9e673 100644
--- a/wx+/timespan.h
+++ b/wx+/timespan.h
@@ -1,7 +1,7 @@
 // **************************************************************************
 // * This file is part of the FreeFileSync project. It is distributed under *
 // * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
-// * Copyright (C) ZenJu (zenju AT gmx DOT de) - All Rights Reserved        *
+// * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved        *
 // **************************************************************************
 
 #ifndef WX_TIMESPAN_CTRL_HEADER_INCLUDED
diff --git a/wx+/toggle_button.h b/wx+/toggle_button.h
index d213e024..666f291d 100644
--- a/wx+/toggle_button.h
+++ b/wx+/toggle_button.h
@@ -1,7 +1,7 @@
 // **************************************************************************
 // * This file is part of the FreeFileSync project. It is distributed under *
 // * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
-// * Copyright (C) ZenJu (zenju AT gmx DOT de) - All Rights Reserved        *
+// * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved        *
 // **************************************************************************
 
 #ifndef TOGGLEBUTTON_H_INCLUDED
diff --git a/wx+/tooltip.cpp b/wx+/tooltip.cpp
index fdb62618..447cbb1f 100644
--- a/wx+/tooltip.cpp
+++ b/wx+/tooltip.cpp
@@ -1,7 +1,7 @@
 // **************************************************************************
 // * This file is part of the FreeFileSync project. It is distributed under *
 // * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
-// * Copyright (C) ZenJu (zenju AT gmx DOT de) - All Rights Reserved        *
+// * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved        *
 // **************************************************************************
 
 #include "tooltip.h"
diff --git a/wx+/tooltip.h b/wx+/tooltip.h
index 127ad86c..9060c127 100644
--- a/wx+/tooltip.h
+++ b/wx+/tooltip.h
@@ -1,7 +1,7 @@
 // **************************************************************************
 // * This file is part of the FreeFileSync project. It is distributed under *
 // * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
-// * Copyright (C) ZenJu (zenju AT gmx DOT de) - All Rights Reserved        *
+// * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved        *
 // **************************************************************************
 
 #ifndef CUSTOMTOOLTIP_H_INCLUDED
diff --git a/wx+/zlib_wrap.cpp b/wx+/zlib_wrap.cpp
index fa0c54f0..6fad0383 100644
--- a/wx+/zlib_wrap.cpp
+++ b/wx+/zlib_wrap.cpp
@@ -1,7 +1,7 @@
 // **************************************************************************
 // * This file is part of the FreeFileSync project. It is distributed under *
 // * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
-// * Copyright (C) ZenJu (zenju AT gmx DOT de) - All Rights Reserved        *
+// * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved        *
 // **************************************************************************
 
 #include "zlib_wrap.h"
diff --git a/wx+/zlib_wrap.h b/wx+/zlib_wrap.h
index 9fa50240..7c805e23 100644
--- a/wx+/zlib_wrap.h
+++ b/wx+/zlib_wrap.h
@@ -1,7 +1,7 @@
 // **************************************************************************
 // * This file is part of the FreeFileSync project. It is distributed under *
 // * GNU General Public License: http://www.gnu.org/licenses/gpl.html       *
-// * Copyright (C) ZenJu (zenju AT gmx DOT de) - All Rights Reserved        *
+// * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved        *
 // **************************************************************************
 
 #ifndef SIMPLE_H_INCLUDED_18134135134135345489