Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-17 01:46:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add the status bar.

Browse source 
svn path=/trunk/; revision=28179
This commit is contained in:
Eric Kohl 2007-08-05 18:56:39 +00:00
parent ec345d7f85
commit c55a8d231d
17 changed files with 60 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/base/applications/games/solitaire/lang/bg-BG.rc
View file

@ -22,7 +22,7 @@ BEGIN
AUTORADIOBUTTON "Èçòåãëè &òðè", IDC_OPT_DRAWTHREE, 14, 32, 70, 10
AUTOCHECKBOX "&Ïîêàçâàíå íà âðåìåòî", IDC_OPT_SHOWTIME, 7 ,51 ,100 ,10, WS_TABSTOP | WS_DISABLED
AUTOCHECKBOX "Ëåíòà &ñúñòîÿíèå", IDC_OPT_STATUSBAR, 7, 66, 100, 10, WS_TABSTOP | WS_DISABLED
AUTOCHECKBOX "Ëåíòà &ñúñòîÿíèå", IDC_OPT_STATUSBAR, 7, 66, 100, 10, WS_TABSTOP
DEFPUSHBUTTON "Äîáðå", IDOK, 35, 97, 50, 14
PUSHBUTTON "Îòêàç", IDCANCEL, 101, 97, 50, 14

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

@ -22,7 +22,7 @@ BEGIN
AUTORADIOBUTTON "&Drei ziehen", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
AUTOCHECKBOX "&Zeit anzeigen", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
AUTOCHECKBOX "S&tatusleiste", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED
AUTOCHECKBOX "S&tatusleiste", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
DEFPUSHBUTTON "OK",IDOK,35,97,50,14
PUSHBUTTON "Abbrechen",IDCANCEL,101,97,50,14

2
reactos/base/applications/games/solitaire/lang/el-GR.rc
View file

@ -22,7 +22,7 @@ BEGIN
AUTORADIOBUTTON "Ñßîå &Ôñßá", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
AUTOCHECKBOX "&ÅìöÜíéóç ¿ñáò", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
AUTOCHECKBOX "Ã&ñáììÞ êáôÜóôáóçò", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED
AUTOCHECKBOX "Ã&ñáììÞ êáôÜóôáóçò", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
PUSHBUTTON "Áêýñùóç", IDCANCEL, 101, 97, 50, 14

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

@ -22,7 +22,7 @@ BEGIN
AUTORADIOBUTTON "Draw &Three", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
AUTOCHECKBOX "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED
AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
PUSHBUTTON "Cancel", IDCANCEL, 101, 97, 50, 14

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

@ -22,7 +22,7 @@ BEGIN
AUTORADIOBUTTON "Draw &Three", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
AUTOCHECKBOX "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED
AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
DEFPUSHBUTTON "Aceptar", IDOK, 35, 97, 50, 14
PUSHBUTTON "Cancelar", IDCANCEL, 101, 97, 50, 14

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

@ -22,7 +22,7 @@ BEGIN
AUTORADIOBUTTON "En tirer trois", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
AUTOCHECKBOX "Afficher le temp&s", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
AUTOCHECKBOX "Barre de s&tatus", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED
AUTOCHECKBOX "Barre de s&tatus", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
PUSHBUTTON "Annuler", IDCANCEL, 101, 97, 50, 14

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

@ -23,7 +23,7 @@ BEGIN
AUTORADIOBUTTON "Draw &Three", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
AUTOCHECKBOX "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED
AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
PUSHBUTTON "Batal", IDCANCEL, 101, 97, 50, 14

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

@ -23,7 +23,7 @@ BEGIN
AUTORADIOBUTTON "Girane &Tre", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
AUTOCHECKBOX "&Visualizza il tempo", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
AUTOCHECKBOX "&Barra di stato", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED
AUTOCHECKBOX "&Barra di stato", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
PUSHBUTTON "Annulla", IDCANCEL, 101, 97, 50, 14

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

