From d149b546b09a3c8ed9cd632298b3a45e81904752 Mon Sep 17 00:00:00 2001
From: Klemens Friedl <frik85@gmail.com>
Date: Sun, 5 Mar 2006 14:27:17 +0000
Subject: [PATCH] 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
---
 .../applications/games/solitaire/icon1.ico    | Bin 1078 -> 0 bytes
 .../base/applications/games/solitaire/sol.rc  | 288 +++++++++---------
 .../games/solitaire/solitaire.ico             | Bin 0 -> 14382 bytes
 3 files changed, 144 insertions(+), 144 deletions(-)
 delete mode 100644 reactos/base/applications/games/solitaire/icon1.ico
 create mode 100644 reactos/base/applications/games/solitaire/solitaire.ico

diff --git a/reactos/base/applications/games/solitaire/icon1.ico b/reactos/base/applications/games/solitaire/icon1.ico
deleted file mode 100644
index 92bcf506ec2466863d3be9eac44eee3b9ee6cea8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1078
zcmds$v2KGf5QdL5l07x#31F)77G&UoGDM;q-oj(~Q8IRfjUlT09kx-WQmO6OgWtc;
zcV~R(L!^+M)O9H;Z#$6}xGbZ7Dny>2L{6;L;0y}cGm1ETx5Z(^;#?#~rsBPa)ex3f
zLeLrD(Ip+eis_<^$z&p%IqUmY#mp`l{-1s(rJSE3e{%tA{@tYu6lv^IK}32jq`l##
z5-KV?1sS3$(-Hkx*`%&|a?k#D)p18wJ;mkiIZC{s>@PzUmp>5WH!nB4WPV5y9vm6;
zp!o|ZOfv$wBL46WgXS|hOcOkC3wq|uDYef_P=nm(p82*odK?Qqy$~bQpY?gJzNL1r
z>|w8M`x_pv-QquJJRh}Fn8wVyAL&p8(aX3g-*8m6EQs6>fKK`j9-HUCzblg82rFh{
FKLC4n@ecq1

diff --git a/reactos/base/applications/games/solitaire/sol.rc b/reactos/base/applications/games/solitaire/sol.rc
index cfc0760edfd..021bbc0c148 100644
--- 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.
+//
+#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     "solitaire.ico"
+#endif    // English (U.K.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/reactos/base/applications/games/solitaire/solitaire.ico b/reactos/base/applications/games/solitaire/solitaire.ico
new file mode 100644
index 0000000000000000000000000000000000000000..6c4f1a20219a7b72aab621c36165741b4278946a
GIT binary patch
literal 14382
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

literal 0
HcmV?d00001