8 Jun
2007
8 Jun
'07
3:34 p.m.
Author: dgorbachev
Date: Sun Jun 3 01:47:06 2007
New Revision: 26971
URL: http://svn.reactos.org/svn/reactos?rev=26971&view=rev
Log:
Solitaire patch by Pierre Schweitzer (bug #2275).
Removed:
trunk/reactos/base/applications/games/solitaire/sol.rc
Modified:
trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc
trunk/reactos/base/applications/games/solitaire/lang/en-US.rc
trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc
trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc
trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc
trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc
trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc
trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc
trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc
trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc
trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc
trunk/reactos/base/applications/games/solitaire/resource.h
trunk/reactos/base/applications/games/solitaire/solitaire.cpp
trunk/reactos/base/applications/games/solitaire/solitaire.rbuild
Modified: trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc Sun Jun 3 01:47:06
2007
@@ -55,6 +55,13 @@
PUSHBUTTON "Abbrechen",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
Modified: trunk/reactos/base/applications/games/solitaire/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/en-US.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/en-US.rc Sun Jun 3 01:47:06
2007
@@ -54,6 +54,13 @@
DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
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
Modified: trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc Sun Jun 3 01:47:06
2007
@@ -53,6 +53,14 @@
DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
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
/////
Modified: trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc Sun Jun 3 01:47:06
2007
@@ -39,21 +39,30 @@
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
@@ -70,7 +79,6 @@
END
END
#endif // APSTUDIO_INVOKED
-
#ifdef APSTUDIO_INVOKED
Modified: trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc Sun Jun 3 01:47:06
2007
@@ -54,6 +54,14 @@
DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
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
/////
Modified: trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc Sun Jun 3 01:47:06
2007
@@ -53,6 +53,14 @@
DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
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
/////
Modified: trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc Sun Jun 3 01:47:06
2007
@@ -54,6 +54,14 @@
DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
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
/////
Modified: trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc Sun Jun 3 01:47:06
2007
@@ -52,6 +52,14 @@
DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
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
/////
Modified: trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc Sun Jun 3 01:47:06
2007
@@ -54,6 +54,14 @@
DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
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
/////
Modified: trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc Sun Jun 3 01:47:06
2007
@@ -53,6 +53,14 @@
DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
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
/////
Modified: trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc Sun Jun 3 01:47:06
2007
@@ -54,6 +54,14 @@
DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
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
/////
Modified: trunk/reactos/base/applications/games/solitaire/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/resource.h (original)
+++ trunk/reactos/base/applications/games/solitaire/resource.h Sun Jun 3 01:47:06 2007
@@ -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
Removed: trunk/reactos/base/applications/games/solitaire/sol.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/sol.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/sol.rc (removed)
@@ -1,1 +1,0 @@
-#include "rsrc.rc"
Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/solitaire.cpp (original)
+++ trunk/reactos/base/applications/games/solitaire/solitaire.cpp Sun Jun 3 01:47:06
2007
@@ -15,7 +15,9 @@
HWND hwndStatus;
HINSTANCE hInstance;
-TCHAR szAppName[] = _T("Solitaire");
+TCHAR szAppName[128];
+TCHAR MsgQuit[128];
+TCHAR MsgAbout[128];
INT nOptions = 8;
CardWindow SolWnd;
@@ -48,6 +50,12 @@
HACCEL hAccelTable;
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);
@@ -232,7 +240,7 @@
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 @@
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)
{
Modified: trunk/reactos/base/applications/games/solitaire/solitaire.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so…
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/solitaire.rbuild (original)
+++ trunk/reactos/base/applications/games/solitaire/solitaire.rbuild Sun Jun 3 01:47:06
2007
@@ -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>