add: OOo icons into win start menu, #108319#

2 files changed, 206 insertions, 6 deletions

diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk
index 563e54973a8f..d65e036b0204 100644
--- a/desktop/util/makefile.mk
+++ b/desktop/util/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.26 $
+#   $Revision: 1.27 $
 #
-#   last change: $Author: hr $ $Date: 2003-03-25 13:52:52 $
+#   last change: $Author: mh $ $Date: 2003-04-02 10:16:17 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -229,13 +229,13 @@ APP5OBJS +=	$(OBJ)$/icon_resource_ooo.obj
 APP5STDLIBS+= -lXext -lSM -lICE
 .ENDIF
 
-APP5DEPN= $(APP1RES) verinfo.rc
+APP5DEPN= $(APP1RES) ooverinfo.rc
 APP5DEF=    $(MISCX)$/$(TARGET).def
 
 .IF "$(GUI)" == "WNT"
-APP5RES=    $(RES)$/desktop.res
-APP5ICON=$(SOLARRESDIR)$/icons/001_star_butterfly.ico
-APP5VERINFO=verinfo.rc
+APP5RES=    $(RES)$/oodesktop.res
+APP5ICON=$(SOLARRESDIR)$/icons/ooo_gulls.ico
+APP5VERINFO=ooverinfo.rc
 APP5LINKRES=$(MISC)$/ooffice.res
 .ENDIF
 
