[gs-cvs] gs/src
Russell Lang
ghostgum at casper.ghostscript.com
Fri Mar 29 17:29:40 PST 2002
Update of /cvs/ghostscript/gs/src
In directory casper:/tmp/cvs-serv30832
Modified Files:
bcwin32.mak dwmain.rc dwsetup.rc dwuninst.rc gs16spl.rc
gsdll32.rc gswin.rc gswin32.rc gswin386.rc winint.mak
Added Files:
gswin.icx gswin16.icx
Removed Files:
gsgraph.icx gstext.icx
Log Message:
Replace Windows icons with new versions that include 48x48 pixel
and 32-bit versions for Windows XP. Change the 16x16 pixel icons
to use the full 'g' instead of just the head. Use a restricted
icon gswin16.ico for WinZip SE which can't handle the new icon.
--- NEW FILE: gswin.icx ---
000001000900303010000000000068060000960000002020100000000000e802
0000fe060000101010000000000028010000e60900003030000001000800a80e
00000e0b00002020000001000800a8080000b619000010100000010008006805
00005e2200003030000001002000a8250000c62700002020000001002000a810
00006e4d0000101000000100200068040000165e000028000000300000006000
0000010004000000000000000000000000000000000000000000000000000000
0000000080000080000000808000800000008000800080800000c0c0c0008080
80000000ff0000ff000000ffff00ff00000000000000ffff0000ffffff00dddd
dddddddddddffffffffffffffffddddddddddddddddddddddddddddfffffff77
788888877fffffffdddddddddddddddddddddffff880000000000000000088ff
ffdddddddddddddddddfff880000000000000000000000088ffffddddddddddd
ddff7000000000887777ffff77778880008fffdddddddddddff7000000087fff
ffff78888888877f78007ffddddddddddf70000008ffffff7000000000000000
87f888ffdddddddddf0000000ffffff800000808000000000007787fdddddddd
df000000ffffff70087ffffffff7700000008f8ffddddddddf0000007fffff70
0fffffffffffff000000087ffddddddddf7000008ffffff780887fffffffff70
0000007ffddddddddff80000088fffffffffffffffffff000000008fdddddddd
ddfff7888877fffffffffffffff780000000008fdddddddddddfffffffff7788
88080808000000000000000fddddddddddddfff7800000000000000000000000
[...749 lines suppressed...]
0000ffffff609f9f9fff000000ff000000ff505050ffdfdfdfffffffffffffff
ffffffffffffffffffffffffffdfffffff100000000000000000000000000000
000000000000ffffff80cfcfcfff404040ff000000ff000000ff8f8f8fffe3de
d4ff8f8f8fff606060ffdfdfdfffffffff600000000000000000000000000000
000000000000ffffff9f606060ff000000ff000000ff505050ffe9e7e1ffae8a
40ffffffffff808080ff000000ffafafafffffffff4000000000000000000000
000000000000cfcfcfff000000ff000000ff404040ffeee6d6ffe8dec9ffeee6
d6ffbfbfbfff101010ff000000ff202020ffffffffaf00000000000000000000
000000000000bfbfbfff000000ff000000ff606060ffdccdadffc5ab77ffe8de
c9ff000000ff000000ff000000ff000000ffffffffbf00000000000000000000
000000000000ffffffbf303030ff000000ff000000ff808080ffe9e7e1fff9f7
f1ff707070ff000000ff000000ff707070ffffffff8000000000000000000000
000000000000ffffff30edededdf606060ff101010ff000000ff000000ff3030
30ff808080ff808080ff303030ffffffffaf0000000000000000000000000000
00000000000000000000ffffff10ffffff60ffffffafd5d5d5bfaaaaaabfbfbf
bfff808080ff404040ff606060ffffffff600000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000ffff
ff20bfbfbfbf6a6a6abfe3e3e38f00000000000000000000000000000000c003
00008001000d800132248001edca80013efe800100ff800100ff800700ffc007
cfffc003ffffc003ffffc003ffffc00380ffc00760ffe00780ffff0fcfff
--- NEW FILE: gswin16.icx ---
0000010002002020100000000000e80200002600000010101000000000002801
00000e0300002800000020000000400000000100040000000000800200000000
0000000000000000000000000000000000000000800000800000008080008000
00008000800080800000c0c0c000808080000000ff0000ff000000ffff00ff00
0000ff00ff00ffff0000ffffff000000000ffffffffffffffff0000000000000
ffff88000000000887fff0000000000ff7800000008888800000fff0000000ff
00000087ff7778888788087f000000f700007fff800000000000788ff00000f8
0008fff70087777800000078f00000f70008fff70877ffffff800087f00000ff
00008fff777fffffff000008f000000ff77877fffff7777880000008f0000000
ff7700000000000000000007f000000ff7800000000000000000008ff000000f
70000000000000000000087f0000000f80000000000000000088fff00000000f
80000000000888887ffff0000000000ff000007ffffffffffff000000000000f
f70000877ffffffffff0000000000000fff8800000fff777fff0000000000000
0fff7800007fff78087f0000000000000ff8000008ffffff8087f00000000000
ff0000007fffccff80007f0000000000f7000007fffffff780008f0000000000
f800000ffcffff8000000ff000000000f800008ffcfcf70000000ff000000000
f800000ffffcf80000000ff000000000ff000008fffff70000008f0000000000
0f70000007ffff780008ff00000000000ff78000008887ff808ff00000000000
00fff70000000007f00f0000000000000000fffff7777880f08f000000000000
0000000ffffffff8707f0000000000000000000000000ff887f0000000000000
0000000000000fffff0000000000fe0001fff000007fe000001fc000000fc000
0007c0000007c0000007c0000007e0000007f0000007e0000007e000000fe000
001fe000007fe00001ffe00001fff00001fff80000fff800007ff000003ff000
003ff000001ff000001ff000001ff000003ff800003ff800007ffc0000ffff00
00ffffe000ffffff81ffffff83ff280000001000000020000000010004000000
0000c00000000000000000000000000000000000000000000000000080000080
000000808000800000008000800080800000c0c0c000808080000000ff0000ff
000000ffff00ff000000ff00ff00ffff0000ffffff0000ff7888887ff0000f80
00000000070007008f78888000f00700fffffff800700ff77888800000700f70
0000000008f00f8000000888ff000f80087fffff000000f78008f807f00000f8
000fcf80f00000f007f7f7808f0000700fc7cf000f0000f000f7f8008f00000f
00000880f0000000fff77080f00000000000070f0000c0076005800300008001
000080010007800100ff8001000080030000800f0000c007ff07c0070000c003
f8f8c003ffffc003f8ffe0070000f0070000ff8f0000
Index: bcwin32.mak
===================================================================
RCS file: /cvs/ghostscript/gs/src/bcwin32.mak,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- bcwin32.mak 29 Mar 2002 00:19:09 -0000 1.17
+++ bcwin32.mak 30 Mar 2002 01:29:38 -0000 1.18
@@ -570,9 +570,9 @@
GSSPL_XE=$(BINDIR)\gs16spl.exe
-$(GSSPL_XE): $(GLSRCDIR)\gs16spl.c $(GLSRCDIR)\gs16spl.rc
- $(ECHOGS_XE) -w $(GLGEN)_spl.rc -x 23 define -s gstext_ico $(GLGENDIR)/gstext.ico
- $(ECHOGS_XE) -a $(GLGEN)_spl.rc -x 23 define -s gsgraph_ico $(GLGENDIR)/gsgraph.ico
+$(GSSPL_XE): $(GLSRCDIR)\gs16spl.c $(GLSRCDIR)\gs16spl.rc $(GLGENDIR)/gswin.ico
+ $(ECHOGS_XE) -w $(GLGEN)_spl.rc -x 23 define -s gstext_ico $(GLGENDIR)/gswin.ico
+ $(ECHOGS_XE) -a $(GLGEN)_spl.rc -x 23 define -s gsgraph_ico $(GLGENDIR)/gswin.ico
$(ECHOGS_XE) -a $(GLGEN)_spl.rc -R $(GLSRC)gs16spl.rc
$(COMPBASE16)\bin\bcc -W -ms -v -I$(COMPBASE16)\include $(GLO_)gs16spl.obj -c $(GLSRCDIR)\gs16spl.c
$(COMPBASE16)\bin\brcc -i$(COMPBASE16)\include -r -fo$(GLOBJ)gs16spl.res $(GLGEN)_spl.rc
Index: dwmain.rc
===================================================================
RCS file: /cvs/ghostscript/gs/src/dwmain.rc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- dwmain.rc 21 Feb 2002 22:24:51 -0000 1.4
+++ dwmain.rc 30 Mar 2002 01:29:38 -0000 1.5
@@ -21,10 +21,10 @@
#include "dwmain.h"
#ifndef gstext_ico
-#define gstext_ico gstext.ico
+#define gstext_ico gswin.ico
#endif
#ifndef gsgraph_ico
-#define gsgraph_ico gsgraph.ico
+#define gsgraph_ico gswin.ico
#endif
GSTEXT_ICON ICON gstext_ico
Index: dwsetup.rc
===================================================================
RCS file: /cvs/ghostscript/gs/src/dwsetup.rc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- dwsetup.rc 21 Feb 2002 22:24:51 -0000 1.7
+++ dwsetup.rc 30 Mar 2002 01:29:38 -0000 1.8
@@ -92,7 +92,7 @@
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-IDR_MAIN ICON DISCARDABLE "gstext.ico"
+IDR_MAIN ICON DISCARDABLE "gswin.ico"
/////////////////////////////////////////////////////////////////////////////
//
Index: dwuninst.rc
===================================================================
RCS file: /cvs/ghostscript/gs/src/dwuninst.rc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- dwuninst.rc 21 Feb 2002 22:24:51 -0000 1.5
+++ dwuninst.rc 30 Mar 2002 01:29:38 -0000 1.6
@@ -19,7 +19,7 @@
#include <windows.h>
#include "dwuninst.h"
-ID_UNINSTGS ICON "gstext.ico"
+ID_UNINSTGS ICON "gswin.ico"
IDD_UNSET DIALOG 6, 15, 242, 123
Index: gs16spl.rc
===================================================================
RCS file: /cvs/ghostscript/gs/src/gs16spl.rc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gs16spl.rc 21 Feb 2002 22:24:52 -0000 1.4
+++ gs16spl.rc 30 Mar 2002 01:29:38 -0000 1.5
@@ -23,7 +23,7 @@
#define ID_TEXT 100
#ifndef gstext_ico
-#define gstext_ico gstext.ico
+#define gstext_ico gswin.ico
#endif
1 ICON gstext_ico
Index: gsdll32.rc
===================================================================
RCS file: /cvs/ghostscript/gs/src/gsdll32.rc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gsdll32.rc 21 Feb 2002 22:24:52 -0000 1.4
+++ gsdll32.rc 30 Mar 2002 01:29:38 -0000 1.5
@@ -21,10 +21,10 @@
#include "gp_mswin.h"
#ifndef gstext_ico
-#define gstext_ico gstext.ico
+#define gstext_ico gswin.ico
#endif
#ifndef gsgraph_ico
-#define gsgraph_ico gsgraph.ico
+#define gsgraph_ico gswin.ico
#endif
GSTEXT_ICON ICON gstext_ico
Index: gswin.rc
===================================================================
RCS file: /cvs/ghostscript/gs/src/gswin.rc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gswin.rc 21 Feb 2002 22:24:52 -0000 1.4
+++ gswin.rc 30 Mar 2002 01:29:38 -0000 1.5
@@ -19,8 +19,8 @@
#include <windows.h>
#include "dwmain.h"
-GSTEXT_ICON ICON gstext.ico
-GSIMAGE_ICON ICON gsgraph.ico
+GSTEXT_ICON ICON gswin.ico
+GSIMAGE_ICON ICON gswin.ico
#ifndef DS_3DLOOK
#define DS_3DLOOK 0x0004L /* for Windows 95 look */
Index: gswin32.rc
===================================================================
RCS file: /cvs/ghostscript/gs/src/gswin32.rc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gswin32.rc 9 Mar 2000 08:40:42 -0000 1.1
+++ gswin32.rc 30 Mar 2002 01:29:38 -0000 1.2
@@ -1,8 +1,8 @@
#include <windows.h>
#include "gp_mswin.h"
-GSTEXT_ICON ICON gstext.ico
-GSIMAGE_ICON ICON gsgraph.ico
+GSTEXT_ICON ICON gswin.ico
+GSIMAGE_ICON ICON gswin.ico
#ifndef DS_3DLOOK
#define DS_3DLOOK 0x0004L /* for Windows 95 look */
Index: gswin386.rc
===================================================================
RCS file: /cvs/ghostscript/gs/src/gswin386.rc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gswin386.rc 9 Mar 2000 08:40:42 -0000 1.1
+++ gswin386.rc 30 Mar 2002 01:29:38 -0000 1.2
@@ -1,4 +1,4 @@
#include "windows.h"
-texticon ICON gstext.ico
-grpicon ICON gsgraph.ico
+texticon ICON gswin.ico
+grpicon ICON gswin.ico
Index: winint.mak
===================================================================
RCS file: /cvs/ghostscript/gs/src/winint.mak,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- winint.mak 28 Feb 2002 22:24:09 -0000 1.12
+++ winint.mak 30 Mar 2002 01:29:38 -0000 1.13
@@ -1,4 +1,4 @@
-# Copyright (C) 1997, 2000 Aladdin Enterprises. All rights reserved.
+# Copyright (C) 1997, 2002 Aladdin Enterprises. All rights reserved.
#
# This software is provided AS-IS with no warranty, either express or
# implied.
@@ -71,7 +71,7 @@
# ----------------------------- Main program ------------------------------ #
-ICONS=$(GLGEN)gsgraph.ico $(GLGEN)gstext.ico
+ICONS=$(GLGEN)gswin.ico $(GLGEN)gswin16.ico
GS_ALL=$(INT_ALL) $(INTASM)\
$(LIB_ALL) $(LIBCTR) $(GLGEN)lib.tr $(ld_tr) $(GSDLL_OBJ).res $(GLSRC)$(GSDLL).def $(ICONS)
@@ -85,24 +85,24 @@
# Make the icons from their text form.
-$(GLGEN)gsgraph.ico: $(GLSRC)gsgraph.icx $(ECHOGS_XE) $(WININT_MAK)
- $(ECHOGS_XE) -wb $(GLGEN)gsgraph.ico -n -X -r $(GLSRC)gsgraph.icx
+$(GLGEN)gswin.ico: $(GLSRC)gswin.icx $(ECHOGS_XE) $(WININT_MAK)
+ $(ECHOGS_XE) -wb $(GLGEN)gswin.ico -n -X -r $(GLSRC)gswin.icx
-$(GLGEN)gstext.ico: $(GLSRC)gstext.icx $(ECHOGS_XE) $(WININT_MAK)
- $(ECHOGS_XE) -wb $(GLGEN)gstext.ico -n -X -r $(GLSRC)gstext.icx
+$(GLGEN)gswin16.ico: $(GLSRC)gswin16.icx $(ECHOGS_XE) $(WININT_MAK)
+ $(ECHOGS_XE) -wb $(GLGEN)gswin16.ico -n -X -r $(GLSRC)gswin16.icx
# resources for short EXE loader (no dialogs)
$(GS_OBJ).res: $(GLSRC)dwmain.rc $(dwmain_h) $(ICONS) $(WININT_MAK)
- $(ECHOGS_XE) -w $(GLGEN)_exe.rc -x 23 define -s gstext_ico $(GLGENDIR)\gstext.ico
- $(ECHOGS_XE) -a $(GLGEN)_exe.rc -x 23 define -s gsgraph_ico $(GLGENDIR)\gsgraph.ico
+ $(ECHOGS_XE) -w $(GLGEN)_exe.rc -x 23 define -s gstext_ico $(GLGENDIR)\gswin.ico
+ $(ECHOGS_XE) -a $(GLGEN)_exe.rc -x 23 define -s gsgraph_ico $(GLGENDIR)\gswin.ico
$(ECHOGS_XE) -a $(GLGEN)_exe.rc -R $(GLSRC)dwmain.rc
$(RCOMP) -I$(GLSRCDIR) $(i_INCDIR) -r $(RO_)$(GS_OBJ).res $(GLGEN)_exe.rc
del $(GLGEN)_exe.rc
# resources for main program (includes dialogs)
$(GSDLL_OBJ).res: $(GLSRC)gsdll32.rc $(gp_mswin_h) $(ICONS) $(WININT_MAK)
- $(ECHOGS_XE) -w $(GLGEN)_dll.rc -x 23 define -s gstext_ico $(GLGENDIR)\gstext.ico
- $(ECHOGS_XE) -a $(GLGEN)_dll.rc -x 23 define -s gsgraph_ico $(GLGENDIR)\gsgraph.ico
+ $(ECHOGS_XE) -w $(GLGEN)_dll.rc -x 23 define -s gstext_ico $(GLGENDIR)\gswin.ico
+ $(ECHOGS_XE) -a $(GLGEN)_dll.rc -x 23 define -s gsgraph_ico $(GLGENDIR)\gswin.ico
$(ECHOGS_XE) -a $(GLGEN)_dll.rc -R $(GLSRC)gsdll32.rc
$(RCOMP) -I$(GLSRCDIR) $(i_INCDIR) -r $(RO_)$(GSDLL_OBJ).res $(GLGEN)_dll.rc
del $(GLGEN)_dll.rc
@@ -188,7 +188,7 @@
# These modules shouldn't be referenced if MAKEDDLL==0,but dependencies here
# don't hurt.
-$(GLOBJ)dwsetup.res: $(GLSRC)dwsetup.rc $(GLSRC)dwsetup.h $(GLGEN)gstext.ico
+$(GLOBJ)dwsetup.res: $(GLSRC)dwsetup.rc $(GLSRC)dwsetup.h $(GLGEN)gswin.ico
$(RCOMP) -I$(GLSRCDIR) -i$(GLOBJDIR) $(i_INCDIR) -r $(RO_)$(GLOBJ)dwsetup.res $(GLSRC)dwsetup.rc
$(GLOBJ)dwsetup.obj: $(GLSRC)dwsetup.cpp $(GLSRC)dwsetup.h $(GLSRC)dwinst.h
@@ -199,7 +199,7 @@
# Modules for uninstall program
-$(GLOBJ)dwuninst.res: $(GLSRC)dwuninst.rc $(GLSRC)dwuninst.h $(GLGEN)gstext.ico
+$(GLOBJ)dwuninst.res: $(GLSRC)dwuninst.rc $(GLSRC)dwuninst.h $(GLGEN)gswin.ico
$(RCOMP) -I$(GLSRCDIR) -i$(GLOBJDIR) $(i_INCDIR) -r $(RO_)$(GLOBJ)dwuninst.res $(GLSRC)dwuninst.rc
$(GLOBJ)dwuninst.obj: $(GLSRC)dwuninst.cpp $(GLSRC)dwuninst.h
@@ -274,14 +274,16 @@
ZIP_RSP = $(GLOBJ)setupgs.rsp
# Note that we use ECHOGS_XE rather than echo for the .txt files
# to avoid ANSI/OEM character mapping.
-archive: zip $(GLOBJ)gstext.ico $(ECHOGS_XE)
+# Use a special icon WinZip SE can't handle 48 pixel 32-bit icons
+# as used by Windows XP.
+archive: zip $(GLOBJ)gswin16.ico $(ECHOGS_XE)
$(ECHOGS_XE) -w $(ZIP_RSP) -q "-win32 -setup"
$(ECHOGS_XE) -a $(ZIP_RSP) -q -st -x 22 AFPL Ghostscript $(GS_DOT_VERSION) for Win32 -x 22
- $(ECHOGS_XE) -a $(ZIP_RSP) -q -i -s $(GLOBJ)gstext.ico
+ $(ECHOGS_XE) -a $(ZIP_RSP) -q -i -s $(GLOBJ)gswin16.ico
$(ECHOGS_XE) -a $(ZIP_RSP) -q -a -s $(GLOBJ)about.txt
$(ECHOGS_XE) -a $(ZIP_RSP) -q -t -s $(GLOBJ)dialog.txt
$(ECHOGS_XE) -a $(ZIP_RSP) -q -c -s $(SETUP_XE_NAME)
- $(ECHOGS_XE) -w $(GLOBJ)about.txt "AFPL Ghostscript is Copyright " -x A9 " 2001 artofcode LLC."
+ $(ECHOGS_XE) -w $(GLOBJ)about.txt "AFPL Ghostscript is Copyright " -x A9 " 2002 artofcode LLC."
$(ECHOGS_XE) -a $(GLOBJ)about.txt See license in gs$(GS_DOT_VERSION)\doc\PUBLIC.
$(ECHOGS_XE) -a $(GLOBJ)about.txt See gs$(GS_DOT_VERSION)\doc\Commprod.htm regarding commercial distribution.
$(ECHOGS_XE) -w $(GLOBJ)dialog.txt This installs AFPL Ghostscript $(GS_DOT_VERSION).
--- gsgraph.icx DELETED ---
--- gstext.icx DELETED ---
More information about the gs-cvs
mailing list