@ -23,7 +23,7 @@ BEGIN
AUTORADIOBUTTON "Draw &Three", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
AUTOCHECKBOX "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED
AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
PUSHBUTTON "Avbryt", IDCANCEL, 101, 97, 50, 14

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

@ -21,7 +21,7 @@ BEGIN
AUTORADIOBUTTON "Rozdaj &dwie", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
AUTOCHECKBOX "&Pokazuj czas gry", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
AUTOCHECKBOX "Pokazuj pa&sek stanu", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED
AUTOCHECKBOX "Pokazuj pa&sek stanu", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
PUSHBUTTON "Anuluj", IDCANCEL, 101, 97, 50, 14

2
reactos/base/applications/games/solitaire/lang/ru-RU.rc
View file

@ -17,7 +17,7 @@ BEGIN
AUTORADIOBUTTON "Ïî &òðè", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
AUTOCHECKBOX "&Ïîêàçûâàòü âðåìÿ", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
AUTOCHECKBOX "&Ñòðîêà ñîñòîÿíèÿ", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED
AUTOCHECKBOX "&Строка состояния", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
PUSHBUTTON "Îòìåíà", IDCANCEL, 101, 97, 50, 14

2
reactos/base/applications/games/solitaire/lang/sk-SK.rc
View file

@ -24,7 +24,7 @@ BEGIN
AUTORADIOBUTTON "<22>aha<68> &tri", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
AUTOCHECKBOX "Èa&sový limit", IDC_OPT_SHOWTIME, 7 ,51 ,64 ,10, WS_TABSTOP | WS_DISABLED
AUTOCHECKBOX "Stavový riad&ok", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED
AUTOCHECKBOX "Stavový riad&ok", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
PUSHBUTTON "Zruši<C5A1>", IDCANCEL, 101, 97, 50, 14

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

@ -23,7 +23,7 @@ BEGIN
AUTORADIOBUTTON "Draw &Three", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
AUTOCHECKBOX "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED
AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
DEFPUSHBUTTON "µ¡Å§", IDOK, 35, 97, 50, 14
PUSHBUTTON "¡àÅÔ¡", IDCANCEL, 101, 97, 50, 14

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

@ -22,7 +22,7 @@ BEGIN
AUTORADIOBUTTON "Ï&î òðè", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
AUTOCHECKBOX "&Ãðà çà ÷àñîì", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
AUTOCHECKBOX "&Ðÿäîê ñòàíó", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED
AUTOCHECKBOX "&Ðÿäîê ñòàíó", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 101, 97, 50, 14

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

@ -23,7 +23,7 @@ BEGIN
AUTORADIOBUTTON "Draw &Three", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
AUTOCHECKBOX "&Show Time", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED
AUTOCHECKBOX "S&tatus bar", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
DEFPUSHBUTTON "È·¶¨", IDOK, 35, 97, 50, 14
PUSHBUTTON "È¡Ïû", IDCANCEL, 101, 97, 50, 14

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

