Skip to content

Commit 846d927

Browse files
greatlordgreatlord
committed
patch from Pierre Schweitzer (aka Heis Spiter) heis_spiter at hotmail dor com
------------------------------------------------------------------------------ 1. remove one hard code line. 2. cleanup one rc file See issue reactos#2400 for more details. svn path=/trunk/; revision=27627
1 parent 062ffc4 commit 846d927

File tree

17 files changed

+40
-87
lines changed

17 files changed

+40
-87
lines changed

‎reactos/base/applications/games/solitaire/lang/bg-BG.rc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ BEGIN
3737
IDS_SOL_NAME "�������"
3838
IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0."
3939
IDS_SOL_QUIT "�� �������� �� �������� ����?"
40+
IDS_SOL_WIN "Congratulations, you win!!"
4041
END
4142

4243

‎reactos/base/applications/games/solitaire/lang/de-DE.rc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ BEGIN
3737
IDS_SOL_NAME "Solit�r"
3838
IDS_SOL_ABOUT "Solit�r von J Brown\n\nCardLib version 1.0."
3939
IDS_SOL_QUIT "Laufendes Spiel beenden?"
40+
IDS_SOL_WIN "Congratulations, you win!!"
4041
END
4142

4243

‎reactos/base/applications/games/solitaire/lang/en-US.rc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ BEGIN
3737
IDS_SOL_NAME "Solitaire"
3838
IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0."
3939
IDS_SOL_QUIT "Quit the current game?"
40+
IDS_SOL_WIN "Congratulations, you win!!"
4041
END
4142

4243

‎reactos/base/applications/games/solitaire/lang/es-ES.rc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ BEGIN
3737
IDS_SOL_NAME "Solitaire"
3838
IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0."
3939
IDS_SOL_QUIT "Quit the current game?"
40+
IDS_SOL_WIN "Congratulations, you win!!"
4041
END
4142

4243

‎reactos/base/applications/games/solitaire/lang/fr-FR.rc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ BEGIN
3737
IDS_SOL_NAME "Solitaire"
3838
IDS_SOL_ABOUT "Solitaire par J Brown\n\nCardLib version 1.0."
3939
IDS_SOL_QUIT "Quitter le jeu actuel?"
40+
IDS_SOL_WIN "F�licitations ! Vous avez gagn� !"
4041
END
4142

4243

‎reactos/base/applications/games/solitaire/lang/id-ID.rc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ BEGIN
3838
IDS_SOL_NAME "Solitaire"
3939
IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0."
4040
IDS_SOL_QUIT "Quit the current game?"
41+
IDS_SOL_WIN "Congratulations, you win!!"
4142
END
4243

4344

‎reactos/base/applications/games/solitaire/lang/it-IT.rc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ BEGIN
3838
IDS_SOL_NAME "Solitario"
3939
IDS_SOL_ABOUT "Solitario by J Brown\n\nCardLib versione 1.0."
4040
IDS_SOL_QUIT "Chiudere la partita in corso?"
41+
IDS_SOL_WIN "Congratulations, you win!!"
4142
END
4243

4344

‎reactos/base/applications/games/solitaire/lang/nb-NO.rc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ BEGIN
3838
IDS_SOL_NAME "Solitaire"
3939
IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0."
4040
IDS_SOL_QUIT "Quit the current game?"
41+
IDS_SOL_WIN "Congratulations, you win!!"
4142
END
4243

4344

‎reactos/base/applications/games/solitaire/lang/pl-PL.rc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ BEGIN
3636
IDS_SOL_NAME "Pasjans"
3737
IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0."
3838
IDS_SOL_QUIT "Zako�czy� aktualn� gr�?"
39+
IDS_SOL_WIN "Congratulations, you win!!"
3940
END
4041

4142

‎reactos/base/applications/games/solitaire/lang/ru-RU.rc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ BEGIN
3232
IDS_SOL_NAME "�������"
3333
IDS_SOL_ABOUT "������� �� J Brown\n\nCardLib ������ 1.0."
3434
IDS_SOL_QUIT "��������� ������� ����?"
35+
IDS_SOL_WIN "Congratulations, you win!!"
3536
END
3637

