Assembling the attribution strings dynamically ... can probably be further improved

4 files changed, 216 insertions, 8 deletions

diff --git a/common/common_rsrcstr.h b/common/common_rsrcstr.h
index 0a6c547..dec2eac 100644
--- a/common/common_rsrcstr.h
+++ b/common/common_rsrcstr.h
@@ -31,7 +31,7 @@
 #define IDSS_TRANSLATORS        L"<list too long>"
 
 // Version of resource DLL
-#define IDSS_RESOURCEDLL        "Resource Version 4"
+#define IDSS_RESOURCEDLL        "Resource Version 5"
 // Version information in feedback always appears in English
 #define IDSS_FROMsPLATFORMs     "From: %1!s!. Platform: %2!s!.\r\n\r\n"
 #define IDSS_SEV_CRITICAL       "Critical Bug"
diff --git a/common/wds_constants.cpp b/common/wds_constants.cpp
new file mode 100644
index 0000000..9f372e7
--- /dev/null
+++ b/common/wds_constants.cpp
@@ -0,0 +1,181 @@
+// wds_constants.cpp
+//
+// WinDirStat - Directory Statistics
+// Copyright (C) 2014 Oliver Schneider (assarbad.net)
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// Author(s): - assarbad -> http://windirstat.info/contact/oliver/
+//
+
+#include "stdafx.h"
+#include "wds_constants.h"
+
+namespace wds
+{
+    demangle_t translator_demangle_email[] =
+    {
+        { L'/', L'-' },
+        { L'*', L'.' },
+        { L'#', L'\x0040' },
+        { 0, 0 },
+    };
+
+    contact_t authors[] =
+    {
+        { L"Bernhard Seifert", 0, L"https://windirstat.info/contact/bernhard/", L"Creator of the project, original author" },
+        { L"Oliver Schneider", 0, L"https://windirstat.info/contact/oliver/", L"Project maintainer" },
+        { L"Chris Wimmer", 0, L"http://sourceforge.net/users/dezipaitor", L"Contributor" },
+        { 0 },
+    };
+
+    translator_t translators[] =
+    {
+        {
+            MAKELANGID(LANG_CZECH, SUBLANG_CZECH_CZECH_REPUBLIC),
+            L"\x010Ce\x0161tina",
+            L"Czech",
+            L"cs",
+            {
+                { L"'TomR'", L"tomr#horses/online*cz", 0, 0 },
+                { 0 },
+            },
+        },
+        {
+            MAKELANGID(LANG_GERMAN, SUBLANG_GERMAN),
+            L"Deutsch",
+            L"German",
+            L"de-DE",
+            {
+                { L"WDS team", 0, 0, 0 },
+                { 0 },
+            },
+        },
+        {
+            MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US),
+            L"English",
+            L"English",
+            L"en-US",
+            {
+                { L"WDS team", 0, 0, 0 },
+                { 0 },
+            },
+        },
+        {
+            MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH),
+            L"Espa\x00F1ol",
+            L"Spanish",
+            L"es",
+            {
+                { L"Sergio Omar Maurelli", L"sergiomaurelli#hotmail*com", 0, 0 },
+                { 0 },
+            },
+        },
+        {
+            MAKELANGID(LANG_FINNISH, SUBLANG_FINNISH_FINLAND),
+            L"Suomi",
+            L"Finnish",
+            L"fi",
+            {
+                { L"Markus Hietaranta", L"markus*hietaranta#gmail*com", 0, 0 },
+                { 0 },
+            },
+        },
+        {
+            MAKELANGID(LANG_FRENCH, SUBLANG_FRENCH),
+            L"Fran\x00E7ais",
+            L"French",
+            L"fr",
+            {
+                { L"Pascal Delrot", L"tigroo#users*sourceforge*net", 0, 0 },
+                { L"'UltraSam'", L"sam*fd#wanadoo*fr", 0 },
+                { 0 },
+            },
+        },
+        {
+            MAKELANGID(LANG_HUNGARIAN, SUBLANG_HUNGARIAN_HUNGARY),
+            L"Magyar",
+            L"Hungarian",
+            L"hu",
+            {
+                { L"'Leonard Nimoy'", L"sorge#freemail*hu", 0, 0 },
+                { 0 },
+            },
+        },
+        {
+            MAKELANGID(LANG_ITALIAN, SUBLANG_ITALIAN),
+            L"Italiano",
+            L"Italian",
+            L"it",
+            {
+                { L"Maria Antonietta Ricagno", L"ricagno#antotranslation*com", L"http://www.antotranslation.com", 0 },
+                { 0 },
+            },
+        },
+        {
+            MAKELANGID(LANG_DUTCH, SUBLANG_DUTCH),
+            L"Nederlands",
+            L"Dutch (Netherlands)",
+            L"nl",
+            {
+                { L"Gerben Wieringa", L"gerbenwieringa#gmail*com", 0, 0 },
+                { 0 },
+            },
+        },
+        {
+            MAKELANGID(LANG_POLISH, SUBLANG_POLISH_POLAND),
+            L"Polski",
+            L"Polish",
+            L"pl",
+            {
+                { L"Dariusz Ma\x0142" L"achowski", L"d_malachowski#pf*pl", 0, 0 },
+                { 0 },
+            },
+        },
+        {
+            MAKELANGID(LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN),
+            L"Portugu\x00EAs do Brasil",
+            L"Portuguese (Brazil)",
+            L"pt-BR",
+            {
+                { L"Eliezer Riani de Andrade", L"eliezer#rilaser*com*br", 0, 0 },
+                { 0 },
+            },
+        },
+        {
+            MAKELANGID(LANG_RUSSIAN, SUBLANG_RUSSIAN_RUSSIA),
+            L"\x0420\x0443\x0441\x0441\x043A\x0438\x0439",
+            L"Russian",
+            L"ru",
+            {
+                { L"Sergiy '\x041F\x043E\x043B\x0451\x0442' Polyetayev", L"s_polyetayev#hotmail*com", 0, 0 },
+                { 0 },
+            },
+        },
+        {
+            MAKELANGID(LANG_ESTONIAN, SUBLANG_ESTONIAN_ESTONIA),
+            L"Eesti",
+            L"Estonian",
+            L"et",
+            {
+                { L"'Logard'", 0, 0 },
+                { 0 },
+            },
+        },
+        {
+            0 /* end marker */
+        },
+    };
+}
diff --git a/common/wds_constants.h b/common/wds_constants.h
index da28c80..47ff49a 100644
--- a/common/wds_constants.h
+++ b/common/wds_constants.h
@@ -2,7 +2,7 @@
 //
 // WinDirStat - Directory Statistics
 // Copyright (C) 2003-2005 Bernhard Seifert
