From 9c81eda65e07c260f2b988db0c8b8fa1dd2c29ed Mon Sep 17 00:00:00 2001 From: PatrickvL Date: Fri, 11 Oct 2019 17:22:25 +0200 Subject: [PATCH] Make resource file language-neutral, so that Visual Studio won't complain when regional settings aren't compatible. (See https://stackoverflow.com/a/58011025/12170) Also applied the advisory steps from our GPL license to our About dialog, and trimmed this advise from COPYING itself. --- COPYING | 61 -------------------------------------------- resource/Cxbx.rc | 39 ++++------------------------ src/gui/DlgAbout.cpp | 5 +++- 3 files changed, 9 insertions(+), 96 deletions(-) diff --git a/COPYING b/COPYING index b8306825e..960fe7469 100644 --- a/COPYING +++ b/COPYING @@ -278,64 +278,3 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - 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 - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. - diff --git a/resource/Cxbx.rc b/resource/Cxbx.rc index 3bcebfd55..5f6af33b0 100644 --- a/resource/Cxbx.rc +++ b/resource/Cxbx.rc @@ -13,11 +13,11 @@ #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// English (United States) resources +// Language neutral resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL +#pragma code_page(65001) ///////////////////////////////////////////////////////////////////////////// // @@ -661,36 +661,6 @@ BEGIN MENUITEM " ", ID_LOG,MFT_STRING,MFS_ENABLED END -#endif // English (United States) resources -///////////////////////////////////////////////////////////////////////////// - - -///////////////////////////////////////////////////////////////////////////// -// English (United Kingdom) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK -#pragma code_page(1252) - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO -BEGIN - IDD_ABOUT, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 303 - TOPMARGIN, 7 - BOTTOMMARGIN, 170 - END -END -#endif // APSTUDIO_INVOKED - - ///////////////////////////////////////////////////////////////////////////// // // Dialog @@ -725,7 +695,8 @@ IDR_CONTRIBUTORS TXT "..\\CONTRIBUTORS" IDR_COPYING TXT "..\\COPYING" -#endif // English (United Kingdom) resources +#endif // Language neutral resources + ///////////////////////////////////////////////////////////////////////////// diff --git a/src/gui/DlgAbout.cpp b/src/gui/DlgAbout.cpp index a0e3def65..8ea02205c 100644 --- a/src/gui/DlgAbout.cpp +++ b/src/gui/DlgAbout.cpp @@ -81,7 +81,10 @@ INT_PTR CALLBACK DlgAboutProc(HWND hWndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa SendMessage(GetDlgItem(hWndDlg, IDC_TAB1), TCM_ADJUSTRECT, FALSE, (LPARAM)&tabRect); // Tab Pane 1 HWND tab = CreateWindowEx - (NULL, "STATIC", "\nCxbx-Reloaded\nVersion " _CXBX_VERSION "\nŠ The Cxbx-Reloaded Team", + (NULL, "STATIC", "\nCxbx-Reloaded\nVersion " _CXBX_VERSION "\nŠ The Cxbx-Reloaded Team" + "\nThis software comes with ABSOLUTELY NO WARRANTY." + "\nThis is free software, and you are welcome to redistribute it" + "\nunder certain conditions; See our website for details.", WS_CHILD | WS_VISIBLE, tabRect.left + 10, tabRect.top + 10, tabRect.right - tabRect.left,