Update the solitaire icon, the icon file is from the http://tango-project.org icon-set

(note: the 32x32 version is based on the 22x22 version, I will fix this as soon as possible)

svn path=/trunk/; revision=21230

diff --git a/reactos/base/applications/games/solitaire/icon1.ico b/reactos/base/applications/games/solitaire/icon1.ico
deleted file mode 100644 (file)
index 92bcf50..0000000
Binary files a/reactos/base/applications/games/solitaire/icon1.ico and /dev/null differ

diff --git a/reactos/base/applications/games/solitaire/sol.rc b/reactos/base/applications/games/solitaire/sol.rc
index cfc0760..021bbc0 100644 (file)
--- a/reactos/base/applications/games/solitaire/sol.rc
+++ b/reactos/base/applications/games/solitaire/sol.rc
@@ -1,144 +1,144 @@
-//Microsoft Developer Studio generated resource script.
-//
-#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
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.K.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_DIALOG1 DIALOG DISCARDABLE  0, 0, 186, 95
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Dialog"
-FONT 8, "MS Sans Serif"
-BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,129,7,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,129,24,50,14
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO DISCARDABLE 
-BEGIN
-    IDD_DIALOG1, DIALOG
-    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 
-BEGIN
-    POPUP "&Game"
-    BEGIN
-        MENUITEM "&Deal\tF2",                   IDM_GAME_NEW
-        MENUITEM SEPARATOR
-        MENUITEM "De&ck...",                    IDM_GAME_DECK
-        MENUITEM "&Options...",                 IDM_GAME_OPTIONS
-        MENUITEM SEPARATOR
-        MENUITEM "&Exit",                       IDM_GAME_EXIT
-    END
-    POPUP "&Help"
-    BEGIN
-        MENUITEM "&Contents\tF1",               IDM_HELP_CONTENTS
-        MENUITEM "&About",                      IDM_HELP_ABOUT
-    END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Accelerator
-//
-
-IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE 
-BEGIN
-    VK_F1,          IDM_HELP_CONTENTS,      VIRTKEY, NOINVERT
-    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     "icon1.ico"
-#endif    // English (U.K.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
+//Microsoft Developer Studio generated resource script.\r
+//\r
+#include "resource.h"\r
+\r
+#define APSTUDIO_READONLY_SYMBOLS\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// Generated from the TEXTINCLUDE 2 resource.\r
+//\r
+/* winemaker: #include "afxres.h" */\r
+/* winemaker:warning: 'afxres.h' is an MFC specific header. Replacing it with 'winres.h' */\r
+#include "winres.h"\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+#undef APSTUDIO_READONLY_SYMBOLS\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+// English (U.K.) resources\r
+\r
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)\r
+#ifdef _WIN32\r
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK\r
+#pragma code_page(1252)\r
+#endif //_WIN32\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// Dialog\r
+//\r
+\r
+IDD_DIALOG1 DIALOG DISCARDABLE  0, 0, 186, 95\r
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
+CAPTION "Dialog"\r
+FONT 8, "MS Sans Serif"\r
+BEGIN\r
+    DEFPUSHBUTTON   "OK",IDOK,129,7,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,129,24,50,14\r
+END\r
+\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// DESIGNINFO\r
+//\r
+\r
+#ifdef APSTUDIO_INVOKED\r
+GUIDELINES DESIGNINFO DISCARDABLE \r
+BEGIN\r
+    IDD_DIALOG1, DIALOG\r
+    BEGIN\r
+        LEFTMARGIN, 7\r
+        RIGHTMARGIN, 179\r
+        TOPMARGIN, 7\r
+        BOTTOMMARGIN, 88\r
+    END\r
+END\r
+#endif    // APSTUDIO_INVOKED\r
+\r
+\r
+#ifdef APSTUDIO_INVOKED\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// TEXTINCLUDE\r
+//\r
+\r
+1 TEXTINCLUDE DISCARDABLE \r
+BEGIN\r
+    "resource.h\0"\r
+END\r
+\r
+2 TEXTINCLUDE DISCARDABLE \r
+BEGIN\r
+    "#include ""winres.h""\r\n"\r
+    "\0"\r
+END\r
+\r
+3 TEXTINCLUDE DISCARDABLE \r
+BEGIN\r
+    "\r\n"\r
+    "\0"\r
+END\r
+\r
+#endif    // APSTUDIO_INVOKED\r
+\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// Menu\r
+//\r
+\r
+IDR_MENU1 MENU DISCARDABLE \r
+BEGIN\r
+    POPUP "&Game"\r
+    BEGIN\r
+        MENUITEM "&Deal\tF2",                   IDM_GAME_NEW\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "De&ck...",                    IDM_GAME_DECK\r
+        MENUITEM "&Options...",                 IDM_GAME_OPTIONS\r
+        MENUITEM SEPARATOR\r
+        MENUITEM "&Exit",                       IDM_GAME_EXIT\r
+    END\r
+    POPUP "&Help"\r
+    BEGIN\r
+        MENUITEM "&Contents\tF1",               IDM_HELP_CONTENTS\r
+        MENUITEM "&About",                      IDM_HELP_ABOUT\r
+    END\r
+END\r
+\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// Accelerator\r
+//\r
+\r
+IDR_ACCELERATOR1 ACCELERATORS DISCARDABLE \r
+BEGIN\r
+    VK_F1,          IDM_HELP_CONTENTS,      VIRTKEY, NOINVERT\r
+    VK_F2,          IDM_GAME_NEW,           VIRTKEY, NOINVERT\r
+END\r
+\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// Icon\r
+//\r
+\r
+// Icon with lowest ID value placed first to ensure application icon\r
+// remains consistent on all systems.\r
+IDI_ICON1               ICON    DISCARDABLE     "solitaire.ico"\r
+#endif    // English (U.K.) resources\r
+/////////////////////////////////////////////////////////////////////////////\r
+\r
+\r
+\r
+#ifndef APSTUDIO_INVOKED\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// Generated from the TEXTINCLUDE 3 resource.\r
+//\r
+\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+#endif    // not APSTUDIO_INVOKED\r
+\r

diff --git a/reactos/base/applications/games/solitaire/solitaire.ico b/reactos/base/applications/games/solitaire/solitaire.ico
new file mode 100644 (file)
index 0000000..6c4f1a2
Binary files /dev/null and b/reactos/base/applications/games/solitaire/solitaire.ico differ