diff --git a/desktop/util/ooverinfo.rc b/desktop/util/ooverinfo.rc
new file mode 100644
index 000000000000..d01190acb21d
--- /dev/null
+++ b/desktop/util/ooverinfo.rc
@@ -0,0 +1,200 @@
+/*************************************************************************
+#
+#   $RCSfile: ooverinfo.rc,v $
+#
+#   $Revision: 1.1 $
+#
+#   last change: $Author: mh $ $Date: 2003-04-02 10:12:36 $
+#
+#   The Contents of this file are made available subject to the terms of
+#   either of the following licenses
+#
+#          - GNU Lesser General Public License Version 2.1
+#          - Sun Industry Standards Source License Version 1.1
+#
+#   Sun Microsystems Inc., October, 2000
+#
+#   GNU Lesser General Public License Version 2.1
+#   =============================================
+#   Copyright 2000 by Sun Microsystems, Inc.
+#   901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+#   This library is free software; you can redistribute it and/or
+#   modify it under the terms of the GNU Lesser General Public
+#   License version 2.1, as published by the Free Software Foundation.
+#
+#   This library is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#   Lesser General Public License for more details.
+#
+#   You should have received a copy of the GNU Lesser General Public
+#   License along with this library; if not, write to the Free Software
+#   Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+#   MA  02111-1307  USA
+#
+#
+#   Sun Industry Standards Source License Version 1.1
+#   =================================================
+#   The contents of this file are subject to the Sun Industry Standards
+#   Source License Version 1.1 (the "License"); You may not use this file
+#   except in compliance with the License. You may obtain a copy of the
+#   License at http://www.openoffice.org/license.html.
+#
+#   Software provided under this License is provided on an "AS IS" basis,
+#   WITHOUT WARRUNTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING,
+#   WITHOUT LIMITATION, WARRUNTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+#   MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+#   See the License for the specific provisions governing your rights and
+#   obligations concerning the Software.
+#
+#   The Initial Developer of the Original Code is: Sun Microsystems, Inc..
+#
+#   Copyright: 2000 by Sun Microsystems, Inc.
+#
+#   All Rights Reserved.
+#
+#   Contributor(s): _______________________________________
+#
+#
+#
+#*************************************************************************/
+
+#define VERSION			6
+#define SUBVERSION		0
+//#define VERVARIANT		0
+// .0 + VER_CONCEPT
+// .100 + VER_ALPHA
+// .200 + VER_BETA
+// .300 + VER_GAMMA
+// .500 + VER_FINAL
+//#define VER_CONCEPT		0
+//#define VER_BETA		6
+#define VER_FINAL		0
+
+#define VER_DAY			1
+#define VER_MONTH		12
+#define VER_YEAR		2000
+
+// -----------------------------------------------------------------------
+
+#if !defined(ENGLISH)
+#define LG_D 					// generate always german version
+#endif
+
+#define VER_FIRSTYEAR	VER_YEAR
+
+#include <windows.h>
+#include "verinfo.hrc"
+
+#ifdef WIN32
+#define FOR_WIN_X " (32 Bit)"
+#else
+#define FOR_WIN_X ""
+#endif
+
+// -----------------------------------------------------------------------
+// 				language/character set specification table
+// -----------------------------------------------------------------------
+
+RCD_LANGUAGE rcdata
+{
+#ifdef LG_D
+	"040704B0", 	// Germany -> Unicode
+	"040704E4", 	// Germany -> Windows, Multilingual
+#else
+	"040904B0", 	// Germany -> Unicode
+	"040904E4", 	// USA -> Windows, Multilingual
+#endif
+	"04090000", 	// USA -> 7-Bit-ASCII
+	0				// end of table
+}
+
+// -----------------------------------------------------------------------
+// 				version information
+// -----------------------------------------------------------------------
+
+VS_VERSION_INFO versioninfo
+	fileversion    VERSION, SUBVERSION, VERVARIANT, VER_COUNT
+	productversion VERSION, SUBVERSION, VERVARIANT, VER_COUNT
+	fileflagsmask 0x3F
+	fileflags
+#if defined(DEBUG)
+	VS_FF_DEBUG |
+#endif
+#ifdef VER_PREL
+	VS_FF_PRERELEASE |
+#endif
+	0
+#ifndef WIN32
+	fileos VOS_DOS_WINDOWS16
+#else
+	fileos VOS_NT_WINDOWS32
+#endif
+	filetype VFT_APP
+	{
+		block "StringFileInfo"
+		{
+#ifdef LG_D
+			block "040704E4"
+			{
+				// German StringTable
+				value "CompanyName",		"OpenOffice.org\0"
+				value "FileDescription", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
+				value "FileVersion",		PPS(VER_LEVEL) "\0"
+				value "ProductVersion",		PPS(VER_LEVEL) "\0"
+				value "OriginalFilename",	"SOFFICE.EXE\0"
+				value "InternalName",		"SOFFICE\0"
+				value "LegalCopyright",		S_CRIGHT " Sun Microsystems, Inc.\0"
+			}
+#else
+			block "040904E4"
+			{
+				// International StringTable
+				value "CompanyName", 		"OpenOffice.org\0"
+				value "FileDescription",	"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\0"
+				value "FileVersion",		PPS(VER_LEVEL) "\0"
+				value "ProductVersion",		PPS(VER_LEVEL) "\0"
+				value "OriginalFilename",	"SOFFICE.EXE\0"
+				value "InternalName", 		"SOFFICE\0"
+				value "LegalCopyright", 	S_CRIGHT " Sun Microsystems, Inc.\0"
+			}
+#endif
+		}
+
+		block "VarFileInfo"
+		{
+#ifdef LG_D
+			value "Translation", 0x0407, 1252
+#else
+			value "Translation", 0x0409, 1252
+#endif
+		}
+	}
+
+// version binary entry
+VS_VERSION_INFO rcdata
+{
+	0xF0, "sw", 0x0F, VER_YEAR, VER_MONTH, VER_DAY,
+	VERSION, SUBVERSION, VERVARIANT, VER_COUNT
+};
+
+
+2 ICON "icons\\ooo_writer.ico"
+3 ICON "icons\\ooo_writer.ico"
+4 ICON "icons\\ooo_calc.ico"
+5 ICON "icons\\ooo_calc.ico"
+6 ICON "icons\\ooo_draw.ico"
+7 ICON "icons\\ooo_draw.ico"
+8 ICON "icons\\ooo_impress.ico"
+9 ICON "icons\\ooo_impress.ico"
+10 ICON "icons\\ooo_impress.ico"
+11 ICON "icons\\ooo_office.ico"
+12 ICON "icons\\ooo_office.ico"
+13 ICON "icons\\ooo_office.ico"
+14 ICON "icons\\ooo_office.ico"
+15 ICON "icons\\ooo_office.ico"
+16 ICON "icons\\ooo_office.ico"
+17 ICON "icons\\ooo_office.ico"
+18 ICON "icons\\ooo_office.ico"
+19 ICON "icons\\ooo_office.ico"