-// Copyright (C) 2004-2006, 2008 Oliver Schneider (assarbad.net)
+// Copyright (C) 2004-2014 Oliver Schneider (assarbad.net)
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -22,12 +22,39 @@
 //            - assarbad -> http://windirstat.info/contact/oliver/
 //
 
-#ifndef __WDS_CONSTANTS_H__
-#define __WDS_CONSTANTS_H__
+#ifndef __WDS_CONSTANTS_H_VER__
+#define __WDS_CONSTANTS_H_VER__ 2014021723
+#if (defined(_MSC_VER) && (_MSC_VER >= 1020)) || defined(__MCPP)
 #pragma once
+#endif // Check for "#pragma once" support
 
 namespace wds
 {
+    const size_t maxContacts = 5;
+    typedef struct _demangle_t
+    {
+        WCHAR from;
+        WCHAR to;
+    } demangle_t;
+    typedef struct _contact_t
+    {
+        LPWSTR name;
+        LPWSTR mail;
+        LPWSTR weburl;
+        LPWSTR description;
+    } contact_t;
+    typedef struct _translator_t
+    {
+        LCID   id;
+        LPWSTR lngNative;
+        LPWSTR lngEnglish;
+        LPWSTR lngISO639_1;
+        contact_t translators[maxContacts];
+    } translator_t;
+    extern translator_t translators[];
+    extern contact_t authors[];
+    extern demangle_t translator_demangle_email[];
+
     // Single character constants
     const TCHAR chrSharp = _T('#');
     const TCHAR chrBracketOpen = _T('(');
@@ -35,7 +62,7 @@ namespace wds
     const TCHAR chrComma = _T(',');
     const TCHAR chrDot = _T('.');
     const TCHAR chrColon = _T(':');
-    const TCHAR chrAt = _T('@');
+    const TCHAR chrAt = _T('\x40');
     const TCHAR chrBackslash = _T('\\');
     const TCHAR chrPipe = _T('|');
     const TCHAR chrZero = _T('0');
@@ -76,4 +103,4 @@ namespace wds
     const int iNumDriveLetters = (chrCapZ - chrCapA) + 1;
 }
 
