From: Eric Kohl Date: Sat, 22 Sep 2007 09:09:57 +0000 (+0000) Subject: Don't use hardcoded strings in the configuration message box. Use string resources... X-Git-Tag: backups/win32k-stable@33466~273 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=1c85a28f50b37219ea61279fc33f05429a1255ad Don't use hardcoded strings in the configuration message box. Use string resources instead. svn path=/trunk/; revision=29135 --- diff --git a/reactos/base/applications/screensavers/scrnsave/lang/en-US.rc b/reactos/base/applications/screensavers/scrnsave/lang/en-US.rc new file mode 100644 index 00000000000..a9bbcb823f6 --- /dev/null +++ b/reactos/base/applications/screensavers/scrnsave/lang/en-US.rc @@ -0,0 +1,8 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Default ScreenSaver" + IDS_TITLE "About" + IDS_TEXT "No options need to be set." +END diff --git a/reactos/base/applications/screensavers/scrnsave/resource.h b/reactos/base/applications/screensavers/scrnsave/resource.h index 8e673059076..d19735775c6 100644 --- a/reactos/base/applications/screensavers/scrnsave/resource.h +++ b/reactos/base/applications/screensavers/scrnsave/resource.h @@ -1,2 +1,4 @@ -#define IDS_DESCRIPTION 1 +#define IDS_DESCRIPTION 1 +#define IDS_TITLE 2 +#define IDS_TEXT 3 diff --git a/reactos/base/applications/screensavers/scrnsave/scrnsave.c b/reactos/base/applications/screensavers/scrnsave/scrnsave.c index b61832afbb1..83468461f23 100644 --- a/reactos/base/applications/screensavers/scrnsave/scrnsave.c +++ b/reactos/base/applications/screensavers/scrnsave/scrnsave.c @@ -19,6 +19,7 @@ #include #include +#include "resource.h" #define APPNAME _T("Scrnsave") @@ -151,6 +152,28 @@ void ParseCommandLine(PSTR szCmdLine, int *chOption, HWND *hwndParent) *hwndParent = 0; } +void Configure(void) +{ + TCHAR szTitle[256]; + TCHAR szText[256]; + + LoadString(hInstance, + IDS_TITLE, + szTitle, + 256); + + LoadString(hInstance, + IDS_TEXT, + szText, + 256); + + MessageBox(0, + szText, + szTitle, + MB_OK | MB_ICONWARNING); +} + + int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmdLine, @@ -179,10 +202,7 @@ int WINAPI WinMain (HINSTANCE hInst, case 'c': default: - MessageBox(0, - _T("No options need to be set."), - _T("About"), - MB_OK | MB_ICONWARNING); + Configure(); return 0; } diff --git a/reactos/base/applications/screensavers/scrnsave/scrnsave.rc b/reactos/base/applications/screensavers/scrnsave/scrnsave.rc index 4814ed80fe1..d9f50b1658e 100644 --- a/reactos/base/applications/screensavers/scrnsave/scrnsave.rc +++ b/reactos/base/applications/screensavers/scrnsave/scrnsave.rc @@ -10,10 +10,4 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include - -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - -STRINGTABLE DISCARDABLE -BEGIN - IDS_DESCRIPTION "Default ScreenSaver" -END +#include "lang/en-US.rc"