3738

‎reactos/base/applications/games/solitaire/lang/sk-SK.rc

Lines changed: 19 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,45 @@
1-
//Microsoft Developer Studio generated resource script.
2-
//
3-
#include "resource.h"
4-
5-
#define APSTUDIO_READONLY_SYMBOLS
6-
/////////////////////////////////////////////////////////////////////////////
7-
//
8-
// Generated from the TEXTINCLUDE 2 resource.
9-
//
10-
/* winemaker: #include "afxres.h" */
11-
/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */
12-
#include "winres.h"
13-
14-
/////////////////////////////////////////////////////////////////////////////
15-
#undef APSTUDIO_READONLY_SYMBOLS
16-
17-
/////////////////////////////////////////////////////////////////////////////
181
// Slovak translation by Kario 2007 <[email protected]>
2+
#include "resource.h"
193

20-
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
21-
#ifdef _WIN32
224
LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
23-
#pragma code_page(1250)
24-
#endif //_WIN32
5+
256

267
/////////////////////////////////////////////////////////////////////////////
278
//
289
// Dialog
2910
//
3011

31-
IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 95
12+
IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118
3213
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
33-
CAPTION "Dialog"
34-
FONT 8, "MS Sans Serif"
14+
CAPTION "Options"
15+
FONT 8, "MS Shell Dlg"
16+
EXSTYLE DS_SHELLFONT
3517
BEGIN
36-
DEFPUSHBUTTON "OK",IDOK,129,7,50,14
37-
PUSHBUTTON "Zru�i�",IDCANCEL,129,24,50,14
38-
END
39-
18+
GROUPBOX "Cards", -1, 7, 7, 65, 40
19+
AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP
20+
AUTORADIOBUTTON "Draw &Three", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
4021

41-
/////////////////////////////////////////////////////////////////////////////
42-
//
43-
// DESIGNINFO
44-
//
22+
AUTOCHECKBOX "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP
23+
AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
4524

46-
#ifdef APSTUDIO_INVOKED
47-
GUIDELINES DESIGNINFO DISCARDABLE
48-
BEGIN
49-
IDD_DIALOG1, DIALOG
50-
BEGIN
51-
LEFTMARGIN, 7
52-
RIGHTMARGIN, 179
53-
TOPMARGIN, 7
54-
BOTTOMMARGIN, 88
55-
END
25+
DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
26+
PUSHBUTTON "Zru�i��", IDCANCEL, 101, 97, 50, 14
5627
END
57-
#endif // APSTUDIO_INVOKED
5828

5929

60-
#ifdef APSTUDIO_INVOKED
6130
/////////////////////////////////////////////////////////////////////////////
6231
//
63-
// TEXTINCLUDE
32+
// Strings
6433
//
6534

66-
1 TEXTINCLUDE DISCARDABLE
35+
STRINGTABLE
6736
BEGIN
68-
"resource.h\0"
37+
IDS_SOL_NAME "Solitaire"
38+
IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0."
39+
IDS_SOL_QUIT "Quit the current game?"
40+
IDS_SOL_WIN "Congratulations, you win!!"
6941
END
7042

71-
2 TEXTINCLUDE DISCARDABLE
72-
BEGIN
73-
"#include ""winres.h""\r\n"
74-
"\0"
75-
END
76-
77-
3 TEXTINCLUDE DISCARDABLE
78-
BEGIN
79-
"\r\n"
80-
"\0"
81-
END
82-
83-
#endif // APSTUDIO_INVOKED
84-
8543

8644
/////////////////////////////////////////////////////////////////////////////
8745
//
@@ -118,27 +76,3 @@ BEGIN
11876
VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT
11977
END
12078

