From ded5602f75fd9453c1b2beb5078753dc48d9a139 Mon Sep 17 00:00:00 2001 From: LoRd_MuldeR Date: Sat, 26 Oct 2019 11:45:48 +0200 Subject: [PATCH] Some improvements and updates to "About" dialog. --- src/Config.h | 2 +- src/Dialog_About.cpp | 47 ++++++++++++++++++++++++++--------------------- 2 files changed, 27 insertions(+), 22 deletions(-) diff --git a/src/Config.h b/src/Config.h index 91e5923c..a835682d 100644 --- a/src/Config.h +++ b/src/Config.h @@ -35,7 +35,7 @@ #define VER_LAMEXP_MINOR_LO 8 #define VER_LAMEXP_TYPE Beta #define VER_LAMEXP_PATCH 7 -#define VER_LAMEXP_BUILD 2232 +#define VER_LAMEXP_BUILD 2233 #define VER_LAMEXP_CONFG 2188 /////////////////////////////////////////////////////////////////////////////// diff --git a/src/Dialog_About.cpp b/src/Dialog_About.cpp index d7b4a0a3..c8fc4585 100644 --- a/src/Dialog_About.cpp +++ b/src/Dialog_About.cpp @@ -74,7 +74,7 @@ static const struct char *pcFlag; wchar_t *pcLanguage; wchar_t *pcName; - char *pcMail; + char *pcContactAddr; } g_lamexp_translators[] = { @@ -87,7 +87,7 @@ g_lamexp_translators[] = {"hu", L"Magyarul", L"ZityiSoft Team", "zityisoft@gmail.com" }, {"it", L"Italiano", L"Roberto", "Gulliver_69@libero.it" }, {"", L"", L"Gianluca Papi", "johnnyb.goode68@gmail.com"}, - {"ja", L"日本語", L"Maboroshin", "maboroshin@pc.genkaku.in" }, + {"ja", L"日本語", L"Maboroshin", "pc.genkaku.in" }, {"kr", L"한국어", L"JaeHyung Lee", "Kolanp@gmail.com" }, {"pl", L"Polski", L"Sir Daniel K", "Sir.Daniel.K@gmail.com" }, {"ru", L"Русский", L"Neonailol", "Neonailol@gmail.com" }, @@ -108,16 +108,18 @@ static const struct } g_lamexp_specialThanks[] = { - { "Doom9's Forum", "http://forum.doom9.org/" }, - { "Gleitz | German Doom9", "http://forum.gleitz.info/" }, - { "Hydrogenaudio Forums", "http://www.hydrogenaudio.org/" }, - { "RareWares", "http://www.rarewares.org/" }, - { "GitHub", "http://github.com/" }, - { "SourceForge", "http://sourceforge.net/" }, - { "Qt Developer Network", "https://www.qt.io/developers/" }, - { "CodePlex", "http://www.codeplex.com/" }, - { "Marius Hudea", "http://savedonthe.net/" }, - { "Codecs.com", "http://www.codecs.com/" }, + { "Doom9's Forum", "http://forum.doom9.org/" }, + { "Gleitz | German Doom9", "http://forum.gleitz.info/" }, + { "Portable Freeware", "http://www.portablefreeware.com/" }, + { "Hydrogenaudio Forums", "http://www.hydrogenaudio.org/" }, + { "RareWares", "http://www.rarewares.org/" }, + { "GitHub", "http://github.com/" }, + { "SourceForge", "http://sourceforge.net/" }, + { "OSDN.net", "http://osdn.net/" }, + { "Marius Hudea", "http://savedonthe.net/" }, + { "Qt Developer Network", "http://www.qt.io/developers/" }, + { "Codecs.com", "http://www.codecs.com/" }, + { "VideoHelp", "http://www.videohelp.com/" }, { NULL, NULL } }; @@ -129,12 +131,13 @@ static const struct } g_lamexp_mirrors[] = { - { "GitHub.com", "https://github.com/lordmulder/LameXP" }, - { "SourceForge.net", "http://sourceforge.net/p/lamexp/code/" }, - { "Bitbucket.org", "https://bitbucket.org/muldersoft/lamexp" }, - { "GitLab.com" , "https://gitlab.com/lamexp/lamexp" }, - { "Codeplex.com", "https://lamexp.codeplex.com/SourceControl/latest" }, - { "Assembla.com", "https://www.assembla.com/spaces/lamexp/" }, + { "GitHub.com", "https://github.com/lordmulder/LameXP" }, + { "SourceForge.net", "http://sourceforge.net/p/lamexp/code/" }, + { "OSDN.net", "https://osdn.net/projects/lamexp/scm/git/LameXP/" }, + { "Bitbucket.org", "https://bitbucket.org/muldersoft/lamexp" }, + { "GitLab.com" , "https://gitlab.com/lamexp/lamexp" }, + { "Assembla.com", "https://www.assembla.com/spaces/lamexp/" }, + { "repo.or.cz", "https://repo.or.cz/w/LameXP.git" }, { NULL, NULL } }; @@ -632,16 +635,18 @@ void AboutDialog::initContributorsTab(void) QString icon = QString("").arg("user_gray"); contributorsAboutText += QString("%1%2").arg(icon, spaces); contributorsAboutText += QString("%1%2").arg(tr("Project Leader"), spaces); - contributorsAboutText += QString("%1%2<%3>").arg("LoRd_MuldeR", spaces, "MuldeR2@GMX.de"); + contributorsAboutText += QString("%1%2<%3>").arg(L1S("LoRd_MuldeR"), spaces, L1S("MuldeR2@GMX.de")); contributorsAboutText += QString(" "); contributorsAboutText += QString("%1%2").arg(tr("Translators:"), extraVSpace); for(int i = 0; g_lamexp_translators[i].pcName; i++) { - QString flagIcon = (strlen(g_lamexp_translators[i].pcFlag) > 0) ? QString("").arg(g_lamexp_translators[i].pcFlag) : QString(); + const QString flagIcon = (strlen(g_lamexp_translators[i].pcFlag) > 0) ? QString("").arg(QString::fromLatin1(g_lamexp_translators[i].pcFlag)) : QString(); + const QString contactAddr = QString::fromLatin1(g_lamexp_translators[i].pcContactAddr); + const QString linkUrl = QString(contactAddr.contains('@') ? "mailto:%1?subject=LameXP" : "http://%1").arg(contactAddr); contributorsAboutText += QString("%1%2").arg(flagIcon, spaces); contributorsAboutText += QString("%1%2").arg(MUTILS_QSTR(g_lamexp_translators[i].pcLanguage), spaces); - contributorsAboutText += QString("%1%2<%3>").arg(MUTILS_QSTR(g_lamexp_translators[i].pcName), spaces, g_lamexp_translators[i].pcMail); + contributorsAboutText += QString("%1%2<%4>").arg(MUTILS_QSTR(g_lamexp_translators[i].pcName), spaces, linkUrl, contactAddr); } contributorsAboutText += QString(" "); -- 2.11.0