From 3e4f5ad35f23e966561e1e6c11bba6875fc5a178 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sun, 1 Mar 2015 12:22:31 +0100 Subject: [PATCH] Reformat author information in about dialog and add Yue Lin Ho Signed-off-by: Sven Strickroth --- Languages/Tortoise.pot | 20 ++++---------------- src/Resources/TortoiseProcENG.rc | 8 +++----- src/TortoiseProc/AboutDlg.cpp | 3 +++ src/TortoiseProc/resource.h | 3 ++- 4 files changed, 12 insertions(+), 22 deletions(-) diff --git a/Languages/Tortoise.pot b/Languages/Tortoise.pot index 42c2682eb..39e36626d 100644 --- a/Languages/Tortoise.pot +++ b/Languages/Tortoise.pot @@ -2014,10 +2014,6 @@ msgid "Authors case sensitive" msgstr "" #. Resource IDs: (65535) -msgid "Authors:" -msgstr "" - -#. Resource IDs: (65535) msgid "Authors:\tFrank Li (lznuaa@gmail.com),\n\t\tSven Strickroth (email@cs-ware.de)" msgstr "" @@ -3322,10 +3318,6 @@ msgstr "" msgid "Credentials" msgstr "" -#. Resource IDs: (65535) -msgid "Credits:" -msgstr "" - #. Resource IDs: (1253) msgid "Cu&t" msgstr "" @@ -4688,10 +4680,6 @@ msgstr "" msgid "Found auto words:" msgstr "" -#. Resource IDs: (65535) -msgid "Frank Li (lznuaa@gmail.com), Sven Strickroth " -msgstr "" - #. Resource IDs: (1385, 1522, 65535) msgid "From" msgstr "" @@ -8633,6 +8621,10 @@ msgstr "" msgid "Si&gn" msgstr "" +#. Resource IDs: (65535) +msgid "Significant contributions by: (see Git repository for a complete list)" +msgstr "" + #. Resource IDs: (156, 626) msgid "Silver Style" msgstr "" @@ -8911,10 +8903,6 @@ msgstr "" msgid "Success" msgstr "" -#. Resource IDs: (65535) -msgid "Sup Yut Sum , Colin Law , Myagi , Johan 't Hart , Laszlo Papp " -msgstr "" - #. Resource IDs: (78) msgid "Switch" msgstr "" diff --git a/src/Resources/TortoiseProcENG.rc b/src/Resources/TortoiseProcENG.rc index c58bde8f7..527b1e9d4 100644 --- a/src/Resources/TortoiseProcENG.rc +++ b/src/Resources/TortoiseProcENG.rc @@ -154,17 +154,15 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM CAPTION "About TortoiseGit" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Authors:",IDC_STATIC,13,81,54,8 - LTEXT "Frank Li (lznuaa@gmail.com), Sven Strickroth ",IDC_STATIC,60,81,258,8 - LTEXT "Credits:",IDC_STATIC,14,94,54,8 - LTEXT "Sup Yut Sum , Colin Law , Myagi , Johan 't Hart , Laszlo Papp ",IDC_STATIC,61,92,258,33 + LTEXT "Significant contributions by: (see Git repository for a complete list)",IDC_STATIC,13,81,307,8 + LTEXT "",IDC_STATIC_AUTHORS,13,92,307,40 LTEXT "Visit our website",IDC_WEBLINK,14,153,312,8 LTEXT "and support the developers",IDC_SUPPORTLINK,14,165,312,8 GROUPBOX "Version Information",IDC_VERSIONBOX,7,187,319,50 EDITTEXT IDC_VERSIONABOUT,14,199,304,35,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER PUSHBUTTON "Check For Updates...",IDC_UPDATE,7,244,110,14 DEFPUSHBUTTON "OK",IDOK,276,244,50,14 - LTEXT "based on TortoiseSVN (http://www.tortoisesvn.net/)",IDC_STATIC,13,71,114,8 + LTEXT "based on TortoiseSVN (http://www.tortoisesvn.net/)",IDC_STATIC,13,71,310,8 END IDD_ADD DIALOGEX 0, 0, 244, 154 diff --git a/src/TortoiseProc/AboutDlg.cpp b/src/TortoiseProc/AboutDlg.cpp index d18696b4c..360a7135a 100644 --- a/src/TortoiseProc/AboutDlg.cpp +++ b/src/TortoiseProc/AboutDlg.cpp @@ -97,6 +97,9 @@ BOOL CAboutDlg::OnInitDialog() this->SetWindowText(_T("TortoiseGit")); + // we can only put up to 256 chars into the resource file, so fill it here with the full list + SetDlgItemText(IDC_STATIC_AUTHORS, L"Sven Strickroth (Current Maintainer), Sup Yut Sum , Frank Li (Founder), Yue Lin Ho , Colin Law , Myagi , Johan 't Hart , Laszlo Papp "); + CPictureHolder tmpPic; tmpPic.CreateFromBitmap(IDB_LOGOFLIPPED); m_renderSrc.Create32BitFromPicture(&tmpPic,468,64); diff --git a/src/TortoiseProc/resource.h b/src/TortoiseProc/resource.h index ab5dfe590..6ee4e8582 100644 --- a/src/TortoiseProc/resource.h +++ b/src/TortoiseProc/resource.h @@ -1546,6 +1546,7 @@ #define IDC_BUTTON_UPDATE3 1826 #define IDC_REBASE_SPLIT_COMMIT 1827 #define IDC_BUTTON_ONTO 1828 +#define IDC_STATIC_AUTHORS 1829 #define IDS_LOG_FILTER_BY 1850 #define IDS_LOG_FILTER_PATHS 1851 #define IDS_LOG_FILTER_AUTHORS 1852 @@ -2003,7 +2004,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 358 #define _APS_NEXT_COMMAND_VALUE 32874 -#define _APS_NEXT_CONTROL_VALUE 1829 +#define _APS_NEXT_CONTROL_VALUE 1830 #define _APS_NEXT_SYMED_VALUE 201 #endif #endif -- 2.11.4.GIT