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.

svn path=/trunk/; revision=31096

diff --git a/rosapps/applications/screensavers/butterflies/lang/bg-BG.rc b/rosapps/applications/screensavers/butterflies/lang/bg-BG.rc
index 4ee1f98..fde39b1 100644 (file)
--- a/rosapps/applications/screensavers/butterflies/lang/bg-BG.rc
+++ b/rosapps/applications/screensavers/butterflies/lang/bg-BG.rc
@@ -27,3 +27,8 @@ BEGIN
     CTEXT           "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY |
                     NOT WS_GROUP
 END
     CTEXT           "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY |
                     NOT WS_GROUP
 END

+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_DESCRIPTION         "Butterflies ScreenSaver"
+END

diff --git a/rosapps/applications/screensavers/butterflies/lang/de-DE.rc b/rosapps/applications/screensavers/butterflies/lang/de-DE.rc
index 50a7dfd..f7d35d1 100644 (file)
--- a/rosapps/applications/screensavers/butterflies/lang/de-DE.rc
+++ b/rosapps/applications/screensavers/butterflies/lang/de-DE.rc
@@ -27,3 +27,8 @@ BEGIN
     CTEXT           "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY |
                     NOT WS_GROUP
 END
     CTEXT           "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY |
                     NOT WS_GROUP
 END

+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_DESCRIPTION         "Butterflies ScreenSaver"
+END

diff --git a/rosapps/applications/screensavers/butterflies/lang/en-US.rc b/rosapps/applications/screensavers/butterflies/lang/en-US.rc
index d022864..54bd0d6 100644 (file)
--- a/rosapps/applications/screensavers/butterflies/lang/en-US.rc
+++ b/rosapps/applications/screensavers/butterflies/lang/en-US.rc
@@ -27,3 +27,8 @@ BEGIN
     CTEXT           "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY |
                     NOT WS_GROUP
 END
     CTEXT           "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY |
                     NOT WS_GROUP
 END

+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_DESCRIPTION         "Butterflies ScreenSaver"
+END

diff --git a/rosapps/applications/screensavers/butterflies/lang/es-ES.rc b/rosapps/applications/screensavers/butterflies/lang/es-ES.rc
index c7fad60..a755db5 100644 (file)
--- a/rosapps/applications/screensavers/butterflies/lang/es-ES.rc
+++ b/rosapps/applications/screensavers/butterflies/lang/es-ES.rc
@@ -27,3 +27,8 @@ BEGIN
     CTEXT           "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY |
                     NOT WS_GROUP
 END
     CTEXT           "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY |
                     NOT WS_GROUP
 END

+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_DESCRIPTION         "Butterflies ScreenSaver"
+END

diff --git a/rosapps/applications/screensavers/butterflies/lang/fr-FR.rc b/rosapps/applications/screensavers/butterflies/lang/fr-FR.rc
index 827e61b..c208f7e 100644 (file)
--- a/rosapps/applications/screensavers/butterflies/lang/fr-FR.rc
+++ b/rosapps/applications/screensavers/butterflies/lang/fr-FR.rc
@@ -27,3 +27,8 @@ BEGIN
     CTEXT           "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY |
                     NOT WS_GROUP
 END
     CTEXT           "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY |
                     NOT WS_GROUP
 END

+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_DESCRIPTION         "Butterflies ScreenSaver"
+END

diff --git a/rosapps/applications/screensavers/butterflies/lang/lt-LT.rc b/rosapps/applications/screensavers/butterflies/lang/lt-LT.rc
index 7885b22..866af35 100644 (file)
--- a/rosapps/applications/screensavers/butterflies/lang/lt-LT.rc
+++ b/rosapps/applications/screensavers/butterflies/lang/lt-LT.rc
@@ -36,3 +36,8 @@ BEGIN
     CTEXT           "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY |
                     NOT WS_GROUP
 END
     CTEXT           "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY |
                     NOT WS_GROUP
 END

+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_DESCRIPTION         "Drugeliai"
+END

