Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-25 08:00:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Solitaire patch by Pierre Schweitzer (bug #2275).

Browse source 
svn path=/trunk/; revision=26971
This commit is contained in:
Dmitry Gorbachev 2007-06-02 21:47:06 +00:00
parent d6d5cf7f99
commit 244e1cd74b
15 changed files with 111 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
reactos/base/applications/games/solitaire/lang/de-DE.rc
View file

@ -56,6 +56,13 @@ BEGIN
END
STRINGTABLE
BEGIN
IDS_SOL_NAME "Solitaire"
IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0."
IDS_SOL_QUIT "Quit the current game?"
END
/////
// DESIGNINFO

7
reactos/base/applications/games/solitaire/lang/en-US.rc
View file

@ -56,6 +56,13 @@ BEGIN
PUSHBUTTON "Cancel", IDCANCEL, 101, 97, 50, 14
END
STRINGTABLE
BEGIN
IDS_SOL_NAME "Solitaire"
IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0."
IDS_SOL_QUIT "Quit the current game?"
END
/////
// DESIGNINFO

8
reactos/base/applications/games/solitaire/lang/es-ES.rc
View file

@ -55,6 +55,14 @@ BEGIN
PUSHBUTTON "Cancel", IDCANCEL, 101, 97, 50, 14
END
STRINGTABLE
BEGIN
IDS_SOL_NAME "Solitaire"
IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0."
IDS_SOL_QUIT "Quit the current game?"
END
/////
// DESIGNINFO

22
reactos/base/applications/games/solitaire/lang/fr-FR.rc
View file

@ -39,22 +39,31 @@ BEGIN
PUSHBUTTON "Annuler",IDCANCEL,129,24,50,14
END
IDD_OPTIONS DIALOG DISCARDABLE 0, 0, 186, 118
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Options"
FONT 8, "MS Shell Dlg"
BEGIN
GROUPBOX "Cards", -1, 7, 7, 65, 40
AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP
AUTORADIOBUTTON "Draw &Three", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
GROUPBOX "Cartes", -1, 7, 7, 65, 40
AUTORADIOBUTTON "En tirer une", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP
AUTORADIOBUTTON "En tirer trois", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
AUTOCHECKBOX "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP
AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
AUTOCHECKBOX "Afficher le temp&s", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP
AUTOCHECKBOX "Barre de s&tatus", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
PUSHBUTTON "Cancel", IDCANCEL, 101, 97, 50, 14
PUSHBUTTON "Annuler", IDCANCEL, 101, 97, 50, 14
END
STRINGTABLE
BEGIN
IDS_SOL_NAME "Solitaire"
IDS_SOL_ABOUT "Solitaire par J Brown\n\nCardLib version 1.0."
IDS_SOL_QUIT "Quitter le jeu actuel?"
END
/////
// DESIGNINFO
@ -71,7 +80,6 @@ BEGIN
END
#endif // APSTUDIO_INVOKED
#ifdef APSTUDIO_INVOKED
/////

8
reactos/base/applications/games/solitaire/lang/id-ID.rc
View file

@ -56,6 +56,14 @@ BEGIN
PUSHBUTTON "Cancel", IDCANCEL, 101, 97, 50, 14
END
STRINGTABLE
BEGIN
IDS_SOL_NAME "Solitaire"
IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0."
IDS_SOL_QUIT "Quit the current game?"
END
/////
// DESIGNINFO

8
reactos/base/applications/games/solitaire/lang/it-IT.rc
View file

@ -55,6 +55,14 @@ BEGIN
PUSHBUTTON "Cancel", IDCANCEL, 101, 97, 50, 14
END
STRINGTABLE
BEGIN
IDS_SOL_NAME "Solitaire"
IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0."
IDS_SOL_QUIT "Quit the current game?"
END
/////
// DESIGNINFO

8
reactos/base/applications/games/solitaire/lang/nb-NO.rc
View file

@ -56,6 +56,14 @@ BEGIN
PUSHBUTTON "Cancel", IDCANCEL, 101, 97, 50, 14
END
STRINGTABLE
BEGIN
IDS_SOL_NAME "Solitaire"
IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0."
IDS_SOL_QUIT "Quit the current game?"
END
/////
// DESIGNINFO

8
reactos/base/applications/games/solitaire/lang/pl-PL.rc
View file

@ -54,6 +54,14 @@ BEGIN
PUSHBUTTON "Cancel", IDCANCEL, 101, 97, 50, 14
END
STRINGTABLE
BEGIN
IDS_SOL_NAME "Solitaire"
IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0."
IDS_SOL_QUIT "Quit the current game?"
END
/////
// DESIGNINFO

8
reactos/base/applications/games/solitaire/lang/th-TH.rc
View file

@ -56,6 +56,14 @@ BEGIN
PUSHBUTTON "Cancel", IDCANCEL, 101, 97, 50, 14
END
STRINGTABLE
BEGIN
IDS_SOL_NAME "Solitaire"
IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0."
IDS_SOL_QUIT "Quit the current game?"
END
/////
// DESIGNINFO

8
reactos/base/applications/games/solitaire/lang/uk-UA.rc
View file

@ -55,6 +55,14 @@ BEGIN
PUSHBUTTON "Cancel", IDCANCEL, 101, 97, 50, 14
END
STRINGTABLE
BEGIN
IDS_SOL_NAME "Solitaire"
IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0."
IDS_SOL_QUIT "Quit the current game?"
END
/////
// DESIGNINFO

8
reactos/base/applications/games/solitaire/lang/zh-CN.rc
View file

@ -56,6 +56,14 @@ BEGIN
PUSHBUTTON "Cancel", IDCANCEL, 101, 97, 50, 14
END
STRINGTABLE
BEGIN
IDS_SOL_NAME "Solitaire"
IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0."
IDS_SOL_QUIT "Quit the current game?"
END
/////
// DESIGNINFO

6
reactos/base/applications/games/solitaire/resource.h
View file

@ -1,6 +1,6 @@
//{{NO_DEPENDENCIES}}
// Microsoft Developer Studio generated include file.
// Used by Solitaire.rc
// Used by rsrc.rc
//
#define IDD_DIALOG1 101
#define IDR_MENU1 102
@ -21,6 +21,10 @@
#define IDC_OPT_SHOWTIME 1203
#define IDC_OPT_STATUSBAR 1204
#define IDS_SOL_NAME 1300
#define IDS_SOL_ABOUT 1301
#define IDS_SOL_QUIT 1302
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED

1
reactos/base/applications/games/solitaire/sol.rc
View file

@ -1 +0,0 @@
#include "rsrc.rc"

19
reactos/base/applications/games/solitaire/solitaire.cpp
View file

@ -15,7 +15,9 @@ HWND hwndMain;
HWND hwndStatus;
HINSTANCE hInstance;
TCHAR szAppName[] = _T("Solitaire");
TCHAR szAppName[128];
TCHAR MsgQuit[128];
TCHAR MsgAbout[128];
INT nOptions = 8;
CardWindow SolWnd;
@ -49,6 +51,12 @@ int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrev, PSTR szCmdLine, int iCmdSh
hInstance = hInst;
// Load application title
LoadString(hInst, IDS_SOL_NAME, szAppName, sizeof(szAppName) / sizeof(szAppName[0]));
// Load MsgBox() text here to avoid loading it many times later
LoadString(hInst, IDS_SOL_ABOUT, MsgAbout, sizeof(MsgAbout) / sizeof(MsgAbout[0]));
LoadString(hInst, IDS_SOL_QUIT, MsgQuit, sizeof(MsgQuit) / sizeof(MsgQuit[0]));
//Window class for the main application parent window
wndclass.cbSize = sizeof(wndclass);
wndclass.style = 0;//CS_HREDRAW | CS_VREDRAW;
@ -232,7 +240,7 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
return 0;
case IDM_HELP_ABOUT:
MessageBox(hwnd, _T("Solitaire by J Brown\r\n\r\nCardLib version 1.0."), szAppName, MB_OK|MB_ICONINFORMATION);
MessageBox(hwnd, MsgAbout, szAppName, MB_OK|MB_ICONINFORMATION);
return 0;
case IDM_GAME_EXIT:
@ -244,12 +252,7 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
case WM_CLOSE:
ret = IDOK;
if(fGameStarted)
{
ret = MessageBox(hwnd, _T("Quit the current game?"), szAppName, MB_OKCANCEL|MB_ICONQUESTION);
}
ret = MessageBox(hwnd, MsgQuit, szAppName, MB_OKCANCEL|MB_ICONQUESTION);
if(ret == IDOK)
{

4
reactos/base/applications/games/solitaire/solitaire.rbuild
View file

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
<module name="sol" type="win32gui" installbase="system32" installname="solitaire.exe" allowwarnings="true" stdlib="host">
<module name="sol" type="win32gui" installbase="system32" installname="solitaire.exe" unicode="no" allowwarnings="yes" stdlib="host">
<include base="sol">.</include>
<include base="sol">cardlib</include>
<linkerflag>-lstdc++</linkerflag>
@ -31,5 +31,5 @@
<file>cardwindow.cpp</file>
<file>dropzone.cpp</file>
</directory>
<file>sol.rc</file>
<file>rsrc.rc</file>
</module>