[ros-diffs] [ekohl] 27949: - Load and save game settings. - Disable unused dialog controls and menu items.
ekohl at svn.reactos.org
ekohl at svn.reactos.org
Sat Jul 28 15:03:13 CEST 2007
Author: ekohl
Date: Sat Jul 28 17:03:13 2007
New Revision: 27949
URL: http://svn.reactos.org/svn/reactos?rev=27949&view=rev
Log:
- Load and save game settings.
- Disable unused dialog controls and menu items.
Modified:
trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc
trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc
trunk/reactos/base/applications/games/solitaire/lang/el-GR.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/ru-RU.rc
trunk/reactos/base/applications/games/solitaire/lang/sk-SK.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/solgame.cpp
trunk/reactos/base/applications/games/solitaire/solitaire.cpp
trunk/reactos/base/applications/games/solitaire/solitaire.h
Modified: trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc?rev=27949&r1=27948&r2=27949&view=diff
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/bg-BG.rc Sat Jul 28 17:03:13 2007
@@ -21,8 +21,8 @@
AUTORADIOBUTTON "Èçòåãëè &åäíà", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP
AUTORADIOBUTTON "Èçòåãëè &òðè", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
- AUTOCHECKBOX "&Ïîêàçâàíå íà âðåìåòî", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP
- AUTOCHECKBOX "Ëåíòà &ñúñòîÿíèå", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
+ AUTOCHECKBOX "&Ïîêàçâàíå íà âðåìåòî", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
+ AUTOCHECKBOX "Ëåíòà &ñúñòîÿíèå", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED
DEFPUSHBUTTON "Äîáðå", IDOK, 35, 97, 50, 14
PUSHBUTTON "Îòêàç", IDCANCEL, 101, 97, 50, 14
@@ -48,7 +48,7 @@
BEGIN
MENUITEM "&Ðàçäàâàíå\tF2", IDM_GAME_NEW
MENUITEM SEPARATOR
- MENUITEM "&Òåñòå...", IDM_GAME_DECK
+ MENUITEM "&Òåñòå...", IDM_GAME_DECK, GRAYED
MENUITEM "&Íàñòðîéêè...", IDM_GAME_OPTIONS
MENUITEM SEPARATOR
MENUITEM "Èç&õîä", IDM_GAME_EXIT
Modified: trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc?rev=27949&r1=27948&r2=27949&view=diff
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc Sat Jul 28 17:03:13 2007
@@ -21,8 +21,8 @@
AUTORADIOBUTTON "&Eine ziehen", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP
AUTORADIOBUTTON "&Drei ziehen", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
- AUTOCHECKBOX "&Zeit anzeigen", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP
- AUTOCHECKBOX "S&tatusleiste", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
+ 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
DEFPUSHBUTTON "OK",IDOK,35,97,50,14
PUSHBUTTON "Abbrechen",IDCANCEL,101,97,50,14
@@ -48,7 +48,7 @@
BEGIN
MENUITEM "&Karten geben\t F2", IDM_GAME_NEW
MENUITEM SEPARATOR
- MENUITEM "&Deckblatt...", IDM_GAME_DECK
+ MENUITEM "&Deckblatt...", IDM_GAME_DECK, GRAYED
MENUITEM "&Optionen...", IDM_GAME_OPTIONS
MENUITEM SEPARATOR
MENUITEM "&Beenden", IDM_GAME_EXIT
Modified: trunk/reactos/base/applications/games/solitaire/lang/el-GR.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/solitaire/lang/el-GR.rc?rev=27949&r1=27948&r2=27949&view=diff
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/el-GR.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/el-GR.rc Sat Jul 28 17:03:13 2007
@@ -21,8 +21,8 @@
AUTORADIOBUTTON "Ñßîå ¸&íá", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP
AUTORADIOBUTTON "Ñßîå &Ôñßá", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
- AUTOCHECKBOX "&ÅìöÜíéóç ¿ñáò", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP
- AUTOCHECKBOX "Ã&ñáììÞ êáôÜóôáóçò", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
+ AUTOCHECKBOX "&ÅìöÜíéóç ¿ñáò", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
+ AUTOCHECKBOX "Ã&ñáììÞ êáôÜóôáóçò", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED
DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
PUSHBUTTON "Áêýñùóç", IDCANCEL, 101, 97, 50, 14
@@ -48,7 +48,7 @@
BEGIN
MENUITEM "&Deal\tF2", IDM_GAME_NEW
MENUITEM SEPARATOR
- MENUITEM "De&ck...", IDM_GAME_DECK
+ MENUITEM "De&ck...", IDM_GAME_DECK, GRAYED
MENUITEM "&ÅðéëïãÝò...", IDM_GAME_OPTIONS
MENUITEM SEPARATOR
MENUITEM "¸&îïäïò", IDM_GAME_EXIT
Modified: trunk/reactos/base/applications/games/solitaire/lang/en-US.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/solitaire/lang/en-US.rc?rev=27949&r1=27948&r2=27949&view=diff
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/en-US.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/en-US.rc Sat Jul 28 17:03:13 2007
@@ -21,8 +21,8 @@
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
+ 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
DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
PUSHBUTTON "Cancel", IDCANCEL, 101, 97, 50, 14
@@ -48,7 +48,7 @@
BEGIN
MENUITEM "&Deal\tF2", IDM_GAME_NEW
MENUITEM SEPARATOR
- MENUITEM "De&ck...", IDM_GAME_DECK
+ MENUITEM "De&ck...", IDM_GAME_DECK, GRAYED
MENUITEM "&Options...", IDM_GAME_OPTIONS
MENUITEM SEPARATOR
MENUITEM "&Exit", IDM_GAME_EXIT
Modified: trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc?rev=27949&r1=27948&r2=27949&view=diff
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc Sat Jul 28 17:03:13 2007
@@ -21,8 +21,8 @@
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
+ 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
DEFPUSHBUTTON "Aceptar", IDOK, 35, 97, 50, 14
PUSHBUTTON "Cancelar", IDCANCEL, 101, 97, 50, 14
@@ -48,7 +48,7 @@
BEGIN
MENUITEM "&Repartir\tF2", IDM_GAME_NEW
MENUITEM SEPARATOR
- MENUITEM "&Barajar...", IDM_GAME_DECK
+ MENUITEM "&Barajar...", IDM_GAME_DECK, GRAYED
MENUITEM "&Opciones...", IDM_GAME_OPTIONS
MENUITEM SEPARATOR
MENUITEM "&Salir", IDM_GAME_EXIT
Modified: trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc?rev=27949&r1=27948&r2=27949&view=diff
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc Sat Jul 28 17:03:13 2007
@@ -21,8 +21,8 @@
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 "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
+ 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
DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
PUSHBUTTON "Annuler", IDCANCEL, 101, 97, 50, 14
@@ -48,7 +48,7 @@
BEGIN
MENUITEM "&Donne\tF2", IDM_GAME_NEW
MENUITEM SEPARATOR
- MENUITEM "&Jeux...", IDM_GAME_DECK
+ MENUITEM "&Jeux...", IDM_GAME_DECK, GRAYED
MENUITEM "&Options...", IDM_GAME_OPTIONS
MENUITEM SEPARATOR
MENUITEM "&Quitter", IDM_GAME_EXIT
Modified: trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc?rev=27949&r1=27948&r2=27949&view=diff
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc Sat Jul 28 17:03:13 2007
@@ -22,8 +22,8 @@
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
+ 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
DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
PUSHBUTTON "Batal", IDCANCEL, 101, 97, 50, 14
@@ -49,7 +49,7 @@
BEGIN
MENUITEM "&Giliran\tF2", IDM_GAME_NEW
MENUITEM SEPARATOR
- MENUITEM "&Dek...", IDM_GAME_DECK
+ MENUITEM "&Dek...", IDM_GAME_DECK, GRAYED
MENUITEM "&Opsi...", IDM_GAME_OPTIONS
MENUITEM SEPARATOR
MENUITEM "&Keluar", IDM_GAME_EXIT
Modified: trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc?rev=27949&r1=27948&r2=27949&view=diff
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc Sat Jul 28 17:03:13 2007
@@ -22,8 +22,8 @@
AUTORADIOBUTTON "Girane &Una", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP
AUTORADIOBUTTON "Girane &Tre", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
- AUTOCHECKBOX "&Visualizza il tempo", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP
- AUTOCHECKBOX "&Barra di stato", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
+ 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
DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
PUSHBUTTON "Annulla", IDCANCEL, 101, 97, 50, 14
@@ -49,7 +49,7 @@
BEGIN
MENUITEM "&Dai carte\tF2", IDM_GAME_NEW
MENUITEM SEPARATOR
- MENUITEM "Maz&zo...", IDM_GAME_DECK
+ MENUITEM "Maz&zo...", IDM_GAME_DECK, GRAYED
MENUITEM "O&pzioni...", IDM_GAME_OPTIONS
MENUITEM SEPARATOR
MENUITEM "&Esci", IDM_GAME_EXIT
Modified: trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc?rev=27949&r1=27948&r2=27949&view=diff
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc Sat Jul 28 17:03:13 2007
@@ -22,8 +22,8 @@
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
+ 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
DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
PUSHBUTTON "Avbryt", IDCANCEL, 101, 97, 50, 14
@@ -49,7 +49,7 @@
BEGIN
MENUITEM "&Del ut\tF2", IDM_GAME_NEW
MENUITEM SEPARATOR
- MENUITEM "Kort&stokk...", IDM_GAME_DECK
+ MENUITEM "Kort&stokk...", IDM_GAME_DECK, GRAYED
MENUITEM "&Valg...", IDM_GAME_OPTIONS
MENUITEM SEPARATOR
MENUITEM "&Avslutt", IDM_GAME_EXIT
Modified: trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc?rev=27949&r1=27948&r2=27949&view=diff
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc Sat Jul 28 17:03:13 2007
@@ -20,8 +20,8 @@
AUTORADIOBUTTON "Rozdaj &jedn¹", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP
AUTORADIOBUTTON "Rozdaj &dwie", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
- AUTOCHECKBOX "&Pokazuj czas gry", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP
- AUTOCHECKBOX "Pokazuj pa&sek stanu", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
+ 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
DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
PUSHBUTTON "Anuluj", IDCANCEL, 101, 97, 50, 14
@@ -47,7 +47,7 @@
BEGIN
MENUITEM "&Rozdaj\tF2", IDM_GAME_NEW
MENUITEM SEPARATOR
- MENUITEM "&Talia...", IDM_GAME_DECK
+ MENUITEM "&Talia...", IDM_GAME_DECK, GRAYED
MENUITEM "&Opcje...", IDM_GAME_OPTIONS
MENUITEM SEPARATOR
MENUITEM "&Zakoñcz", IDM_GAME_EXIT
Modified: trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc?rev=27949&r1=27948&r2=27949&view=diff
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/ru-RU.rc Sat Jul 28 17:03:13 2007
@@ -16,8 +16,8 @@
AUTORADIOBUTTON "Ïî &îäíîé", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP
AUTORADIOBUTTON "Ïî &òðè", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
- AUTOCHECKBOX "&Ïîêàçûâàòü âðåìÿ", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP
- AUTOCHECKBOX "&Ñòðîêà ñîñòîÿíèÿ", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
+ AUTOCHECKBOX "&Ïîêàçûâàòü âðåìÿ", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
+ AUTOCHECKBOX "&Ñòðîêà ñîñòîÿíèÿ", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED
DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
PUSHBUTTON "Îòìåíà", IDCANCEL, 101, 97, 50, 14
@@ -43,7 +43,7 @@
BEGIN
MENUITEM "Í&îâàÿ èãðà\tF2", IDM_GAME_NEW
MENUITEM SEPARATOR
- MENUITEM "&Ïîêðûòü...", IDM_GAME_DECK
+ MENUITEM "&Ïîêðûòü...", IDM_GAME_DECK, GRAYED
MENUITEM "&Íàñòðîéêè...", IDM_GAME_OPTIONS
MENUITEM SEPARATOR
MENUITEM "&Âûõîä", IDM_GAME_EXIT
Modified: trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc?rev=27949&r1=27948&r2=27949&view=diff
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/sk-SK.rc Sat Jul 28 17:03:13 2007
@@ -23,8 +23,8 @@
AUTORADIOBUTTON "aha &jednu", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP
AUTORADIOBUTTON "aha &tri", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
- AUTOCHECKBOX "Èa&sový limit", IDC_OPT_SHOWTIME, 7 ,51 ,64 ,10, WS_TABSTOP
- AUTOCHECKBOX "Stavový riad&ok", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
+ 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
DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
PUSHBUTTON "Zruši", IDCANCEL, 101, 97, 50, 14
@@ -50,7 +50,7 @@
BEGIN
MENUITEM "&Rozda\tF2", IDM_GAME_NEW
MENUITEM SEPARATOR
- MENUITEM "&Balíèek...", IDM_GAME_DECK
+ MENUITEM "&Balíèek...", IDM_GAME_DECK, GRAYED
MENUITEM "&Možnosti...", IDM_GAME_OPTIONS
MENUITEM SEPARATOR
MENUITEM "Sk&onèi", IDM_GAME_EXIT
Modified: trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc?rev=27949&r1=27948&r2=27949&view=diff
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc Sat Jul 28 17:03:13 2007
@@ -22,8 +22,8 @@
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
+ 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
DEFPUSHBUTTON "µ¡Å§", IDOK, 35, 97, 50, 14
PUSHBUTTON "¡àÅÔ¡", IDCANCEL, 101, 97, 50, 14
@@ -49,7 +49,7 @@
BEGIN
MENUITEM "á&¨¡ä¾è\tF2", IDM_GAME_NEW
MENUITEM SEPARATOR
- MENUITEM "á&µè§ä¾è...", IDM_GAME_DECK
+ MENUITEM "á&µè§ä¾è...", IDM_GAME_DECK, GRAYED
MENUITEM "&µÑÇàÅ×Í¡...", IDM_GAME_OPTIONS
MENUITEM SEPARATOR
MENUITEM "&ÍÍ¡", IDM_GAME_EXIT
Modified: trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc?rev=27949&r1=27948&r2=27949&view=diff
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc Sat Jul 28 17:03:13 2007
@@ -21,8 +21,8 @@
AUTORADIOBUTTON "&Ïî îäí³é", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP
AUTORADIOBUTTON "Ï&î òðè", IDC_OPT_DRAWTHREE, 14, 32, 52, 10
- AUTOCHECKBOX "&Ãðà çà ÷àñîì", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP
- AUTOCHECKBOX "&Ðÿäîê ñòàíó", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP
+ AUTOCHECKBOX "&Ãðà çà ÷àñîì", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED
+ AUTOCHECKBOX "&Ðÿäîê ñòàíó", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP | WS_DISABLED
DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14
PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 101, 97, 50, 14
@@ -48,7 +48,7 @@
BEGIN
MENUITEM "&Ðîçäàòè êàðòè\tF2", IDM_GAME_NEW
MENUITEM SEPARATOR
- MENUITEM "&Êîëîäà...", IDM_GAME_DECK
+ MENUITEM "&Êîëîäà...", IDM_GAME_DECK, GRAYED
MENUITEM "&Ïàðàìåòðè...", IDM_GAME_OPTIONS
MENUITEM SEPARATOR
MENUITEM "Â&èõ³ä", IDM_GAME_EXIT
Modified: trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc?rev=27949&r1=27948&r2=27949&view=diff
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc (original)
+++ trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc Sat Jul 28 17:03:13 2007
@@ -22,8 +22,8 @@
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
+ 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
DEFPUSHBUTTON "È·¶¨", IDOK, 35, 97, 50, 14
PUSHBUTTON "È¡Ïû", IDCANCEL, 101, 97, 50, 14
@@ -49,7 +49,7 @@
BEGIN
MENUITEM "·¢ÅÆ(&D)\tF2", IDM_GAME_NEW
MENUITEM SEPARATOR
- MENUITEM "±³Ãæͼ°¸(&C)...", IDM_GAME_DECK
+ MENUITEM "±³Ãæͼ°¸(&C)...", IDM_GAME_DECK, GRAYED
MENUITEM "Ñ¡Ïî(&O)...", IDM_GAME_OPTIONS
MENUITEM SEPARATOR
MENUITEM "Í˳ö(&X)", IDM_GAME_EXIT
Modified: trunk/reactos/base/applications/games/solitaire/solgame.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/solitaire/solgame.cpp?rev=27949&r1=27948&r2=27949&view=diff
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/solgame.cpp (original)
+++ trunk/reactos/base/applications/games/solitaire/solgame.cpp Sat Jul 28 17:03:13 2007
@@ -338,7 +338,7 @@
}
else
{
- int numcards = min((nOptions & OPTION_THREE_CARDS) ? 3 : 1, cardstack.NumCards());
+ int numcards = min((dwOptions & OPTION_THREE_CARDS) ? 3 : 1, cardstack.NumCards());
//make a "visible" copy of these cards
CardStack temp;
Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/solitaire/solitaire.cpp?rev=27949&r1=27948&r2=27949&view=diff
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/solitaire.cpp (original)
+++ trunk/reactos/base/applications/games/solitaire/solitaire.cpp Sat Jul 28 17:03:13 2007
@@ -19,7 +19,7 @@
TCHAR MsgQuit[128];
TCHAR MsgAbout[128];
TCHAR MsgWin[128];
-INT nOptions = 8;
+DWORD dwOptions = 8;
CardWindow SolWnd;
@@ -28,10 +28,64 @@
void MakePath(TCHAR *szDest, UINT nDestLen, const TCHAR *szExt)
{
TCHAR *ptr;
-
+
ptr = szDest + GetModuleFileName(GetModuleHandle(0), szDest, nDestLen) - 1;
while(*ptr-- != '.');
lstrcpy(ptr + 1, szExt);
+}
+
+VOID LoadSettings(VOID)
+{
+ DWORD dwDisposition;
+ DWORD dwSize;
+ HKEY hKey;
+
+ if (RegCreateKeyEx(HKEY_CURRENT_USER,
+ _T("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Solitaire"),
+ 0,
+ NULL,
+ REG_OPTION_NON_VOLATILE,
+ KEY_READ,
+ NULL,
+ &hKey,
+ &dwDisposition))
+ return;
+
+ dwSize = sizeof(DWORD);
+ RegQueryValueEx(hKey,
+ _T("Options"),
+ NULL,
+ NULL,
+ (LPBYTE)&dwOptions,
+ &dwSize);
+
+ RegCloseKey(hKey);
+}
+
+VOID SaveSettings(VOID)
+{
+ DWORD dwDisposition;
+ HKEY hKey;
+
+ if (RegCreateKeyEx(HKEY_CURRENT_USER,
+ _T("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Solitaire"),
+ 0,
+ NULL,
+ REG_OPTION_NON_VOLATILE,
+ KEY_WRITE,
+ NULL,
+ &hKey,
+ &dwDisposition))
+ return;
+
+ RegSetValueEx(hKey,
+ _T("Options"),
+ 0,
+ REG_DWORD,
+ (CONST BYTE *)&dwOptions,
+ sizeof(DWORD));
+
+ RegCloseKey(hKey);
}
//
@@ -76,11 +130,11 @@
// InitCardLib();
-// LoadSettings();
+ LoadSettings();
//Construct the path to our help file
MakePath(szHelpPath, MAX_PATH, _T(".hlp"));
-
+
hwnd = CreateWindow(szAppName, // window class name
szAppName, // window caption
WS_OVERLAPPEDWINDOW
@@ -110,15 +164,11 @@
}
}
-// SaveSettings();
+ SaveSettings();
return msg.wParam;
}
-VOID LoadSettings(VOID)
-{
-
-}
BOOL CALLBACK OptionsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
@@ -126,7 +176,7 @@
{
case WM_INITDIALOG:
CheckRadioButton(hDlg, IDC_OPT_DRAWONE, IDC_OPT_DRAWTHREE,
- (nOptions & OPTION_THREE_CARDS) ? IDC_OPT_DRAWTHREE : IDC_OPT_DRAWONE);
+ (dwOptions & OPTION_THREE_CARDS) ? IDC_OPT_DRAWTHREE : IDC_OPT_DRAWONE);
return TRUE;
@@ -134,9 +184,9 @@
switch(LOWORD(wParam))
{
case IDOK:
- nOptions &= ~OPTION_THREE_CARDS;
+ dwOptions &= ~OPTION_THREE_CARDS;
if (IsDlgButtonChecked(hDlg, IDC_OPT_DRAWTHREE) == BST_CHECKED)
- nOptions |= OPTION_THREE_CARDS;
+ dwOptions |= OPTION_THREE_CARDS;
EndDialog(hDlg, TRUE);
return TRUE;
@@ -152,13 +202,13 @@
VOID ShowGameOptionsDlg(HWND hwnd)
{
- INT nOldOptions = nOptions;
-
- if (DialogBox(hInstance, MAKEINTRESOURCE(IDD_OPTIONS), hwnd, OptionsDlgProc))
- {
- if ((nOldOptions & OPTION_THREE_CARDS) != (nOptions & OPTION_THREE_CARDS))
- NewGame();
- }
+ DWORD dwOldOptions = dwOptions;
+
+ if (DialogBox(hInstance, MAKEINTRESOURCE(IDD_OPTIONS), hwnd, OptionsDlgProc))
+ {
+ if ((dwOldOptions & OPTION_THREE_CARDS) != (dwOptions & OPTION_THREE_CARDS))
+ NewGame();
+ }
}
//-----------------------------------------------------------------------------
@@ -214,7 +264,6 @@
return 0;
case WM_COMMAND:
-
switch(LOWORD(wParam))
{
case IDM_GAME_NEW:
@@ -246,9 +295,7 @@
return 0;
case WM_CLOSE:
-
ret = MessageBox(hwnd, MsgQuit, szAppName, MB_OKCANCEL|MB_ICONQUESTION);
-
if(ret == IDOK)
{
WinHelp(hwnd, szHelpPath, HELP_QUIT, 0);
Modified: trunk/reactos/base/applications/games/solitaire/solitaire.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/solitaire/solitaire.h?rev=27949&r1=27948&r2=27949&view=diff
==============================================================================
--- trunk/reactos/base/applications/games/solitaire/solitaire.h (original)
+++ trunk/reactos/base/applications/games/solitaire/solitaire.h Sat Jul 28 17:03:13 2007
@@ -7,7 +7,7 @@
#define OPTION_THREE_CARDS 8
-extern INT nOptions;
+extern DWORD dwOptions;
void CreateSol();
void NewGame(void);
More information about the Ros-diffs
mailing list