From 3e813c1a744602eb67d2c99b317bc587dced03cb Mon Sep 17 00:00:00 2001
From: Juergen Schmied <juergen.schmied@metronet.de>
Date: Fri, 11 Dec 1998 10:55:34 +0000
Subject: [PATCH] Moved menu resources to rc-file.

---
 dlls/shell32/.cvsignore  |  1 +
 dlls/shell32/Makefile.in |  9 ++++++---
 dlls/shell32/shres.rc    | 50 ++++++++++++++++++++++++++++--------------------
 3 files changed, 36 insertions(+), 24 deletions(-)
 rewrite dlls/shell32/shres.rc (98%)

diff --git a/dlls/shell32/.cvsignore b/dlls/shell32/.cvsignore
index f3c7a7c5da6..2da8be4e133 100644
--- a/dlls/shell32/.cvsignore
+++ b/dlls/shell32/.cvsignore
@@ -1 +1,2 @@
 Makefile
+shres.s
diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in
index 97f7c47e044..6b149c45376 100644
--- a/dlls/shell32/Makefile.in
+++ b/dlls/shell32/Makefile.in
@@ -4,7 +4,7 @@ TOPOBJDIR = ../..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = shell32
-WRCEXTRA  = -A -p $*
+WRCEXTRA  = -g -c
 
 C_SRCS = \
 	classes.c \
@@ -22,8 +22,11 @@ C_SRCS = \
 	shlfolder.c \
 	shlview.c
 
-# RC_SRCS = \
-#	shres.rc
+RC_SRCS= \
+	shres.rc
+
+#GEN_ASM_SRCS = \
+#	shellres.s
 
 all: check_wrc $(MODULE).o
 
diff --git a/dlls/shell32/shres.rc b/dlls/shell32/shres.rc
dissimilarity index 98%
index 508a31d6f0a..2349cda70da 100644
--- a/dlls/shell32/shres.rc
+++ b/dlls/shell32/shres.rc
@@ -1,21 +1,29 @@
-#include "shresdef.h"
-
-// we have to find a solution for the icons
-// IDI_FOLDER              ICON    DISCARDABLE     "folder.ico"
-// IDI_FOLDEROPEN          ICON    DISCARDABLE     "folderop.ico"
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    IDS_FILE_TITLE      	"Files: "
-    IDS_MI_FILE         	"&Files"
-    IDS_MI_VIEW_FILES       "&View Files"
-    IDS_TB_VIEW_FILES       "View Filess"
-    IDS_MI_VIEW_IDW         "Show &Docking Window"
-    IDS_TB_VIEW_IDW         "Show Docking Window"
-    IDS_COLUMN1             "Name"
-    IDS_COLUMN2             "Date"
-    IDS_COLUMN3             "Size"
-    IDS_COLUMN4             "Attributes"
-END
-
-
+#include "shlobj.h"
+
+MENU_001 MENU DISCARDABLE
+BEGIN
+	MENUITEM "Lar&ge Icons",	FCIDM_SHVIEW_BIGICON
+	MENUITEM "S&mall Icons",	FCIDM_SHVIEW_SMALLICON
+	MENUITEM "&List",		FCIDM_SHVIEW_LISTVIEW
+	MENUITEM "&Details",		FCIDM_SHVIEW_REPORTVIEW
+END
+
+MENU_002 MENU DISCARDABLE
+BEGIN
+	POPUP""
+	BEGIN
+	  POPUP "&View"
+	  BEGIN
+	    MENUITEM "Lar&ge Icons",	FCIDM_SHVIEW_BIGICON
+	    MENUITEM "S&mall Icons",	FCIDM_SHVIEW_SMALLICON
+	    MENUITEM "&List",		FCIDM_SHVIEW_LISTVIEW
+	    MENUITEM "&Details",	FCIDM_SHVIEW_REPORTVIEW
+	  END
+	  MENUITEM SEPARATOR
+	  POPUP "Arrange &Icons"
+	  BEGIN
+	    MENUITEM "&Auto Arrange",	FCIDM_SHVIEW_AUTOARRANGE
+	  END
+	  MENUITEM "Lin&e up Icons",	FCIDM_SHVIEW_SNAPTOGRID
+	END
+END
-- 
2.11.4.GIT