121-
122-
/////////////////////////////////////////////////////////////////////////////
123-
//
124-
// Icon
125-
//
126-
127-
// Icon with lowest ID value placed first to ensure application icon
128-
// remains consistent on all systems.
129-
IDI_ICON1 ICON DISCARDABLE "solitaire.ico"
130-
#endif // Slovak resources
131-
/////////////////////////////////////////////////////////////////////////////
132-
133-
134-
135-
#ifndef APSTUDIO_INVOKED
136-
/////////////////////////////////////////////////////////////////////////////
137-
//
138-
// Generated from the TEXTINCLUDE 3 resource.
139-
//
140-
141-
142-
/////////////////////////////////////////////////////////////////////////////
143-
#endif // not APSTUDIO_INVOKED
144-

‎reactos/base/applications/games/solitaire/lang/th-TH.rc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ BEGIN
3838
IDS_SOL_NAME "Solitaire"
3939
IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0."
4040
IDS_SOL_QUIT "Quit the current game?"
41+
IDS_SOL_WIN "Congratulations, you win!!"
4142
END
4243

4344

‎reactos/base/applications/games/solitaire/lang/uk-UA.rc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ BEGIN
3737
IDS_SOL_NAME "Solitaire"
3838
IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0."
3939
IDS_SOL_QUIT "Quit the current game?"
40+
IDS_SOL_WIN "Congratulations, you win!!"
4041
END
4142

4243

‎reactos/base/applications/games/solitaire/lang/zh-CN.rc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ BEGIN
3838
IDS_SOL_NAME "Solitaire"
3939
IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0."
4040
IDS_SOL_QUIT "Quit the current game?"
41+
IDS_SOL_WIN "Congratulations, you win!!"
4142
END
4243

4344

‎reactos/base/applications/games/solitaire/resource.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,4 @@
2525
#define IDS_SOL_NAME 1300
2626
#define IDS_SOL_ABOUT 1301
2727
#define IDS_SOL_QUIT 1302
28+
#define IDS_SOL_WIN 1303

‎reactos/base/applications/games/solitaire/solgame.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
#define TRACE(s) printf("%s(%i): %s",__FILE__,__LINE__,s)
1414
#endif
1515

16+
extern TCHAR MsgWin[128];
17+
1618
CardStack activepile;
1719
bool fGameStarted = false;
1820

@@ -240,7 +242,7 @@ void CARDLIBPROC SuitStackAddProc(CardRegion &stackobj, const CardStack &added)
240242

241243
if(fGameOver)
242244
{
243-
MessageBox(SolWnd, _T("Congratulations, you win!!"), szAppName, MB_OK | MB_ICONINFORMATION);
245+
MessageBox(SolWnd, MsgWin, szAppName, MB_OK | MB_ICONINFORMATION);
244246

245247
for(int i = 0; i < 4; i++)
246248
{

‎reactos/base/applications/games/solitaire/solitaire.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ HINSTANCE hInstance;
1818
TCHAR szAppName[128];
1919
TCHAR MsgQuit[128];
2020
TCHAR MsgAbout[128];
21+
TCHAR MsgWin[128];
2122
INT nOptions = 8;
2223

2324
CardWindow SolWnd;
@@ -53,9 +54,10 @@ int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrev, PSTR szCmdLine, int iCmdSh
5354

5455
// Load application title
5556
LoadString(hInst, IDS_SOL_NAME, szAppName, sizeof(szAppName) / sizeof(szAppName[0]));
56-
// Load MsgBox() text here to avoid loading it many times later
57+
// Load MsgBox() texts here to avoid loading them many times later
5758
LoadString(hInst, IDS_SOL_ABOUT, MsgAbout, sizeof(MsgAbout) / sizeof(MsgAbout[0]));
5859
LoadString(hInst, IDS_SOL_QUIT, MsgQuit, sizeof(MsgQuit) / sizeof(MsgQuit[0]));
60+
LoadString(hInst, IDS_SOL_WIN, MsgWin, sizeof(MsgWin) / sizeof(MsgWin[0]));
5961

6062
//Window class for the main application parent window
6163
wndclass.cbSize = sizeof(wndclass);
@@ -266,3 +268,4 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
266268
return DefWindowProc (hwnd, iMsg, wParam, lParam);
267269
}
268270

271+

0 commit comments

Comments
 (0)