Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-11-16 07:48:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add bitmaps for relay status on palm; refresh icon on form update.

Browse source
This commit is contained in:
ehouse 2009-09-27 21:54:56 +00:00
parent 469f741991
commit c2dd21fc4a
7 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
xwords4/palm/Makefile
View file

@ -118,7 +118,8 @@ MYDEFS_COMMON += -DXWFEATURE_STANDALONE_ONLY
else
# Turn on network play over IP via cellular modem. Very much
# experimental at this point!
MYDEFS_COMMON += -DXWFEATURE_RELAY
RELAY = -DXWFEATURE_RELAY
MYDEFS_COMMON += $(RELAY)
# turn on bluetooth comms option for 68K and ARM
BLUETOOTH = -DXWFEATURE_BLUETOOTH -DBT_USE_L2CAP
@ -163,7 +164,20 @@ BITMAP_RSRCS = \
$(BITMAPS)/lightbulb.pbitm \
$(BITMAPS)/traybuttons.pbitm \
$(BITMAPS)/showtray.pbitm \
$(BITMAPS)/xwords4.pbitm \
$(BITMAPS)/xwords4.pbitm
ifdef BLUETOOTH
BITMAP_RSRCS += \
$(BITMAPS)/bts_conn.bmp \
$(BITMAPS)/bts_listen.bmp \
$(BITMAPS)/bts_off.bmp \
$(BITMAPS)/bts_seek.bmp
endif
ifdef RELAY
BITMAP_RSRCS += \
$(BITMAPS)/rls_allconn.bmp \
$(BITMAPS)/rls_off.bmp \
$(BITMAPS)/rls_pending.bmp
endif
# INCLUDES += -I/usr/local/share/palmdev/sdk-5r3/Extensions/ExpansionMgr
ifdef BLUETOOTH

BIN
xwords4/palm/bmps/rls_allconn.bmp Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 774 B

BIN
xwords4/palm/bmps/rls_meconn.bmp Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 774 B

BIN
xwords4/palm/bmps/rls_off.bmp Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 774 B

BIN
xwords4/palm/bmps/rls_pending.bmp Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 774 B

8
xwords4/palm/common.rcp.pre
View file

@ -121,19 +121,19 @@ END
BITMAP ID RELAYSTATUS_PENDING_RESID AUTOCOMPRESS
BEGIN
BITMAP "bmps/bts_off.pbitm" BPP 1 DENSITY 72
BITMAP "bmps/bts_listen.pbitm" BPP 1 DENSITY 72
BITMAP "bmps/rls_pending.bmp" BPP 8 DENSITY 144
END
BITMAP ID RELAYSTATUS_CONN_RESID AUTOCOMPRESS
BEGIN
BITMAP "bmps/bts_off.pbitm" BPP 1 DENSITY 72
BITMAP "bmps/rls_conn.bmp" BPP 8 DENSITY 144
BITMAP "bmps/bts_seek.pbitm" BPP 1 DENSITY 72
BITMAP "bmps/rls_meconn.bmp" BPP 8 DENSITY 144
END
BITMAP ID RELAYSTATUS_ALLCONN_RESID AUTOCOMPRESS
BEGIN
BITMAP "bmps/bts_off.pbitm" BPP 1 DENSITY 72
BITMAP "bmps/bts_conn.pbitm" BPP 1 DENSITY 72
BITMAP "bmps/rls_allconn.bmp" BPP 8 DENSITY 144
END
#endif

7
xwords4/palm/palmmain.c
View file

@ -1626,7 +1626,7 @@ showConnState( PalmAppGlobals* globals )
}
#endif
#ifdef XWFEATURE_RELAY
} else if ( (COMMS_CONN_RELAY == typ ) ) {
} else if ( COMMS_CONN_RELAY == typ ) {
/* resID = RELAYSTATUS_NONE_RESID; */
if ( globals->lastSendGood ) {
switch( globals->netState.relayState ) {
@ -1635,7 +1635,7 @@ showConnState( PalmAppGlobals* globals )
resID = RELAYSTATUS_PENDING_RESID;
break;
case COMMS_RELAYSTATE_CONNECTED:
resID = RELAYSTATUS_CONN_RESID;
resID = RELAYSTATUS_CONN_RESID;
break;
case COMMS_RELAYSTATE_ALLCONNECTED:
resID = RELAYSTATUS_ALLCONN_RESID;
@ -2726,6 +2726,9 @@ mainViewHandleEvent( EventPtr event )
hresRect( globals, &clip );
board_invalRect( globals->game.board, (XP_Rect*)&clip );
draw = !globals->postponeDraw;
#ifdef XWFEATURE_RELAY
showConnState( globals );
#endif
}
break;