[ros-diffs] [mpiulachs] 31096: Partly applied patch from bug 2874 by Vytis Girdzijauskas "CMan" cman<at>cman<dot>us * Added description string to Butterflies screensaver for all languages. * Use string resources in Maze screensaver. My notes: I haven't added butterflies.scr to reactos.dff as opengl screen savers are still broken under reactos , we already have 3dtext added for testing no need to add another one I have modified mazescr installname to have the same name as the module has inset of changing it

Author: mpiulachs
Date: Sun Dec  9 14:27:23 2007
New Revision: 31096

URL: http://svn.reactos.org/svn/reactos?rev=31096&view=rev
Log:
Partly applied patch from bug 2874 by Vytis Girdzijauskas "CMan"
cman<at>cman<dot>us

* Added description string to Butterflies screensaver for all languages.
* Use string resources in Maze screensaver.

My notes:
I haven't added butterflies.scr to reactos.dff as opengl screen savers are still
broken under reactos , we already have 3dtext added for testing no need to add another
one
I have modified mazescr installname to have the same name as the module has inset of
changing it on reactos.dff
See issue #2874 for more details.

Added:
    trunk/rosapps/applications/screensavers/mazescr/lang/
    trunk/rosapps/applications/screensavers/mazescr/lang/en-US.rc   (with props)
    trunk/rosapps/applications/screensavers/mazescr/lang/lt-LT.rc   (with props)
Modified:
    trunk/rosapps/applications/screensavers/butterflies/lang/bg-BG.rc
    trunk/rosapps/applications/screensavers/butterflies/lang/de-DE.rc
    trunk/rosapps/applications/screensavers/butterflies/lang/en-US.rc
    trunk/rosapps/applications/screensavers/butterflies/lang/es-ES.rc
    trunk/rosapps/applications/screensavers/butterflies/lang/fr-FR.rc
    trunk/rosapps/applications/screensavers/butterflies/lang/lt-LT.rc
    trunk/rosapps/applications/screensavers/butterflies/lang/uk-UA.rc
    trunk/rosapps/applications/screensavers/butterflies/resource.h
    trunk/rosapps/applications/screensavers/mazescr/mazescr.rbuild
    trunk/rosapps/applications/screensavers/mazescr/scrnsave.c
    trunk/rosapps/applications/screensavers/mazescr/scrnsave.rc

Modified: trunk/rosapps/applications/screensavers/butterflies/lang/bg-BG.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/…
==============================================================================
--- trunk/rosapps/applications/screensavers/butterflies/lang/bg-BG.rc (original)
+++ trunk/rosapps/applications/screensavers/butterflies/lang/bg-BG.rc Sun Dec  9 14:27:23
2007
@@ -27,3 +27,8 @@
     CTEXT           "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY |
                     NOT WS_GROUP
 END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_DESCRIPTION         "Butterflies ScreenSaver"
+END

Modified: trunk/rosapps/applications/screensavers/butterflies/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/…
==============================================================================
--- trunk/rosapps/applications/screensavers/butterflies/lang/de-DE.rc (original)
+++ trunk/rosapps/applications/screensavers/butterflies/lang/de-DE.rc Sun Dec  9 14:27:23
2007
@@ -27,3 +27,8 @@
     CTEXT           "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY |
                     NOT WS_GROUP
 END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_DESCRIPTION         "Butterflies ScreenSaver"
+END

Modified: trunk/rosapps/applications/screensavers/butterflies/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/…
==============================================================================
--- trunk/rosapps/applications/screensavers/butterflies/lang/en-US.rc (original)
+++ trunk/rosapps/applications/screensavers/butterflies/lang/en-US.rc Sun Dec  9 14:27:23
2007
@@ -27,3 +27,8 @@
     CTEXT           "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY |
                     NOT WS_GROUP
 END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_DESCRIPTION         "Butterflies ScreenSaver"
+END

Modified: trunk/rosapps/applications/screensavers/butterflies/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/…
==============================================================================
--- trunk/rosapps/applications/screensavers/butterflies/lang/es-ES.rc (original)
+++ trunk/rosapps/applications/screensavers/butterflies/lang/es-ES.rc Sun Dec  9 14:27:23
2007
@@ -27,3 +27,8 @@
     CTEXT           "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY |
                     NOT WS_GROUP
 END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_DESCRIPTION         "Butterflies ScreenSaver"
+END

Modified: trunk/rosapps/applications/screensavers/butterflies/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/…
==============================================================================
--- trunk/rosapps/applications/screensavers/butterflies/lang/fr-FR.rc (original)
+++ trunk/rosapps/applications/screensavers/butterflies/lang/fr-FR.rc Sun Dec  9 14:27:23
2007
@@ -27,3 +27,8 @@
     CTEXT           "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY |
                     NOT WS_GROUP
 END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_DESCRIPTION         "Butterflies ScreenSaver"
+END

