Don't use hardcoded strings in the configuration message box. Use string resources...

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 (file)
index 0000000..a9bbcb8
--- /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 8e67305..d197357 100644 (file)
--- a/reactos/base/applications/screensavers/scrnsave/resource.h
+++ b/reactos/base/applications/screensavers/scrnsave/resource.h
@@ -1,2 +1,4 @@
 \r
-#define IDS_DESCRIPTION                 1\r
+#define IDS_DESCRIPTION 1\r
+#define IDS_TITLE       2\r
+#define IDS_TEXT        3\r

diff --git a/reactos/base/applications/screensavers/scrnsave/scrnsave.c b/reactos/base/applications/screensavers/scrnsave/scrnsave.c
index b61832a..8346846 100644 (file)
--- a/reactos/base/applications/screensavers/scrnsave/scrnsave.c
+++ b/reactos/base/applications/screensavers/scrnsave/scrnsave.c
@@ -19,6 +19,7 @@
 \r
 #include <windows.h>\r
 #include <tchar.h>\r
+#include "resource.h"\r
 \r
 #define APPNAME _T("Scrnsave")\r
 \r
@@ -151,6 +152,28 @@ void ParseCommandLine(PSTR szCmdLine, int *chOption, HWND *hwndParent)
                *hwndParent = 0;\r
 }\r
 \r
+void Configure(void)\r
+{\r
+       TCHAR szTitle[256];\r
+       TCHAR szText[256];\r
+\r
+       LoadString(hInstance,\r
+                  IDS_TITLE,\r
+                  szTitle,\r
+                  256);\r
+\r
+       LoadString(hInstance,\r
+                  IDS_TEXT,\r
+                  szText,\r
+                  256);\r
+\r
+       MessageBox(0,\r
+                  szText,\r
+                  szTitle,\r
+                  MB_OK | MB_ICONWARNING);\r
+}\r
+\r
+\r
 int WINAPI WinMain (HINSTANCE hInst,\r
                     HINSTANCE hPrev,\r
                     LPSTR lpCmdLine,\r
@@ -179,10 +202,7 @@ int WINAPI WinMain (HINSTANCE hInst,
 \r
                case 'c':\r
                default:\r
-                       MessageBox(0,\r
-                                  _T("No options need to be set."),\r
-                                  _T("About"),\r
-                                  MB_OK | MB_ICONWARNING);\r
+                       Configure();\r
                        return 0;\r
        }\r
 \r

diff --git a/reactos/base/applications/screensavers/scrnsave/scrnsave.rc b/reactos/base/applications/screensavers/scrnsave/scrnsave.rc
index 4814ed8..d9f50b1 100644 (file)
--- 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 <reactos/version.rc>
 
-
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_DESCRIPTION         "Default ScreenSaver"
-END
+#include "lang/en-US.rc"