@ -206,6 +206,9 @@ BOOL CALLBACK OptionsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
CheckRadioButton(hDlg, IDC_OPT_DRAWONE, IDC_OPT_DRAWTHREE,
(dwOptions & OPTION_THREE_CARDS) ? IDC_OPT_DRAWTHREE : IDC_OPT_DRAWONE);
CheckDlgButton(hDlg,
IDC_OPT_STATUSBAR,
(dwOptions & OPTION_SHOW_STATUS) ? BST_CHECKED : BST_UNCHECKED);
return TRUE;
case WM_COMMAND:
@ -216,6 +219,11 @@ BOOL CALLBACK OptionsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
if (IsDlgButtonChecked(hDlg, IDC_OPT_DRAWTHREE) == BST_CHECKED)
dwOptions |= OPTION_THREE_CARDS;
if (IsDlgButtonChecked(hDlg, IDC_OPT_STATUSBAR) == BST_CHECKED)
dwOptions |= OPTION_SHOW_STATUS;
else
dwOptions &= ~OPTION_SHOW_STATUS;
EndDialog(hDlg, TRUE);
return TRUE;
@ -231,11 +239,34 @@ BOOL CALLBACK OptionsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
VOID ShowGameOptionsDlg(HWND hwnd)
{
DWORD dwOldOptions = dwOptions;
RECT rcMain, rcStatus;
int nWidth, nHeight, nStatusHeight;
if (DialogBox(hInstance, MAKEINTRESOURCE(IDD_OPTIONS), hwnd, OptionsDlgProc))
{
if ((dwOldOptions & OPTION_THREE_CARDS) != (dwOptions & OPTION_THREE_CARDS))
NewGame();
if ((dwOldOptions & OPTION_SHOW_STATUS) != (dwOptions & OPTION_SHOW_STATUS))
{
GetClientRect(hwndMain, &rcMain);
nHeight = rcMain.bottom - rcMain.top;
nWidth = rcMain.right - rcMain.left;
if (dwOptions & OPTION_SHOW_STATUS)
{
ShowWindow(hwndStatus, SW_SHOW);
GetWindowRect(hwndStatus, &rcStatus);
nStatusHeight = rcStatus.bottom - rcStatus.top;
MoveWindow(SolWnd, 0, 0, nWidth, nHeight-nStatusHeight, TRUE);
MoveWindow(hwndStatus, 0, nHeight-nStatusHeight, nWidth, nHeight, TRUE);
}
else
{
ShowWindow(hwndStatus, SW_HIDE);
MoveWindow(SolWnd, 0, 0, nWidth, nHeight, TRUE);
}
}
}
}
@ -413,9 +444,10 @@ VOID ShowDeckOptionsDlg(HWND hwnd)
LRESULT CALLBACK WndProc (HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
{
static int nWidth, nHeight;
int nStatusHeight = 0;//20;
int parts[] = { 100, -1 };
int ret;
RECT rc;
int nStatusHeight = 0;
MINMAXINFO *mmi;
@ -429,8 +461,6 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
SendMessage(hwndStatus, SB_SETPARTS, 2, (LPARAM)parts);
SendMessage(hwndStatus, SB_SETTEXT, 0 | SBT_NOBORDERS, (LPARAM)"");
ShowWindow(hwndStatus, SW_HIDE);
SolWnd.Create(hwnd, WS_EX_CLIENTEDGE, WS_CHILD|WS_VISIBLE, 0, 0, 0, 0);
CreateSol();
@ -449,8 +479,17 @@ LRESULT CALLBACK WndProc (HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
nWidth = LOWORD(lParam);
nHeight = HIWORD(lParam);
MoveWindow(SolWnd, 0, 0, nWidth, nHeight-nStatusHeight, TRUE);
//MoveWindow(hwndStatus, 0, nHeight-nStatusHeight, nWidth, nHeight, TRUE);
if (dwOptions & OPTION_SHOW_STATUS)
{
GetWindowRect(hwndStatus, &rc);
nStatusHeight = rc.bottom - rc.top;
MoveWindow(SolWnd, 0, 0, nWidth, nHeight-nStatusHeight, TRUE);
MoveWindow(hwndStatus, 0, nHeight-nStatusHeight, nWidth, nHeight, TRUE);
}
else
{
MoveWindow(SolWnd, 0, 0, nWidth, nHeight, TRUE);
}
//parts[0] = nWidth - 256;
//SendMessage(hwndStatus, SB_SETPARTS, 2, (LPARAM)parts);
return 0;

1
reactos/base/applications/games/solitaire/solitaire.h
View file

@ -5,6 +5,7 @@ extern CardWindow SolWnd;
extern TCHAR szAppName[];
extern bool fGameStarted;
#define OPTION_SHOW_STATUS 4
#define OPTION_THREE_CARDS 8
#define CARDBACK_START IDC_CARDBACK1
#define CARDBACK_END IDC_CARDBACK4