From 846d92706e14b38be9698c858ac6f6b45782f69f Mon Sep 17 00:00:00 2001 From: Magnus Olsen Date: Fri, 13 Jul 2007 11:42:20 +0000 Subject: [PATCH] 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 #2400 for more details. svn path=/trunk/; revision=27627 --- .../games/solitaire/lang/bg-BG.rc | 1 + .../games/solitaire/lang/de-DE.rc | 1 + .../games/solitaire/lang/en-US.rc | 1 + .../games/solitaire/lang/es-ES.rc | 1 + .../games/solitaire/lang/fr-FR.rc | 1 + .../games/solitaire/lang/id-ID.rc | 1 + .../games/solitaire/lang/it-IT.rc | 1 + .../games/solitaire/lang/nb-NO.rc | 1 + .../games/solitaire/lang/pl-PL.rc | 1 + .../games/solitaire/lang/ru-RU.rc | 1 + .../games/solitaire/lang/sk-SK.rc | 108 ++++-------------- .../games/solitaire/lang/th-TH.rc | 1 + .../games/solitaire/lang/uk-UA.rc | 1 + .../games/solitaire/lang/zh-CN.rc | 1 + .../applications/games/solitaire/resource.h | 1 + .../applications/games/solitaire/solgame.cpp | 4 +- .../games/solitaire/solitaire.cpp | 5 +- 17 files changed, 42 insertions(+), 89 deletions(-) diff --git a/reactos/base/applications/games/solitaire/lang/bg-BG.rc b/reactos/base/applications/games/solitaire/lang/bg-BG.rc index 877bd9cfd73..c1f1ec7a2e1 100644 --- a/reactos/base/applications/games/solitaire/lang/bg-BG.rc +++ b/reactos/base/applications/games/solitaire/lang/bg-BG.rc @@ -37,6 +37,7 @@ BEGIN IDS_SOL_NAME "" IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0." IDS_SOL_QUIT " ?" + IDS_SOL_WIN "Congratulations, you win!!" END diff --git a/reactos/base/applications/games/solitaire/lang/de-DE.rc b/reactos/base/applications/games/solitaire/lang/de-DE.rc index 7db1f864d48..3d392812fd2 100644 --- a/reactos/base/applications/games/solitaire/lang/de-DE.rc +++ b/reactos/base/applications/games/solitaire/lang/de-DE.rc @@ -37,6 +37,7 @@ BEGIN IDS_SOL_NAME "Solitr" IDS_SOL_ABOUT "Solitr von J Brown\n\nCardLib version 1.0." IDS_SOL_QUIT "Laufendes Spiel beenden?" + IDS_SOL_WIN "Congratulations, you win!!" END diff --git a/reactos/base/applications/games/solitaire/lang/en-US.rc b/reactos/base/applications/games/solitaire/lang/en-US.rc index 4b4b484ce0c..92f61f08825 100644 --- a/reactos/base/applications/games/solitaire/lang/en-US.rc +++ b/reactos/base/applications/games/solitaire/lang/en-US.rc @@ -37,6 +37,7 @@ BEGIN IDS_SOL_NAME "Solitaire" IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0." IDS_SOL_QUIT "Quit the current game?" + IDS_SOL_WIN "Congratulations, you win!!" END diff --git a/reactos/base/applications/games/solitaire/lang/es-ES.rc b/reactos/base/applications/games/solitaire/lang/es-ES.rc index 70700b08205..05cdd39c3cb 100644 --- a/reactos/base/applications/games/solitaire/lang/es-ES.rc +++ b/reactos/base/applications/games/solitaire/lang/es-ES.rc @@ -37,6 +37,7 @@ BEGIN IDS_SOL_NAME "Solitaire" IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0." IDS_SOL_QUIT "Quit the current game?" + IDS_SOL_WIN "Congratulations, you win!!" END diff --git a/reactos/base/applications/games/solitaire/lang/fr-FR.rc b/reactos/base/applications/games/solitaire/lang/fr-FR.rc index 252739d2757..0d41c627285 100644 --- a/reactos/base/applications/games/solitaire/lang/fr-FR.rc +++ b/reactos/base/applications/games/solitaire/lang/fr-FR.rc @@ -37,6 +37,7 @@ BEGIN IDS_SOL_NAME "Solitaire" IDS_SOL_ABOUT "Solitaire par J Brown\n\nCardLib version 1.0." IDS_SOL_QUIT "Quitter le jeu actuel?" + IDS_SOL_WIN "Flicitations ! Vous avez gagn !" END diff --git a/reactos/base/applications/games/solitaire/lang/id-ID.rc b/reactos/base/applications/games/solitaire/lang/id-ID.rc index 78defb2a8d5..2aa203bd32e 100644 --- a/reactos/base/applications/games/solitaire/lang/id-ID.rc +++ b/reactos/base/applications/games/solitaire/lang/id-ID.rc @@ -38,6 +38,7 @@ BEGIN IDS_SOL_NAME "Solitaire" IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0." IDS_SOL_QUIT "Quit the current game?" + IDS_SOL_WIN "Congratulations, you win!!" END diff --git a/reactos/base/applications/games/solitaire/lang/it-IT.rc b/reactos/base/applications/games/solitaire/lang/it-IT.rc index cd3e54a3c0c..e80baf27f02 100644 --- a/reactos/base/applications/games/solitaire/lang/it-IT.rc +++ b/reactos/base/applications/games/solitaire/lang/it-IT.rc @@ -38,6 +38,7 @@ BEGIN IDS_SOL_NAME "Solitario" IDS_SOL_ABOUT "Solitario by J Brown\n\nCardLib versione 1.0." IDS_SOL_QUIT "Chiudere la partita in corso?" + IDS_SOL_WIN "Congratulations, you win!!" END diff --git a/reactos/base/applications/games/solitaire/lang/nb-NO.rc b/reactos/base/applications/games/solitaire/lang/nb-NO.rc index 4c730d88acf..30f1cdf6e0a 100644 --- a/reactos/base/applications/games/solitaire/lang/nb-NO.rc +++ b/reactos/base/applications/games/solitaire/lang/nb-NO.rc @@ -38,6 +38,7 @@ BEGIN IDS_SOL_NAME "Solitaire" IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0." IDS_SOL_QUIT "Quit the current game?" + IDS_SOL_WIN "Congratulations, you win!!" END diff --git a/reactos/base/applications/games/solitaire/lang/pl-PL.rc b/reactos/base/applications/games/solitaire/lang/pl-PL.rc index 44c1e3ad283..9f8fec1cd45 100644 --- a/reactos/base/applications/games/solitaire/lang/pl-PL.rc +++ b/reactos/base/applications/games/solitaire/lang/pl-PL.rc @@ -36,6 +36,7 @@ BEGIN IDS_SOL_NAME "Pasjans" IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0." IDS_SOL_QUIT "Zakoczy aktualn gr?" + IDS_SOL_WIN "Congratulations, you win!!" END diff --git a/reactos/base/applications/games/solitaire/lang/ru-RU.rc b/reactos/base/applications/games/solitaire/lang/ru-RU.rc index 3366c8beb2f..98472a460d1 100644 --- a/reactos/base/applications/games/solitaire/lang/ru-RU.rc +++ b/reactos/base/applications/games/solitaire/lang/ru-RU.rc @@ -32,6 +32,7 @@ BEGIN IDS_SOL_NAME "" IDS_SOL_ABOUT " J Brown\n\nCardLib 1.0." IDS_SOL_QUIT " ?" + IDS_SOL_WIN "Congratulations, you win!!" END diff --git a/reactos/base/applications/games/solitaire/lang/sk-SK.rc b/reactos/base/applications/games/solitaire/lang/sk-SK.rc index bef1112f212..8c0f88af369 100644 --- a/reactos/base/applications/games/solitaire/lang/sk-SK.rc +++ b/reactos/base/applications/games/solitaire/lang/sk-SK.rc @@ -1,86 +1,44 @@ -//Microsoft Developer Studio generated resource script. -// +// Slovak translation by Kario 2007 #include "resource.h" -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -/* winemaker: #include "afxres.h" */ -/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */ -#include "winres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Slovak translation by Kario 2007 - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) -#ifdef _WIN32 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT -#pragma code_page(1250) -#endif //_WIN32 + ///////////////////////////////////////////////////////////////////////////// // // Dialog // -IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 95 +IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Dialog" -FONT 8, "MS Sans Serif" +CAPTION "Options" +FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT BEGIN - DEFPUSHBUTTON "OK",IDOK,129,7,50,14 - PUSHBUTTON "Zrui",IDCANCEL,129,24,50,14 + 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 + + 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 + + DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 + PUSHBUTTON "Zrui", IDCANCEL, 101, 97, 50, 14 END ///////////////////////////////////////////////////////////////////////////// // -// DESIGNINFO +// Strings // -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE +STRINGTABLE BEGIN - IDD_DIALOG1, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 179 - TOPMARGIN, 7 - BOTTOMMARGIN, 88 - END + IDS_SOL_NAME "Solitaire" + IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0." + IDS_SOL_QUIT "Quit the current game?" + IDS_SOL_WIN "Congratulations, you win!!" END -#endif // APSTUDIO_INVOKED - - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""winres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// @@ -118,27 +76,3 @@ BEGIN VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT END - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_ICON1 ICON DISCARDABLE "solitaire.ico" -#endif // Slovak resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/reactos/base/applications/games/solitaire/lang/th-TH.rc b/reactos/base/applications/games/solitaire/lang/th-TH.rc index 44f94a18113..497f5107f6c 100644 --- a/reactos/base/applications/games/solitaire/lang/th-TH.rc +++ b/reactos/base/applications/games/solitaire/lang/th-TH.rc @@ -38,6 +38,7 @@ BEGIN IDS_SOL_NAME "Solitaire" IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0." IDS_SOL_QUIT "Quit the current game?" + IDS_SOL_WIN "Congratulations, you win!!" END diff --git a/reactos/base/applications/games/solitaire/lang/uk-UA.rc b/reactos/base/applications/games/solitaire/lang/uk-UA.rc index 69acc86f616..3ea263da7e6 100644 --- a/reactos/base/applications/games/solitaire/lang/uk-UA.rc +++ b/reactos/base/applications/games/solitaire/lang/uk-UA.rc @@ -37,6 +37,7 @@ BEGIN IDS_SOL_NAME "Solitaire" IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0." IDS_SOL_QUIT "Quit the current game?" + IDS_SOL_WIN "Congratulations, you win!!" END diff --git a/reactos/base/applications/games/solitaire/lang/zh-CN.rc b/reactos/base/applications/games/solitaire/lang/zh-CN.rc index 0e9b513a979..8ac0e324c4f 100644 --- a/reactos/base/applications/games/solitaire/lang/zh-CN.rc +++ b/reactos/base/applications/games/solitaire/lang/zh-CN.rc @@ -38,6 +38,7 @@ BEGIN IDS_SOL_NAME "Solitaire" IDS_SOL_ABOUT "Solitaire by J Brown\n\nCardLib version 1.0." IDS_SOL_QUIT "Quit the current game?" + IDS_SOL_WIN "Congratulations, you win!!" END diff --git a/reactos/base/applications/games/solitaire/resource.h b/reactos/base/applications/games/solitaire/resource.h index 325f0fb4ba3..42d48dba6bb 100644 --- a/reactos/base/applications/games/solitaire/resource.h +++ b/reactos/base/applications/games/solitaire/resource.h @@ -25,3 +25,4 @@ #define IDS_SOL_NAME 1300 #define IDS_SOL_ABOUT 1301 #define IDS_SOL_QUIT 1302 +#define IDS_SOL_WIN 1303 diff --git a/reactos/base/applications/games/solitaire/solgame.cpp b/reactos/base/applications/games/solitaire/solgame.cpp index d45bedee18a..b1fa00c0954 100644 --- a/reactos/base/applications/games/solitaire/solgame.cpp +++ b/reactos/base/applications/games/solitaire/solgame.cpp @@ -13,6 +13,8 @@ #define TRACE(s) printf("%s(%i): %s",__FILE__,__LINE__,s) #endif +extern TCHAR MsgWin[128]; + CardStack activepile; bool fGameStarted = false; @@ -240,7 +242,7 @@ void CARDLIBPROC SuitStackAddProc(CardRegion &stackobj, const CardStack &added) if(fGameOver) { - MessageBox(SolWnd, _T("Congratulations, you win!!"), szAppName, MB_OK | MB_ICONINFORMATION); + MessageBox(SolWnd, MsgWin, szAppName, MB_OK | MB_ICONINFORMATION); for(int i = 0; i < 4; i++) { diff --git a/reactos/base/applications/games/solitaire/solitaire.cpp b/reactos/base/applications/games/solitaire/solitaire.cpp index 3607b55bccf..488a20e61f6 100644 --- a/reactos/base/applications/games/solitaire/solitaire.cpp +++ b/reactos/base/applications/games/solitaire/solitaire.cpp @@ -18,6 +18,7 @@ HINSTANCE hInstance; TCHAR szAppName[128]; TCHAR MsgQuit[128]; TCHAR MsgAbout[128]; +TCHAR MsgWin[128]; INT nOptions = 8; CardWindow SolWnd; @@ -53,9 +54,10 @@ int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrev, PSTR szCmdLine, int iCmdSh // 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 + // Load MsgBox() texts here to avoid loading them 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])); + LoadString(hInst, IDS_SOL_WIN, MsgWin, sizeof(MsgWin) / sizeof(MsgWin[0])); //Window class for the main application parent window wndclass.cbSize = sizeof(wndclass); @@ -266,3 +268,4 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam) return DefWindowProc (hwnd, iMsg, wParam, lParam); } +