-#endif // __WDS_CONSTANTS_H__
+#endif // __WDS_CONSTANTS_H_VER__
diff --git a/windirstat/windirstat.rc b/windirstat/windirstat.rc
index 2ba343d..f9ec224 100644
--- a/windirstat/windirstat.rc
+++ b/windirstat/windirstat.rc
@@ -632,7 +632,7 @@ END
 
 STRINGTABLE 
 BEGIN
-    IDS_ABOUT_ABOUTTEXTss   "\r\nWinDirStat - Directory Statistics\r\n\r\n""Shows where all your disk space has gone\r\nand helps you clean it up.""\r\n\r\nRe-programmed for MS Windows by\r\nBernhard Seifert (mailto:%1!s!),\r\n\r\nbased on Stefan Hundhammer's KDE (Linux) program KDirStat\r\n(http://kdirstat.sourceforge.net/).\r\n\r\nWinDirStat's home is http://%2!s!/\r\n\r\nCopyright (c) 2003-2005 The authors of WinDirStat"
+    IDS_ABOUT_ABOUTTEXTss   "\r\nWinDirStat - Directory Statistics\r\n\r\n""Shows where all your disk space has gone\r\nand helps you clean it up.""\r\n\r\nRe-programmed for MS Windows by\r\nBernhard Seifert (mailto:%1!s!),\r\n\r\nbased on Stefan Hundhammer's KDE (Linux) program KDirStat\r\n(http://kdirstat.sourceforge.net/).\r\n\r\nWinDirStat's home is http://%2!s!/\r\n\r\nCopyright (c) 2003-2014 The authors of WinDirStat"
     IDS_ABOUT_THANKSTOTEXT  "\r\nStefan Hundhammer for his superb Linux tool KDirStat.\r\nUsing KDirStat (2.3.7) as a specification saved me a lot of time.\r\nhttp://kdirstat.sourceforge.net/\r\n\r\nThe authors of SequoiaView for showing just how useful treemaps really can be.\r\nhttp://www.win.tue.nl/sequoiaview/\r\n\r\nJarke J. van Wijk, Huub van de Wetering, Mark Bruls and Kees Huizing\r\nfor their papers about cushion treemaps and squarified treemaps.\r\nhttp://www.win.tue.nl/~vanwijk/\r\n\r\nBen Shneiderman for his ingenious idea of treemaps -\r\na truly intuitive way of visualizing tree contents.\r\nhttp://www.cs.umd.edu/hcil/treemap-history/\r\n\r\nMy colleagues for their feedback on the early releases of WinDirStat.\r\nhttp://www.daccord.net/\r\n\r\nBeatrix Lödige and Nick Lines for beta testing.\r\n"
     IDS_ABOUT_ABOUT         "About"
     IDS_ABOUT_THANKSTO      "Thanks To"
@@ -651,7 +651,7 @@ BEGIN
     IDS_CREATEPROCESSsFAILEDs "CreateProcess(%1!s!) failed: %2!s!"
     IDS_LANGUAGERESTARTNOW  "Language changes take not effect until the application is restarted.\r\n\r\nRestart WinDirStat now?"
     IDS_ABOUT_AUTHORS       "Authors"
-    IDS_ABOUT_AUTHORSTEXTs  "=== Programmers ===\r\n\r\nBernhard Seifert\r\nCreator of the project and coordinator\r\n(mailto:%1!s!)\r\n\r\nOliver Schneider\r\n(mailto:assarbad#users.sourceforge.net)\r\n\r\n\r\n=== Translators ===\r\n\r\n"
+    IDS_ABOUT_AUTHORSTEXTs  "=== Programmers ===\r\n\r\n%1!s!\r\n\r\n\r\n=== Translators ===\r\n\r\n"
 END
 
 STRINGTABLE