diff --git a/reactos/base/applications/games/solitaire/lang/de-DE.rc b/reactos/base/applications/games/solitaire/lang/de-DE.rc index 37630399df1..b8b1d863bc5 100644 --- a/reactos/base/applications/games/solitaire/lang/de-DE.rc +++ b/reactos/base/applications/games/solitaire/lang/de-DE.rc @@ -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 diff --git a/reactos/base/applications/games/solitaire/lang/en-US.rc b/reactos/base/applications/games/solitaire/lang/en-US.rc index e2b7da58877..4f0183a466d 100644 --- a/reactos/base/applications/games/solitaire/lang/en-US.rc +++ b/reactos/base/applications/games/solitaire/lang/en-US.rc @@ -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 diff --git a/reactos/base/applications/games/solitaire/lang/es-ES.rc b/reactos/base/applications/games/solitaire/lang/es-ES.rc index 01ff4aa7ff1..dfbb77fb4f0 100644 --- a/reactos/base/applications/games/solitaire/lang/es-ES.rc +++ b/reactos/base/applications/games/solitaire/lang/es-ES.rc @@ -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 diff --git a/reactos/base/applications/games/solitaire/lang/fr-FR.rc b/reactos/base/applications/games/solitaire/lang/fr-FR.rc index 39db3c70ca2..428586cc8a5 100644 --- a/reactos/base/applications/games/solitaire/lang/fr-FR.rc +++ b/reactos/base/applications/games/solitaire/lang/fr-FR.rc @@ -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 ///// diff --git a/reactos/base/applications/games/solitaire/lang/id-ID.rc b/reactos/base/applications/games/solitaire/lang/id-ID.rc index 4ed220c1f05..f070e0fbdff 100644 --- a/reactos/base/applications/games/solitaire/lang/id-ID.rc +++ b/reactos/base/applications/games/solitaire/lang/id-ID.rc @@ -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 diff --git a/reactos/base/applications/games/solitaire/lang/it-IT.rc b/reactos/base/applications/games/solitaire/lang/it-IT.rc index 972102f9bff..a315b9cb96b 100644 --- a/reactos/base/applications/games/solitaire/lang/it-IT.rc +++ b/reactos/base/applications/games/solitaire/lang/it-IT.rc @@ -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 diff --git a/reactos/base/applications/games/solitaire/lang/nb-NO.rc b/reactos/base/applications/games/solitaire/lang/nb-NO.rc index fdafa57c3b3..12554678d68 100644 --- a/reactos/base/applications/games/solitaire/lang/nb-NO.rc +++ b/reactos/base/applications/games/solitaire/lang/nb-NO.rc @@ -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 diff --git a/reactos/base/applications/games/solitaire/lang/pl-PL.rc b/reactos/base/applications/games/solitaire/lang/pl-PL.rc index f70ab4f57ac..6db9a6c77db 100644 --- a/reactos/base/applications/games/solitaire/lang/pl-PL.rc +++ b/reactos/base/applications/games/solitaire/lang/pl-PL.rc @@ -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 diff --git a/reactos/base/applications/games/solitaire/lang/th-TH.rc b/reactos/base/applications/games/solitaire/lang/th-TH.rc index 4bbe86fb471..12d7aba3e6e 100644 --- a/reactos/base/applications/games/solitaire/lang/th-TH.rc +++ b/reactos/base/applications/games/solitaire/lang/th-TH.rc @@ -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 diff --git a/reactos/base/applications/games/solitaire/lang/uk-UA.rc b/reactos/base/applications/games/solitaire/lang/uk-UA.rc index 748a11ee5ed..513a2f124a0 100644 --- a/reactos/base/applications/games/solitaire/lang/uk-UA.rc +++ b/reactos/base/applications/games/solitaire/lang/uk-UA.rc @@ -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 diff --git a/reactos/base/applications/games/solitaire/lang/zh-CN.rc b/reactos/base/applications/games/solitaire/lang/zh-CN.rc index 73d3ca4f3d9..e857b46ee93 100644 --- a/reactos/base/applications/games/solitaire/lang/zh-CN.rc +++ b/reactos/base/applications/games/solitaire/lang/zh-CN.rc @@ -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 diff --git a/reactos/base/applications/games/solitaire/resource.h b/reactos/base/applications/games/solitaire/resource.h index f7f85b713ce..e72c14fb193 100644 --- a/reactos/base/applications/games/solitaire/resource.h +++ b/reactos/base/applications/games/solitaire/resource.h @@ -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 diff --git a/reactos/base/applications/games/solitaire/sol.rc b/reactos/base/applications/games/solitaire/sol.rc deleted file mode 100644 index 8f2c5f1e085..00000000000 --- a/reactos/base/applications/games/solitaire/sol.rc +++ /dev/null @@ -1 +0,0 @@ -#include "rsrc.rc" diff --git a/reactos/base/applications/games/solitaire/solitaire.cpp b/reactos/base/applications/games/solitaire/solitaire.cpp index 69af2830851..37dfe037716 100644 --- a/reactos/base/applications/games/solitaire/solitaire.cpp +++ b/reactos/base/applications/games/solitaire/solitaire.cpp @@ -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) { diff --git a/reactos/base/applications/games/solitaire/solitaire.rbuild b/reactos/base/applications/games/solitaire/solitaire.rbuild index 6478c45e701..1c3598eb917 100644 --- a/reactos/base/applications/games/solitaire/solitaire.rbuild +++ b/reactos/base/applications/games/solitaire/solitaire.rbuild @@ -1,6 +1,6 @@ - + . cardlib -lstdc++ @@ -31,5 +31,5 @@ cardwindow.cpp dropzone.cpp - sol.rc + rsrc.rc