mirror of
https://github.com/reactos/reactos.git
synced 2024-06-30 09:50:07 +00:00
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
This commit is contained in:
Marc Piulachs
parent
661de9fa33
commit
c199df2315
|
|
@ -27,3 +27,8 @@ BEGIN
|
|||
CTEXT "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY |
|
||||
NOT WS_GROUP
|
||||
END
|
||||
|
||||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_DESCRIPTION "Butterflies ScreenSaver"
|
||||
END
|
||||
|
|
|
|||
|
|
@ -27,3 +27,8 @@ BEGIN
|
|||
CTEXT "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY |
|
||||
NOT WS_GROUP
|
||||
END
|
||||
|
||||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_DESCRIPTION "Butterflies ScreenSaver"
|
||||
END
|
||||
|
|
|
|||
|
|
@ -27,3 +27,8 @@ BEGIN
|
|||
CTEXT "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY |
|
||||
NOT WS_GROUP
|
||||
END
|
||||
|
||||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_DESCRIPTION "Butterflies ScreenSaver"
|
||||
END
|
||||
|
|
|
|||
|
|
@ -27,3 +27,8 @@ BEGIN
|
|||
CTEXT "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY |
|
||||
NOT WS_GROUP
|
||||
END
|
||||
|
||||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_DESCRIPTION "Butterflies ScreenSaver"
|
||||
END
|
||||
|
|
|
|||
|
|
@ -27,3 +27,8 @@ BEGIN
|
|||
CTEXT "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY |
|
||||
NOT WS_GROUP
|
||||
END
|
||||
|
||||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_DESCRIPTION "Butterflies ScreenSaver"
|
||||
END
|
||||
|
|
|
|||
|
|
@ -36,3 +36,8 @@ BEGIN
|
|||
CTEXT "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY |
|
||||
NOT WS_GROUP
|
||||
END
|
||||
|
||||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_DESCRIPTION "Drugeliai"
|
||||
END
|
||||
|
|
|
|||
|
|
@ -27,3 +27,8 @@ BEGIN
|
|||
CTEXT "http://www.thaputer.com",WEBPAGE2,7,47,135,8,SS_NOTIFY |
|
||||
NOT WS_GROUP
|
||||
END
|
||||
|
||||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_DESCRIPTION "Butterflies ScreenSaver"
|
||||
END
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
8
rosapps/applications/screensavers/mazescr/lang/en-US.rc
Normal file
8
rosapps/applications/screensavers/mazescr/lang/en-US.rc
Normal file
|
|
@ -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
|
||||
8
rosapps/applications/screensavers/mazescr/lang/lt-LT.rc
Normal file
8
rosapps/applications/screensavers/mazescr/lang/lt-LT.rc
Normal file
|
|
@ -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
|
||||
|
|
@ -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>
|
||||
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@
|
|||
|
||||
#include <windows.h>
|
||||
#include <tchar.h>
|
||||
#include "resource.h"
|
||||
|
||||
#define APPNAME _T("Scrnsave")
|
||||
|
||||
|
|
@ -156,6 +157,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,
|
||||
|
|
@ -184,10 +206,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;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -10,10 +10,5 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
|
|||
|
||||
#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"
|
||||
|
|
|
|||
Loading…
Reference in a new issue