From 0693777599b96ade6130cee34e252e8582cc718e Mon Sep 17 00:00:00 2001
From: ehouse <ehouse@0782aaa5-4710-0410-8820-a96bf9123855>
Date: Sun, 22 Jan 2006 17:50:47 +0000
Subject: [PATCH] merge transparant large-icon from 411-branch

---
 palm/Makefile             |   7 +------
 palm/bmps/xwbandwicon.bmp | Bin 0 -> 1550 bytes
 palm/bmps/xwcoloricon.bmp | Bin 0 -> 1550 bytes
 palm/common.rcp.pre       |   2 +-
 4 files changed, 2 insertions(+), 7 deletions(-)
 create mode 100644 palm/bmps/xwbandwicon.bmp
 create mode 100644 palm/bmps/xwcoloricon.bmp

diff --git a/palm/Makefile b/palm/Makefile
index e968be912..08f8aa69f 100644
--- a/palm/Makefile
+++ b/palm/Makefile
@@ -26,10 +26,6 @@ APPID ?= Xwr4
 MLPREFIX = /usr
 DICT = $(shell echo $$BASENG_PATH)
 
-ifdef HANDANGO_REG
-HANDANGO_REG_FLAG = -DHANDANGO_REG
-endif
-
 ARCH ?= ARM_ONLY
 
 ifeq ($(ARCH),ARM_ONLY)
@@ -89,7 +85,7 @@ endif
 
 MYDEFS_COMMON = $(PASSTHRU) -DXW_FEATURE_UTILS -DPOINTER_SUPPORT \
 	-DKEY_SUPPORT 	-DOVERRIDE_EDGE_FOR_INDEX -DCOLOR_SUPPORT \
-	-DSHOW_PROGRESS $(HASHDEF) -DNO_REG_REQUIRED $(HANDANGO_REG_FLAG)
+	-DSHOW_PROGRESS $(HASHDEF) -DNO_REG_REQUIRED
 
 # turn on letting users pick tiles "face-up"
 MYDEFS_COMMON += -DFEATURE_TRAY_EDIT
@@ -135,7 +131,6 @@ BITMAP_RSRCS = \
 	$(BITMAPS)/traybuttons.pbitm \
 	$(BITMAPS)/showtray.pbitm \
 	$(BITMAPS)/xwords4.pbitm \
-	$(BITMAPS)/xwcoloricon.ppm \
 	$(BITMAPS)/xwords4small.pbitm \
 
 INCLUDES += -I/usr/local/share/palmdev/sdk-5r3/Extensions/ExpansionMgr
diff --git a/palm/bmps/xwbandwicon.bmp b/palm/bmps/xwbandwicon.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..fd8b6939d2e25574cfeb9c510f2b15083e33c370
GIT binary patch
literal 1550
zcmb`EF|GnJ3`9c#4H5+f;s~681N{EqpWA@tS&s%g2@xVvvi5lV;@$oGKOLH{yPY@N
zmu>Ib)%C}|weu0%1v{SO6_(l4y2p$;o)<fxSqkP1R=;9+({}ia5SNBPks@sMTxQf(
zQy{J})Qhp8sQ&4{s8<<?WeziT7c8mOoCE|TX{<x9)udSJi+vhc1=pxpl?~DHk`0n#
zlCr?i?rtm$9g;UiefC6Sd}nQ~SF+kI1tW-Wzm6Si47wN)0KBFen?L5LK{9HpaWDu#
aF{LI}g_vJ52pt8}IWVWsGdo6XZ+`(q$QXbC

literal 0
HcmV?d00001

diff --git a/palm/bmps/xwcoloricon.bmp b/palm/bmps/xwcoloricon.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..01929f3c00b342adc7eeb311dc42d5539369e101
GIT binary patch
literal 1550
zcmbu8K@!3+2u0&UH_o_l;dlg3-~rrwe{W+6-+Yk}8kMmr0se!u_I5w)irQ7yi(IGI
zwJB$fKenYD_qa45%X4h4B)f}x%&0=iul`UM53<5who2Z#)T|yvES>^M9z^R<{jp9n
zLI8qu3|ot_Eb>1FcyES~V?znbrNTMfsu(-BLPROEE}{SzbG3ceMGPa%2+zg)$OMC9
zjU2<U4cNQole>O%HIE*>V|(ZS=*GY(Bw2u_vag~ssHS5vb8}Ei=Szmux$WFpoXBnG
U7<TN?&z=Wgu(VEW^iov50PP1sNdN!<

literal 0
HcmV?d00001

diff --git a/palm/common.rcp.pre b/palm/common.rcp.pre
index 1da69faee..d8907a0e5 100644
--- a/palm/common.rcp.pre
+++ b/palm/common.rcp.pre
@@ -38,7 +38,7 @@ HEX "Clrs" ID 1000
     0xFF 0xFF 0x99		/* tile background */
 #endif
 
-ICONFAMILY "./bmps/xwbandwicon.ppm" "" "" "./bmps/xwcoloricon.ppm"
+ICONFAMILY "./bmps/xwbandwicon.bmp" "" "" "./bmps/xwcoloricon.bmp" TRANSPARENT 255 255 255
 SMALLICON "bmps/xwords4small.pbitm"
 
 BITMAP ID SHOWTRAY_BUTTON_BMP_RES_ID "bmps/showtray.pbitm" AUTOCOMPRESS