diff --git a/rosapps/applications/screensavers/butterflies/lang/uk-UA.rc b/rosapps/applications/screensavers/butterflies/lang/uk-UA.rc
index f0a10fb..8a151bd 100644 (file)
--- a/rosapps/applications/screensavers/butterflies/lang/uk-UA.rc
+++ b/rosapps/applications/screensavers/butterflies/lang/uk-UA.rc
@@ -27,3 +27,8 @@ BEGIN
     CTEXT           "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY |
                     NOT WS_GROUP
 END
     CTEXT           "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY |
                     NOT WS_GROUP
 END

+
+STRINGTABLE DISCARDABLE
+BEGIN
+    IDS_DESCRIPTION         "Butterflies ScreenSaver"
+END

diff --git a/rosapps/applications/screensavers/butterflies/resource.h b/rosapps/applications/screensavers/butterflies/resource.h
index d6688b0..3044500 100644 (file)
--- a/rosapps/applications/screensavers/butterflies/resource.h
+++ b/rosapps/applications/screensavers/butterflies/resource.h
@@ -1,6 +1,6 @@
 #define IDC_STATIC                      -1
 
 #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
 #define IDABOUT                         3
 #define IDI_ICON_SCREEN                 100
 #define IDB_BUTTERFLY1                  103

diff --git a/rosapps/applications/screensavers/mazescr/lang/en-US.rc b/rosapps/applications/screensavers/mazescr/lang/en-US.rc
new file mode 100644 (file)
index 0000000..75fb756
--- /dev/null
+++ b/rosapps/applications/screensavers/mazescr/lang/en-US.rc
@@ -0,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

diff --git a/rosapps/applications/screensavers/mazescr/lang/lt-LT.rc b/rosapps/applications/screensavers/mazescr/lang/lt-LT.rc
new file mode 100644 (file)
index 0000000..2b14ba4
--- /dev/null
+++ b/rosapps/applications/screensavers/mazescr/lang/lt-LT.rc
@@ -0,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

diff --git a/rosapps/applications/screensavers/mazescr/mazescr.rbuild b/rosapps/applications/screensavers/mazescr/mazescr.rbuild
index f3c1b4e..a97e81a 100644 (file)
--- a/rosapps/applications/screensavers/mazescr/mazescr.rbuild
+++ b/rosapps/applications/screensavers/mazescr/mazescr.rbuild
@@ -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>
 
        <define name="_WIN32_IE">0x0501</define>
        <define name="_WIN32_WINNT">0x0501</define>
 

diff --git a/rosapps/applications/screensavers/mazescr/scrnsave.c b/rosapps/applications/screensavers/mazescr/scrnsave.c
index c918c84..a35a029 100644 (file)
--- a/rosapps/applications/screensavers/mazescr/scrnsave.c
+++ b/rosapps/applications/screensavers/mazescr/scrnsave.c
@@ -19,6 +19,7 @@
 
 #include <windows.h>
 #include <tchar.h>
 
 #include <windows.h>
 #include <tchar.h>

+#include "resource.h"

 
 #define APPNAME _T("Scrnsave")
 
 
 #define APPNAME _T("Scrnsave")
 


@@ -156,6 +157,27 @@ void ParseCommandLine(PSTR szCmdLine, int *chOption, HWND *hwndParent)
                *hwndParent = 0;
 }
 
                *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,
 int WINAPI WinMain (HINSTANCE hInst,
                     HINSTANCE hPrev,
                     LPSTR lpCmdLine,


@@ -184,10 +206,7 @@ int WINAPI WinMain (HINSTANCE hInst,
 
                case 'c':
                default:
 
                case 'c':
                default:

-                       MessageBox(0,
-                                  _T("No options need to be set."),
-                                  _T("About"),
-                                  MB_OK | MB_ICONWARNING);
+                       Configure();

                        return 0;
        }
 
                        return 0;
        }
 

diff --git a/rosapps/applications/screensavers/mazescr/scrnsave.rc b/rosapps/applications/screensavers/mazescr/scrnsave.rc
index cc95034..b528cce 100644 (file)
--- a/rosapps/applications/screensavers/mazescr/scrnsave.rc
+++ b/rosapps/applications/screensavers/mazescr/scrnsave.rc
@@ -10,10 +10,5 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 #include <reactos/version.rc>
 
 
 #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"