Modified: trunk/rosapps/applications/screensavers/butterflies/lang/lt-LT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/…
==============================================================================
--- trunk/rosapps/applications/screensavers/butterflies/lang/lt-LT.rc (original)
+++ trunk/rosapps/applications/screensavers/butterflies/lang/lt-LT.rc Sun Dec  9 14:27:23
2007
@@ -36,3 +36,8 @@
     CTEXT           "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY |
                     NOT WS_GROUP
 END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_DESCRIPTION         "Drugeliai"
+END

Modified: trunk/rosapps/applications/screensavers/butterflies/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/…
==============================================================================
--- trunk/rosapps/applications/screensavers/butterflies/lang/uk-UA.rc (original)
+++ trunk/rosapps/applications/screensavers/butterflies/lang/uk-UA.rc Sun Dec  9 14:27:23
2007
@@ -27,3 +27,8 @@
     CTEXT           "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY |
                     NOT WS_GROUP
 END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_DESCRIPTION         "Butterflies ScreenSaver"
+END

Modified: trunk/rosapps/applications/screensavers/butterflies/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/…
==============================================================================
--- trunk/rosapps/applications/screensavers/butterflies/resource.h (original)
+++ trunk/rosapps/applications/screensavers/butterflies/resource.h Sun Dec  9 14:27:23
2007
@@ -1,6 +1,6 @@
 #define IDC_STATIC                      -1
 
-#define IDS_STR_DESCRIP                 1
+#define IDS_DESCRIPTION                 1
 #define IDABOUT                         3
 #define IDI_ICON_SCREEN                 100
 #define IDB_BUTTERFLY1                  103

Added: trunk/rosapps/applications/screensavers/mazescr/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/…
==============================================================================
--- trunk/rosapps/applications/screensavers/mazescr/lang/en-US.rc (added)
+++ trunk/rosapps/applications/screensavers/mazescr/lang/en-US.rc Sun Dec  9 14:27:23
2007
@@ -1,0 +1,8 @@
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_DESCRIPTION "Maze ScreenSaver"
+    IDS_TITLE       "About"
+    IDS_TEXT        "No options need to be set."
+END

Propchange: trunk/rosapps/applications/screensavers/mazescr/lang/en-US.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/rosapps/applications/screensavers/mazescr/lang/lt-LT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/…
==============================================================================
--- trunk/rosapps/applications/screensavers/mazescr/lang/lt-LT.rc (added)
+++ trunk/rosapps/applications/screensavers/mazescr/lang/lt-LT.rc Sun Dec  9 14:27:23
2007
@@ -1,0 +1,8 @@
+LANGUAGE LANG_LITHUANIAN, SUBLANG_DEFAULT
+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_DESCRIPTION "Labirintas"
+    IDS_TITLE       "Apie"
+    IDS_TEXT        "Nëra keièiamø parametrø."
+END

Propchange: trunk/rosapps/applications/screensavers/mazescr/lang/lt-LT.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/rosapps/applications/screensavers/mazescr/mazescr.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/…
==============================================================================
--- trunk/rosapps/applications/screensavers/mazescr/mazescr.rbuild (original)
+++ trunk/rosapps/applications/screensavers/mazescr/mazescr.rbuild Sun Dec  9 14:27:23
2007
@@ -1,4 +1,4 @@
-<module name="mazescr" type="win32scr"
installbase="system32" installname="maze.scr">
+<module name="mazescr" type="win32scr"
installbase="system32">
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 

Modified: trunk/rosapps/applications/screensavers/mazescr/scrnsave.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/…
==============================================================================
--- trunk/rosapps/applications/screensavers/mazescr/scrnsave.c (original)
+++ trunk/rosapps/applications/screensavers/mazescr/scrnsave.c Sun Dec  9 14:27:23 2007
@@ -19,6 +19,7 @@
 
 #include <windows.h>
 #include <tchar.h>
+#include "resource.h"
 
 #define APPNAME _T("Scrnsave")
 
@@ -156,6 +157,27 @@
 		*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,
@@ -184,10 +206,7 @@
 
 		case 'c':
 		default:
-			MessageBox(0,
-			           _T("No options need to be set."),
-			           _T("About"),
-			           MB_OK | MB_ICONWARNING);
+			Configure();
 			return 0;
 	}
 

Modified: trunk/rosapps/applications/screensavers/mazescr/scrnsave.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/screensavers/…
==============================================================================
--- trunk/rosapps/applications/screensavers/mazescr/scrnsave.rc (original)
+++ trunk/rosapps/applications/screensavers/mazescr/scrnsave.rc Sun Dec  9 14:27:23 2007
@@ -10,10 +10,5 @@
 
 #include <reactos/version.rc>
 
-
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-
-STRINGTABLE DISCARDABLE
-BEGIN
-    IDS_DESCRIPTION         "Maze ScreenSaver"
-END
+#include "lang/en-US.rc"
+#include "lang/lt-LT.rc"