Author: ekohl Date: Sun Jun 3 15:58:45 2007 New Revision: 26972
URL: http://svn.reactos.org/svn/reactos?rev=26972&view=rev Log: - Removed unused dialog resource and MSVC rubbish. - Use a more descriptive id for the icon.
Modified: trunk/reactos/base/applications/games/solitaire/lang/de-DE.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/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/resource.h trunk/reactos/base/applications/games/solitaire/rsrc.rc trunk/reactos/base/applications/games/solitaire/solitaire.cpp
Modified: trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sol... ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/de-DE.rc Sun Jun 3 15:58:45 2007 @@ -7,42 +7,16 @@ */ #include "resource.h"
-#define APSTUDIO_READONLY_SYMBOLS +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
-/* winemaker: #include "afxres.h" */ -/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */ -#include "winres.h"
-///// +/* Dialogs */
-#undef APSTUDIO_READONLY_SYMBOLS - -///// -// German resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) -#ifdef _WIN32 -LANGUAGE LANG_GERMAN, SUBLANG_GERMAN -#pragma code_page(1252) -#endif //_WIN32 - -///// -// Dialog - -IDD_DIALOG1 DIALOGEX DISCARDABLE 0, 0, 186, 95 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Dialog" -FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT -BEGIN - DEFPUSHBUTTON "OK",IDOK,129,7,50,14 - PUSHBUTTON "Abbrechen",IDCANCEL,129,24,50,14 -END - -IDD_OPTIONS DIALOG DISCARDABLE 0, 0, 186, 118 +IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Optionen" FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT BEGIN GROUPBOX "Karten", -1, 7, 7, 65, 40 AUTORADIOBUTTON "&Eine ziehen", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP @@ -56,6 +30,8 @@ END
+/* Strings */ + STRINGTABLE BEGIN IDS_SOL_NAME "Solitaire" @@ -63,89 +39,32 @@ IDS_SOL_QUIT "Quit the current game?" END
-///// -// DESIGNINFO
-#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_DIALOG1, DIALOGEX - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 179 - TOPMARGIN, 7 - BOTTOMMARGIN, 88 - END -END -#endif // APSTUDIO_INVOKED +/* Menus */
- -#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 - - -///// -// Menu - -IDR_MENU1 MENU DISCARDABLE +IDR_MENU1 MENU DISCARDABLE BEGIN POPUP "&Spiel" BEGIN - MENUITEM "&Karten geben\t F2", IDM_GAME_NEW + MENUITEM "&Karten geben\t F2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "&Deckblatt...", IDM_GAME_DECK - MENUITEM "&Optionen...", IDM_GAME_OPTIONS + MENUITEM "&Deckblatt...", IDM_GAME_DECK + MENUITEM "&Optionen...", IDM_GAME_OPTIONS MENUITEM SEPARATOR - MENUITEM "&Beenden", IDM_GAME_EXIT + MENUITEM "&Beenden", IDM_GAME_EXIT END POPUP "&?" BEGIN MENUITEM "&Inhalt\tF1", IDM_HELP_CONTENTS - MENUITEM "Inf&o", IDM_HELP_ABOUT + MENUITEM "Inf&o", IDM_HELP_ABOUT END END
-///// -// Accelerator
-IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE +/* Accelerators */ + +IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE BEGIN VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT END - - -///// -// Icon - -IDI_ICON1 ICON DISCARDABLE "solitaire.ico" -#endif // German resources - -///// - - -#ifndef APSTUDIO_INVOKED - -///// -#endif // not APSTUDIO_INVOKED
Modified: trunk/reactos/base/applications/games/solitaire/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sol... ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/en-US.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/en-US.rc Sun Jun 3 15:58:45 2007 @@ -7,43 +7,16 @@ */ #include "resource.h"
-#define APSTUDIO_READONLY_SYMBOLS - -/* 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 - -///// -// English (U.K.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) -#ifdef _WIN32 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -///// -// Dialog - -IDD_DIALOG1 DIALOGEX DISCARDABLE 0, 0, 186, 95 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Dialog" -FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT -BEGIN - DEFPUSHBUTTON "OK",IDOK,129,7,50,14 - PUSHBUTTON "Cancel",IDCANCEL,129,24,50,14 -END
-IDD_OPTIONS DIALOG DISCARDABLE 0, 0, 186, 118 +/* Dialogs */ + +IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Options" FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT BEGIN GROUPBOX "Cards", -1, 7, 7, 65, 40 AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP @@ -56,6 +29,9 @@ PUSHBUTTON "Cancel", IDCANCEL, 101, 97, 50, 14 END
+ +/* Strings */ + STRINGTABLE BEGIN IDS_SOL_NAME "Solitaire" @@ -64,52 +40,9 @@ END
-///// -// DESIGNINFO +/* Menus */
-#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_DIALOG1, DIALOGEX - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 179 - TOPMARGIN, 7 - BOTTOMMARGIN, 88 - END -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 - - -///// -// Menu - -IDR_MENU1 MENU DISCARDABLE +IDR_MENU1 MENU DISCARDABLE BEGIN POPUP "&Game" BEGIN @@ -127,26 +60,12 @@ END END
-///// -// Accelerator
-IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE + +/* Accelerator */ + +IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE BEGIN VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT END - - -///// -// Icon - -IDI_ICON1 ICON DISCARDABLE "solitaire.ico" -#endif // English (U.K.) resources - -///// - - -#ifndef APSTUDIO_INVOKED - -///// -#endif // not APSTUDIO_INVOKED
Modified: trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sol... ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/es-ES.rc Sun Jun 3 15:58:45 2007 @@ -7,42 +7,16 @@ */ #include "resource.h"
-#define APSTUDIO_READONLY_SYMBOLS +LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
-/* winemaker: #include "afxres.h" */ -/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */ -#include "winres.h"
-///// +/* Dialogs */
-#undef APSTUDIO_READONLY_SYMBOLS - -///// -// Spanish (Spain) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) -#ifdef _WIN32 -LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL -#pragma code_page(1252) -#endif //_WIN32 - -///// -// Dialog - -IDD_DIALOG1 DIALOGEX DISCARDABLE 0, 0, 186, 95 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Dialogo" -FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT -BEGIN - DEFPUSHBUTTON "Aceptar",IDOK,129,7,50,14 - PUSHBUTTON "Cancelar",IDCANCEL,129,24,50,14 -END - -IDD_OPTIONS DIALOG DISCARDABLE 0, 0, 186, 118 +IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Options" FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT BEGIN GROUPBOX "Cards", -1, 7, 7, 65, 40 AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP @@ -51,10 +25,12 @@ 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 "Cancel", IDCANCEL, 101, 97, 50, 14 + DEFPUSHBUTTON "Aceptar", IDOK, 35, 97, 50, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 101, 97, 50, 14 END
+ +/* Strings */
STRINGTABLE BEGIN @@ -63,52 +39,10 @@ IDS_SOL_QUIT "Quit the current game?" END
-///// -// DESIGNINFO
-#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_DIALOG1, DIALOGEX - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 179 - TOPMARGIN, 7 - BOTTOMMARGIN, 88 - END -END -#endif // APSTUDIO_INVOKED +/* Menus */
- -#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 - - -///// -// Menu - -IDR_MENU1 MENU DISCARDABLE +IDR_MENU1 MENU DISCARDABLE BEGIN POPUP "&Juego" BEGIN @@ -126,26 +60,11 @@ END END
-///// -// Accelerator
-IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE +/* Accelerator */ + +IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE BEGIN VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT END - - -///// -// Icon - -IDI_ICON1 ICON DISCARDABLE "solitaire.ico" -#endif // Spanish (Spain) resources - -///// - - -#ifndef APSTUDIO_INVOKED - -///// -#endif // not APSTUDIO_INVOKED
Modified: trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sol... ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc Sun Jun 3 15:58:45 2007 @@ -7,43 +7,16 @@ */ #include "resource.h"
-#define APSTUDIO_READONLY_SYMBOLS - -/* 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 - -///// -// French resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) -#ifdef _WIN32 LANGUAGE LANG_FRENCH, SUBLANG_FRENCH -#pragma code_page(1252) -#endif //_WIN32 - -///// -// Dialog - -IDD_DIALOG1 DIALOGEX DISCARDABLE 0, 0, 186, 95 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Dialog" -FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT -BEGIN - DEFPUSHBUTTON "OK",IDOK,129,7,50,14 - PUSHBUTTON "Annuler",IDCANCEL,129,24,50,14 -END
-IDD_OPTIONS DIALOG DISCARDABLE 0, 0, 186, 118 +/* Dialogs */ + +IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Options" FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT BEGIN GROUPBOX "Cartes", -1, 7, 7, 65, 40 AUTORADIOBUTTON "En tirer une", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP @@ -56,6 +29,9 @@ PUSHBUTTON "Annuler", IDCANCEL, 101, 97, 50, 14 END
+ +/* Strings */ + STRINGTABLE BEGIN IDS_SOL_NAME "Solitaire" @@ -64,88 +40,31 @@ END
-///// -// DESIGNINFO +/* Menus */
-#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_DIALOG1, DIALOGEX - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 179 - TOPMARGIN, 7 - BOTTOMMARGIN, 88 - END -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 - - -///// -// Menu - -IDR_MENU1 MENU DISCARDABLE +IDR_MENU1 MENU DISCARDABLE BEGIN POPUP "&Partie" BEGIN - MENUITEM "&Donne\tF2", IDM_GAME_NEW + MENUITEM "&Donne\tF2", IDM_GAME_NEW MENUITEM SEPARATOR MENUITEM "&Jeux...", IDM_GAME_DECK MENUITEM "&Options...", IDM_GAME_OPTIONS MENUITEM SEPARATOR - MENUITEM "&Quitter", IDM_GAME_EXIT + MENUITEM "&Quitter", IDM_GAME_EXIT END POPUP "&Aide" BEGIN MENUITEM "&Sommaire\tF1", IDM_HELP_CONTENTS - MENUITEM "&À propos", IDM_HELP_ABOUT + MENUITEM "&À propos", IDM_HELP_ABOUT END END
-///// -// Accelerator
-IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE +/* Accelerator */ + +IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE BEGIN VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT END - - -///// -// Icon - -IDI_ICON1 ICON DISCARDABLE "solitaire.ico" -#endif // French resources - -///// - - -#ifndef APSTUDIO_INVOKED - -///// -#endif // not APSTUDIO_INVOKED
Modified: trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sol... ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/id-ID.rc Sun Jun 3 15:58:45 2007 @@ -8,42 +8,16 @@
#include "resource.h"
-#define APSTUDIO_READONLY_SYMBOLS +LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT
-/* winemaker: #include "afxres.h" */ -/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */ -#include "winres.h"
-///// +/* Dialogs */
-#undef APSTUDIO_READONLY_SYMBOLS - -///// -// Indonesian resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) -#ifdef _WIN32 -LANGUAGE LANG_INDONESIAN, SUBLANG_DEFAULT -#pragma code_page(1252) -#endif //_WIN32 - -///// -// Dialog - -IDD_DIALOG1 DIALOGEX DISCARDABLE 0, 0, 186, 95 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Dialog" -FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT -BEGIN - DEFPUSHBUTTON "OK",IDOK,129,7,50,14 - PUSHBUTTON "Batal",IDCANCEL,129,24,50,14 -END - -IDD_OPTIONS DIALOG DISCARDABLE 0, 0, 186, 118 +IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Options" FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT BEGIN GROUPBOX "Cards", -1, 7, 7, 65, 40 AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP @@ -53,9 +27,11 @@ 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 + PUSHBUTTON "Batal", IDCANCEL, 101, 97, 50, 14 END
+ +/* Strings */
STRINGTABLE BEGIN @@ -64,52 +40,10 @@ IDS_SOL_QUIT "Quit the current game?" END
-///// -// DESIGNINFO
-#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_DIALOG1, DIALOGEX - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 179 - TOPMARGIN, 7 - BOTTOMMARGIN, 88 - END -END -#endif // APSTUDIO_INVOKED +/* Menus */
- -#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 - - -///// -// Menu - -IDR_MENU1 MENU DISCARDABLE +IDR_MENU1 MENU DISCARDABLE BEGIN POPUP "&Game" BEGIN @@ -127,26 +61,11 @@ END END
-///// -// Accelerator
-IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE +/* Accelerator */ + +IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE BEGIN VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT END - - -///// -// Icon - -IDI_ICON1 ICON DISCARDABLE "solitaire.ico" -#endif // Indonesian resources - -///// - - -#ifndef APSTUDIO_INVOKED - -///// -#endif // not APSTUDIO_INVOKED
Modified: trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sol... ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/it-IT.rc Sun Jun 3 15:58:45 2007 @@ -7,42 +7,16 @@ */ #include "resource.h"
-#define APSTUDIO_READONLY_SYMBOLS +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
-/* winemaker: #include "afxres.h" */ -/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */ -#include "winres.h"
-///// +/* Dialogs */
-#undef APSTUDIO_READONLY_SYMBOLS - -///// -// English (U.K.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) -#ifdef _WIN32 -LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL -#pragma code_page(1252) -#endif //_WIN32 - -///// -// Dialog - -IDD_DIALOG1 DIALOGEX DISCARDABLE 0, 0, 186, 95 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Dialog" -FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT -BEGIN - DEFPUSHBUTTON "OK",IDOK,129,7,50,14 - PUSHBUTTON "Annulla",IDCANCEL,129,24,50,14 -END - -IDD_OPTIONS DIALOG DISCARDABLE 0, 0, 186, 118 +IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Options" FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT BEGIN GROUPBOX "Cards", -1, 7, 7, 65, 40 AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP @@ -52,9 +26,11 @@ 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 + PUSHBUTTON "Annulla", IDCANCEL, 101, 97, 50, 14 END
+ +/* Strings */
STRINGTABLE BEGIN @@ -63,52 +39,10 @@ IDS_SOL_QUIT "Quit the current game?" END
-///// -// DESIGNINFO
-#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_DIALOG1, DIALOGEX - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 179 - TOPMARGIN, 7 - BOTTOMMARGIN, 88 - END -END -#endif // APSTUDIO_INVOKED +/* Menus */
- -#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 - - -///// -// Menu - -IDR_MENU1 MENU DISCARDABLE +IDR_MENU1 MENU DISCARDABLE BEGIN POPUP "&Partita" BEGIN @@ -126,26 +60,11 @@ END END
-///// -// Accelerator
-IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE +/* Accelerator */ + +IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE BEGIN VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT END - - -///// -// Icon - -IDI_ICON1 ICON DISCARDABLE "solitaire.ico" -#endif // Italian resources - -///// - - -#ifndef APSTUDIO_INVOKED - -///// -#endif // not APSTUDIO_INVOKED
Modified: trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sol... ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/nb-NO.rc Sun Jun 3 15:58:45 2007 @@ -8,42 +8,16 @@
#include "resource.h"
-#define APSTUDIO_READONLY_SYMBOLS +LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
-/* winemaker: #include "afxres.h" */ -/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */ -#include "winres.h"
-///// +/* Dialogs */
-#undef APSTUDIO_READONLY_SYMBOLS - -///// -// Norwegian resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) -#ifdef _WIN32 -LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL -#pragma code_page(1252) -#endif //_WIN32 - -///// -// Dialog - -IDD_DIALOG1 DIALOGEX DISCARDABLE 0, 0, 186, 95 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Dialog" -FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT -BEGIN - DEFPUSHBUTTON "OK",IDOK,129,7,50,14 - PUSHBUTTON "Avbryt",IDCANCEL,129,24,50,14 -END - -IDD_OPTIONS DIALOG DISCARDABLE 0, 0, 186, 118 +IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Options" FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT BEGIN GROUPBOX "Cards", -1, 7, 7, 65, 40 AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP @@ -53,9 +27,11 @@ 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 + PUSHBUTTON "Avbryt", IDCANCEL, 101, 97, 50, 14 END
+ +/* Strings */
STRINGTABLE BEGIN @@ -64,52 +40,10 @@ IDS_SOL_QUIT "Quit the current game?" END
-///// -// DESIGNINFO
-#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_DIALOG1, DIALOGEX - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 179 - TOPMARGIN, 7 - BOTTOMMARGIN, 88 - END -END -#endif // APSTUDIO_INVOKED +/* Menus */
- -#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 - - -///// -// Menu - -IDR_MENU1 MENU DISCARDABLE +IDR_MENU1 MENU DISCARDABLE BEGIN POPUP "&Spill" BEGIN @@ -127,26 +61,11 @@ END END
-///// -// Accelerator
-IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE +/* Accelerator */ + +IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE BEGIN VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT END - - -///// -// Icon - -IDI_ICON1 ICON DISCARDABLE "solitaire.ico" -#endif // Norwegian resource - -///// - - -#ifndef APSTUDIO_INVOKED - -///// -#endif // not APSTUDIO_INVOKED
Modified: trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sol... ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/pl-PL.rc Sun Jun 3 15:58:45 2007 @@ -6,42 +6,16 @@
#include "resource.h"
-#define APSTUDIO_READONLY_SYMBOLS +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
-/* winemaker: #include "afxres.h" */ -/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */ -#include "winres.h"
-///// +/* Dialogs */
-#undef APSTUDIO_READONLY_SYMBOLS - -///// -// English (U.K.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) -#ifdef _WIN32 -LANGUAGE LANG_POLISH, SUBLANG_DEFAULT -#pragma code_page(1250) -#endif //_WIN32 - -///// -// Dialog - -IDD_DIALOG1 DIALOGEX DISCARDABLE 0, 0, 186, 95 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Dialog" -FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT -BEGIN -DEFPUSHBUTTON "OK",IDOK,129,7,50,14 -PUSHBUTTON "Anuluj",IDCANCEL,129,24,50,14 -END - -IDD_OPTIONS DIALOG DISCARDABLE 0, 0, 186, 118 +IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Options" FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT BEGIN GROUPBOX "Cards", -1, 7, 7, 65, 40 AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP @@ -51,9 +25,11 @@ 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 + PUSHBUTTON "Anuluj", IDCANCEL, 101, 97, 50, 14 END
+ +/* Strings */
STRINGTABLE BEGIN @@ -62,89 +38,32 @@ IDS_SOL_QUIT "Quit the current game?" END
-///// -// DESIGNINFO
-#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN -IDD_DIALOG1, DIALOGEX -BEGIN -LEFTMARGIN, 7 -RIGHTMARGIN, 179 -TOPMARGIN, 7 -BOTTOMMARGIN, 88 -END -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 - - -///// -// Menu +/* Menu */
IDR_MENU1 MENU DISCARDABLE BEGIN -POPUP "&Gra" -BEGIN -MENUITEM "&Rozdaj\tF2", IDM_GAME_NEW -MENUITEM SEPARATOR -MENUITEM "&Talia...", IDM_GAME_DECK -MENUITEM "&Opcje...", IDM_GAME_OPTIONS -MENUITEM SEPARATOR -MENUITEM "&Zakoñcz", IDM_GAME_EXIT -END -POPUP "Pomo&c" -BEGIN -MENUITEM "&Spis treci\tF1", IDM_HELP_CONTENTS -MENUITEM "Solit&aire - informacje", IDM_HELP_ABOUT -END + POPUP "&Gra" + BEGIN + MENUITEM "&Rozdaj\tF2", IDM_GAME_NEW + MENUITEM SEPARATOR + MENUITEM "&Talia...", IDM_GAME_DECK + MENUITEM "&Opcje...", IDM_GAME_OPTIONS + MENUITEM SEPARATOR + MENUITEM "&Zakoñcz", IDM_GAME_EXIT + END + POPUP "Pomo&c" + BEGIN + MENUITEM "&Spis treci\tF1", IDM_HELP_CONTENTS + MENUITEM "Solit&aire - informacje", IDM_HELP_ABOUT + END END
-///// -// Accelerator + +/* Accelerator */
IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE BEGIN -VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT -VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT + VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT + VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT END - - -///// -// Icon - -IDI_ICON1 ICON DISCARDABLE "solitaire.ico" -#endif // English (U.K.) resources - -///// - - -#ifndef APSTUDIO_INVOKED - -///// -#endif // not APSTUDIO_INVOKED
Modified: trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sol... ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/th-TH.rc Sun Jun 3 15:58:45 2007 @@ -8,42 +8,16 @@
#include "resource.h"
-#define APSTUDIO_READONLY_SYMBOLS +LANGUAGE LANG_THAI, SUBLANG_DEFAULT
-/* winemaker: #include "afxres.h" */ -/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */ -#include "winres.h"
-///// +/* Dialogs */
-#undef APSTUDIO_READONLY_SYMBOLS - -///// -// Thai resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) -#ifdef _WIN32 -LANGUAGE LANG_THAI, SUBLANG_DEFAULT -#pragma code_page(874) -#endif //_WIN32 - -///// -// Dialog - -IDD_DIALOG1 DIALOGEX DISCARDABLE 0, 0, 186, 95 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Dialog" -FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT -BEGIN - DEFPUSHBUTTON "µ¡Å§", IDOK, 129,7,50,14 - PUSHBUTTON "¡àÅÔ¡", IDCANCEL, 129,24,50,14 -END - -IDD_OPTIONS DIALOG DISCARDABLE 0, 0, 186, 118 +IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Options" FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT BEGIN GROUPBOX "Cards", -1, 7, 7, 65, 40 AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP @@ -52,10 +26,12 @@ 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 "Cancel", IDCANCEL, 101, 97, 50, 14 + DEFPUSHBUTTON "µ¡Å§", IDOK, 35, 97, 50, 14 + PUSHBUTTON "¡àÅÔ¡", IDCANCEL, 101, 97, 50, 14 END
+ +/* Strings */
STRINGTABLE BEGIN @@ -64,50 +40,8 @@ IDS_SOL_QUIT "Quit the current game?" END
-///// -// DESIGNINFO
-#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_DIALOG1, DIALOGEX - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 179 - TOPMARGIN, 7 - BOTTOMMARGIN, 88 - END -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 - - -///// -// Menu +/* Menus */
IDR_MENU1 MENU DISCARDABLE BEGIN @@ -127,26 +61,11 @@ END END
-///// -// Accelerator
-IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE +/* Accelerators */ + +IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE BEGIN VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT END - - -///// -// Icon - -IDI_ICON1 ICON DISCARDABLE "solitaire.ico" -#endif // Thai resources - -///// - - -#ifndef APSTUDIO_INVOKED - -///// -#endif // not APSTUDIO_INVOKED
Modified: trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sol... ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/uk-UA.rc Sun Jun 3 15:58:45 2007 @@ -7,42 +7,16 @@ */ #include "resource.h"
-#define APSTUDIO_READONLY_SYMBOLS +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
-/* winemaker: #include "afxres.h" */ -/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */ -#include "winres.h"
-///// +/* Dialogs */
-#undef APSTUDIO_READONLY_SYMBOLS - -///// -// Ukraianian resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) -#ifdef _WIN32 -LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT -#pragma code_page(1251) -#endif //_WIN32 - -///// -// Dialog - -IDD_DIALOG1 DIALOGEX DISCARDABLE 0, 0, 186, 95 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Dialog" -FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT -BEGIN - DEFPUSHBUTTON "OK",IDOK,129,7,50,14 - PUSHBUTTON "Ñêàñóâàòè",IDCANCEL,129,24,50,14 -END - -IDD_OPTIONS DIALOG DISCARDABLE 0, 0, 186, 118 +IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Options" FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT BEGIN GROUPBOX "Cards", -1, 7, 7, 65, 40 AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP @@ -52,9 +26,11 @@ 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 + PUSHBUTTON "Ñêàñóâàòè", IDCANCEL, 101, 97, 50, 14 END
+ +/* Strings */
STRINGTABLE BEGIN @@ -63,52 +39,10 @@ IDS_SOL_QUIT "Quit the current game?" END
-///// -// DESIGNINFO
-#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_DIALOG1, DIALOGEX - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 179 - TOPMARGIN, 7 - BOTTOMMARGIN, 88 - END -END -#endif // APSTUDIO_INVOKED +/* Menus */
- -#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 - - -///// -// Menu - -IDR_MENU1 MENU DISCARDABLE +IDR_MENU1 MENU DISCARDABLE BEGIN POPUP "&Ãðà" BEGIN @@ -126,26 +60,11 @@ END END
-///// -// Accelerator
-IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE +/* Accelerators */ + +IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE BEGIN VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT END - - -///// -// Icon - -IDI_ICON1 ICON DISCARDABLE "solitaire.ico" -#endif // Ukraianian resources - -///// - - -#ifndef APSTUDIO_INVOKED - -///// -#endif // not APSTUDIO_INVOKED
Modified: trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sol... ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc (original) +++ trunk/reactos/base/applications/games/solitaire/lang/zh-CN.rc Sun Jun 3 15:58:45 2007 @@ -8,42 +8,16 @@
#include "resource.h"
-#define APSTUDIO_READONLY_SYMBOLS +LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
-/* winemaker: #include "afxres.h" */ -/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */ -#include "winres.h"
-///// +/* Dialogs */
-#undef APSTUDIO_READONLY_SYMBOLS - -///// -// ¼òÌåÖÐÎÄ×ÊÔ´ - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG) -#ifdef _WIN32 -LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED -#pragma code_page(936) -#endif //_WIN32 - -///// -// Dialog - -IDD_DIALOG1 DIALOGEX DISCARDABLE 0, 0, 186, 95 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Dialog" -FONT 8, "MS Shell Dlg" -EXSTYLE DS_SHELLFONT -BEGIN - DEFPUSHBUTTON "È·¶¨", IDOK, 129, 7, 50, 14 - PUSHBUTTON "È¡Ïû", IDCANCEL, 129, 24, 50, 14 -END - -IDD_OPTIONS DIALOG DISCARDABLE 0, 0, 186, 118 +IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 186, 118 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Options" FONT 8, "MS Shell Dlg" +EXSTYLE DS_SHELLFONT BEGIN GROUPBOX "Cards", -1, 7, 7, 65, 40 AUTORADIOBUTTON "Draw &One", IDC_OPT_DRAWONE, 14, 19, 52, 10, WS_GROUP | WS_TABSTOP @@ -52,10 +26,12 @@ 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 "Cancel", IDCANCEL, 101, 97, 50, 14 + DEFPUSHBUTTON "È·¶¨", IDOK, 35, 97, 50, 14 + PUSHBUTTON "È¡Ïû", IDCANCEL, 101, 97, 50, 14 END
+ +/* Strings */
STRINGTABLE BEGIN @@ -64,52 +40,10 @@ IDS_SOL_QUIT "Quit the current game?" END
-///// -// DESIGNINFO
-#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_DIALOG1, DIALOGEX - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 179 - TOPMARGIN, 7 - BOTTOMMARGIN, 88 - END -END -#endif // APSTUDIO_INVOKED +/* Menus */
- -#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 - - -///// -// Menu - -IDR_MENU1 MENU DISCARDABLE +IDR_MENU1 MENU DISCARDABLE BEGIN POPUP "ÓÎÏ·(&G)" BEGIN @@ -127,26 +61,11 @@ END END
-///// -// Accelerator
-IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE +/* Accelerator */ + +IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE BEGIN VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT END - - -///// -// Icon - -IDI_ICON1 ICON DISCARDABLE "solitaire.ico" -#endif // ÖÐÎÄ×ÊÔ´ - -///// - - -#ifndef APSTUDIO_INVOKED - -///// -#endif // not APSTUDIO_INVOKED
Modified: trunk/reactos/base/applications/games/solitaire/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sol... ============================================================================== --- trunk/reactos/base/applications/games/solitaire/resource.h (original) +++ trunk/reactos/base/applications/games/solitaire/resource.h Sun Jun 3 15:58:45 2007 @@ -1,37 +1,27 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Developer Studio generated include file. -// Used by rsrc.rc -// -#define IDD_DIALOG1 101 + +/* Icon */ +#define IDI_SOLITAIRE 100 + #define IDR_MENU1 102 #define IDR_ACCELERATOR1 103
-#define IDI_ICON1 1004
-#define IDM_GAME_NEW 40001 -#define IDM_GAME_DECK 40002 -#define IDM_GAME_OPTIONS 40003 -#define IDM_GAME_EXIT 40004 -#define IDM_HELP_CONTENTS 40005 -#define IDM_HELP_ABOUT 40006 +/* Menu */ +#define IDM_GAME_NEW 1001 +#define IDM_GAME_DECK 1002 +#define IDM_GAME_OPTIONS 1003 +#define IDM_GAME_EXIT 1004 +#define IDM_HELP_CONTENTS 1005 +#define IDM_HELP_ABOUT 1006
+/* Dialogs */ #define IDD_OPTIONS 1200 #define IDC_OPT_DRAWONE 1201 #define IDC_OPT_DRAWTHREE 1202 #define IDC_OPT_SHOWTIME 1203 #define IDC_OPT_STATUSBAR 1204
+/* Strings */ #define IDS_SOL_NAME 1300 #define IDS_SOL_ABOUT 1301 #define IDS_SOL_QUIT 1302 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 105 -#define _APS_NEXT_COMMAND_VALUE 40007 -#define _APS_NEXT_CONTROL_VALUE 1000 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif
Modified: trunk/reactos/base/applications/games/solitaire/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sol... ============================================================================== --- trunk/reactos/base/applications/games/solitaire/rsrc.rc (original) +++ trunk/reactos/base/applications/games/solitaire/rsrc.rc Sun Jun 3 15:58:45 2007 @@ -1,5 +1,9 @@ #include <windows.h> #include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +IDI_SOLITAIRE ICON DISCARDABLE "solitaire.ico"
#include "lang/de-DE.rc" #include "lang/en-US.rc"
Modified: trunk/reactos/base/applications/games/solitaire/solitaire.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sol... ============================================================================== --- trunk/reactos/base/applications/games/solitaire/solitaire.cpp (original) +++ trunk/reactos/base/applications/games/solitaire/solitaire.cpp Sun Jun 3 15:58:45 2007 @@ -64,12 +64,12 @@ wndclass.cbClsExtra = 0; wndclass.cbWndExtra = 0; wndclass.hInstance = hInst; - wndclass.hIcon = LoadIcon (hInst, MAKEINTRESOURCE(IDI_ICON1)); + wndclass.hIcon = LoadIcon (hInst, MAKEINTRESOURCE(IDI_SOLITAIRE)); wndclass.hCursor = LoadCursor (NULL, IDC_ARROW); wndclass.hbrBackground = (HBRUSH)NULL; wndclass.lpszMenuName = MAKEINTRESOURCE(IDR_MENU1); wndclass.lpszClassName = szAppName; - wndclass.hIconSm = (HICON)LoadImage(hInst, MAKEINTRESOURCE(IDI_ICON1), IMAGE_ICON, 16, 16, 0); + wndclass.hIconSm = (HICON)LoadImage(hInst, MAKEINTRESOURCE(IDI_SOLITAIRE), IMAGE_ICON, 16, 16, 0);
RegisterClassEx(&wndclass);