From 0916909cbfc2c387c3d8f998e0988bff423e0c4f Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Sat, 22 Sep 2007 11:38:32 +0000 Subject: [PATCH] Don't use hardcoded strings in the configuration message box. Use string resources instead. svn path=/trunk/; revision=29138 --- .../screensavers/logon/lang/en-US.rc | 8 ++++++ .../applications/screensavers/logon/logon.c | 26 ++++++++++++++++--- .../applications/screensavers/logon/logon.rc | 7 +---- .../screensavers/logon/resource.h | 8 +++--- 4 files changed, 36 insertions(+), 13 deletions(-) create mode 100644 reactos/base/applications/screensavers/logon/lang/en-US.rc diff --git a/reactos/base/applications/screensavers/logon/lang/en-US.rc b/reactos/base/applications/screensavers/logon/lang/en-US.rc new file mode 100644 index 00000000000..d1f616a29e2 --- /dev/null +++ b/reactos/base/applications/screensavers/logon/lang/en-US.rc @@ -0,0 +1,8 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Logon ScreenSaver" + IDS_TITLE "About" + IDS_TEXT "No options need to be set." +END diff --git a/reactos/base/applications/screensavers/logon/logon.c b/reactos/base/applications/screensavers/logon/logon.c index 79c7da4eebd..b79e7730afe 100644 --- a/reactos/base/applications/screensavers/logon/logon.c +++ b/reactos/base/applications/screensavers/logon/logon.c @@ -270,6 +270,27 @@ 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, @@ -298,10 +319,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/logon/logon.rc b/reactos/base/applications/screensavers/logon/logon.rc index 07c5fd7cafd..a6c27056575 100644 --- a/reactos/base/applications/screensavers/logon/logon.rc +++ b/reactos/base/applications/screensavers/logon/logon.rc @@ -13,9 +13,4 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDB_WORKSTATION BITMAP DISCARDABLE "res/0.bmp" IDB_SERVER BITMAP DISCARDABLE "res/1.bmp" -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - -STRINGTABLE DISCARDABLE -BEGIN - IDS_DESCRIPTION "Logon ScreenSaver" -END +#include "lang/en-US.rc" diff --git a/reactos/base/applications/screensavers/logon/resource.h b/reactos/base/applications/screensavers/logon/resource.h index 6854273616c..ddb0f46f862 100644 --- a/reactos/base/applications/screensavers/logon/resource.h +++ b/reactos/base/applications/screensavers/logon/resource.h @@ -1,4 +1,6 @@ -#define IDS_DESCRIPTION 1 -#define IDB_WORKSTATION 0x100 -#define IDB_SERVER 0x200 +#define IDS_DESCRIPTION 1 +#define IDS_TITLE 2 +#define IDS_TEXT 3 +#define IDB_WORKSTATION 0x100 +#define IDB_SERVER 0x200 -- 2.17.1