Update of /cvsroot/planeshift/planeshift/data In directory sc8-pr-cvs1:/tmp/cvs-serv7136 Modified Files: splash.xml shortcutwindow.xml prefs.xml loginwindow.xml infowindow.xml imagelist.xml chat.xml charpick.xml Log Message: Modified GUI to handle per-widget font definitions and colors. Also added shadows attr on button definitions, which gives a dropshadow effect on the text. See shortcut window and chat buttons for examples. Index: splash.xml =================================================================== RCS file: /cvsroot/planeshift/planeshift/data/splash.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** splash.xml 4 Oct 2003 22:25:35 -0000 1.4 --- splash.xml 30 Oct 2003 00:50:23 -0000 1.5 *************** *** 8,11 **** --- 8,12 ---- <widget name="Progress" factory="pawsProgressBar"> <frame x="10" y="570" height="20" width="700" border="yes" /> + <fadecolor r="100" g="100" b="255" /> </widget> </widget> Index: shortcutwindow.xml =================================================================== RCS file: /cvsroot/planeshift/planeshift/data/shortcutwindow.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** shortcutwindow.xml 20 Oct 2003 18:20:44 -0000 1.7 --- shortcutwindow.xml 30 Oct 2003 00:50:23 -0000 1.8 *************** *** 3,7 **** <frame x="50" y="50" width="50" height="160" border="yes" /> <bgimage resource="Standard Background" alpha="200" /> ! <widget name="Shortcut0" factory="pawsButton" toggle="no" id="1000"> <frame x="0" y="20" width="25" height="25" border="yes" /> <attachpoints> --- 3,7 ---- <frame x="50" y="50" width="50" height="160" border="yes" /> <bgimage resource="Standard Background" alpha="200" /> ! <widget name="Shortcut0" factory="pawsButton" toggle="no" id="1000" shadows="yes" > <frame x="0" y="20" width="25" height="25" border="yes" /> <attachpoints> *************** *** 12,16 **** </attachpoints> </widget> ! <widget name="Shortcut1" factory="pawsButton" toggle="no" id="1001"> <frame x="0" y="45" width="25" height="25" border="yes" /> <attachpoints> --- 12,16 ---- </attachpoints> </widget> ! <widget name="Shortcut1" factory="pawsButton" toggle="no" id="1001" shadows="yes"> <frame x="0" y="45" width="25" height="25" border="yes" /> <attachpoints> *************** *** 21,25 **** </attachpoints> </widget> ! <widget name="Shortcut2" factory="pawsButton" toggle="no" id="1002"> <frame x="0" y="70" width="25" height="25" border="yes" /> <attachpoints> --- 21,25 ---- </attachpoints> </widget> ! <widget name="Shortcut2" factory="pawsButton" toggle="no" id="1002" shadows="yes"> <frame x="0" y="70" width="25" height="25" border="yes" /> <attachpoints> *************** *** 30,34 **** </attachpoints> </widget> ! <widget name="Shortcut3" factory="pawsButton" toggle="no" id="1003"> <frame x="0" y="95" width="25" height="25" border="yes" /> <attachpoints> --- 30,34 ---- </attachpoints> </widget> ! <widget name="Shortcut3" factory="pawsButton" toggle="no" id="1003" shadows="yes"> <frame x="0" y="95" width="25" height="25" border="yes" /> <attachpoints> *************** *** 39,43 **** </attachpoints> </widget> ! <widget name="Shortcut4" factory="pawsButton" toggle="no" id="1004"> <frame x="0" y="120" width="25" height="25" border="yes" /> <attachpoints> --- 39,43 ---- </attachpoints> </widget> ! <widget name="Shortcut4" factory="pawsButton" toggle="no" id="1004" shadows="yes"> <frame x="0" y="120" width="25" height="25" border="yes" /> <attachpoints> *************** *** 48,52 **** </attachpoints> </widget> ! <widget name="Shortcut5" factory="pawsButton" toggle="no" id="1005"> <frame x="25" y="20" width="25" height="25" border="yes" /> <attachpoints> --- 48,52 ---- </attachpoints> </widget> ! <widget name="Shortcut5" factory="pawsButton" toggle="no" id="1005" shadows="yes"> <frame x="25" y="20" width="25" height="25" border="yes" /> <attachpoints> *************** *** 57,61 **** </attachpoints> </widget> ! <widget name="Shortcut6" factory="pawsButton" toggle="no" id="1006"> <frame x="25" y="45" width="25" height="25" border="yes" /> <attachpoints> --- 57,61 ---- </attachpoints> </widget> ! <widget name="Shortcut6" factory="pawsButton" toggle="no" id="1006" shadows="yes"> <frame x="25" y="45" width="25" height="25" border="yes" /> <attachpoints> *************** *** 66,70 **** </attachpoints> </widget> ! <widget name="Shortcut7" factory="pawsButton" toggle="no" id="1007"> <frame x="25" y="70" width="25" height="25" border="yes" /> <attachpoints> --- 66,70 ---- </attachpoints> </widget> ! <widget name="Shortcut7" factory="pawsButton" toggle="no" id="1007" shadows="yes"> <frame x="25" y="70" width="25" height="25" border="yes" /> <attachpoints> *************** *** 75,79 **** </attachpoints> </widget> ! <widget name="Shortcut8" factory="pawsButton" toggle="no" id="1008"> <frame x="25" y="95" width="25" height="25" border="yes" /> <attachpoints> --- 75,79 ---- </attachpoints> </widget> ! <widget name="Shortcut8" factory="pawsButton" toggle="no" id="1008" shadows="yes"> <frame x="25" y="95" width="25" height="25" border="yes" /> <attachpoints> *************** *** 84,88 **** </attachpoints> </widget> ! <widget name="Shortcut9" factory="pawsButton" toggle="no" id="1009"> <frame x="25" y="120" width="25" height="25" border="yes" /> <attachpoints> --- 84,88 ---- </attachpoints> </widget> ! <widget name="Shortcut9" factory="pawsButton" toggle="no" id="1009" shadows="yes"> <frame x="25" y="120" width="25" height="25" border="yes" /> <attachpoints> Index: prefs.xml =================================================================== RCS file: /cvsroot/planeshift/planeshift/data/prefs.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** prefs.xml 22 Apr 2003 19:16:17 -0000 1.2 --- prefs.xml 30 Oct 2003 00:50:23 -0000 1.3 *************** *** 1,5 **** <prefs> ! <font name="/planeshift/data/ttf/verdana.ttf" r="255" g="255" b="0" /> ! <border> <colour r="0" g="0" b="0" /> --- 1,4 ---- <prefs> ! <font name="/planeshift/data/ttf/verdana.ttf" r="255" g="255" b="0" size="10" /> <border> <colour r="0" g="0" b="0" /> Index: loginwindow.xml =================================================================== RCS file: /cvsroot/planeshift/planeshift/data/loginwindow.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** loginwindow.xml 4 Oct 2003 22:25:35 -0000 1.3 --- loginwindow.xml 30 Oct 2003 00:50:23 -0000 1.4 *************** *** 8,13 **** <widget name="label" factory="pawsTextBox"> <frame x="180" y="160" width="140" height="30" border="no"/> ! <text font="/planeshift/data/ttf/verdana.ttf" ! string="Account User Name:" /> </widget> --- 8,12 ---- <widget name="label" factory="pawsTextBox"> <frame x="180" y="160" width="140" height="30" border="no"/> ! <text string="Account User Name:" /> </widget> *************** *** 15,20 **** <frame x="315" y="155" width="250" height="30" border="no"/> <bgcolour r="128" g="128" b="128" /> - <text font="/planeshift/data/ttf/verdana.ttf" /> - <textcolour r="255" g="255" b="255" /> </widget> --- 14,17 ---- *************** *** 22,46 **** <widget name="label" factory="pawsTextBox"> <frame x="180" y="200" width="140" height="30" border="no"/> ! <text font="/planeshift/data/ttf/verdana.ttf" ! string="Account Password:" /> </widget> <widget name="password" factory="pawsEditTextBox"> <frame x="315" y="195" width="250" height="30" border="no"/> <bgcolour r="128" g="128" b="128" /> - <text font="/planeshift/data/ttf/verdana.ttf" /> - <textcolour r="255" g="255" b="255" /> </widget> <widget name="label" factory="pawsTextBox"> <frame x="180" y="240" width="140" height="30" border="no"/> ! <text font="/planeshift/data/ttf/verdana.ttf" ! string="Server:" /> </widget> <widget name="server" factory="pawsEditTextBox"> <frame x="315" y="235" width="250" height="30" border="no"/> <bgcolour r="128" g="128" b="128" /> ! <text font="/planeshift/data/ttf/verdana.ttf" ! string="localhost" /> ! <textcolour r="255" g="255" b="255" /> </widget> --- 19,37 ---- <widget name="label" factory="pawsTextBox"> <frame x="180" y="200" width="140" height="30" border="no"/> ! <text string="Account Password:" /> </widget> <widget name="password" factory="pawsEditTextBox"> <frame x="315" y="195" width="250" height="30" border="no"/> <bgcolour r="128" g="128" b="128" /> </widget> <widget name="label" factory="pawsTextBox"> <frame x="180" y="240" width="140" height="30" border="no"/> ! <text string="Server:" /> </widget> <widget name="server" factory="pawsEditTextBox"> <frame x="315" y="235" width="250" height="30" border="no"/> <bgcolour r="128" g="128" b="128" /> ! <text string="localhost" /> </widget> *************** *** 51,56 **** <widget name="label" factory="pawsTextBox"> <frame x="170" y="400" width="100" height="30" border="no"/> ! <text font="/planeshift/data/ttf/verdana.ttf" ! string="Exit PlaneShift" /> </widget> --- 42,46 ---- <widget name="label" factory="pawsTextBox"> <frame x="170" y="400" width="100" height="30" border="no"/> ! <text string="Exit PlaneShift" /> </widget> *************** *** 62,67 **** <widget name="label" factory="pawsTextBox"> <frame x="380" y="400" width="100" height="30" border="no"/> ! <text font="/planeshift/data/ttf/verdana.ttf" ! string="Login" /> </widget> --- 52,56 ---- <widget name="label" factory="pawsTextBox"> <frame x="380" y="400" width="100" height="30" border="no"/> ! <text string="Login" /> </widget> *************** *** 73,78 **** <widget name="label" factory="pawsTextBox"> <frame x="570" y="400" width="100" height="30" border="no"/> ! <text font="/planeshift/data/ttf/verdana.ttf" ! string="New Account" /> </widget> --- 62,66 ---- <widget name="label" factory="pawsTextBox"> <frame x="570" y="400" width="100" height="30" border="no"/> ! <text string="New Account" /> </widget> Index: infowindow.xml =================================================================== RCS file: /cvsroot/planeshift/planeshift/data/infowindow.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** infowindow.xml 18 Oct 2003 16:39:37 -0000 1.10 --- infowindow.xml 30 Oct 2003 00:50:23 -0000 1.11 *************** *** 11,15 **** <widget name="Position" factory="pawsTextBox" > <frame x="6" y="4" width="200" height="10" border="no"/> - <text font="/planeshift/data/ttf/verdana.ttf" string="" /> </widget> --- 11,14 ---- *************** *** 28,32 **** <widget name="My HP Pct" factory="pawsTextBox"> <frame x="129" y="22" width="40" height="10" border="no"/> - <textcolour r="255" g="0" b="0" /> <text string="0%" /> </widget> --- 27,30 ---- *************** *** 39,43 **** <widget name="My Mana Pct" factory="pawsTextBox"> <frame x="129" y="32" width="40" height="10" border="no"/> - <textcolour r="255" g="0" b="0" /> <text string="0%" /> </widget> --- 37,40 ---- *************** *** 50,54 **** <widget name="My Fatigue Pct" factory="pawsTextBox"> <frame x="129" y="42" width="40" height="10" border="no"/> - <textcolour r="255" g="0" b="0" /> <text string="0%" /> </widget> --- 47,50 ---- *************** *** 59,63 **** <widget name="Targeted" factory="pawsTextBox"> <frame x="6" y="55" width="160" height="10" border="no"/> - <textcolour r="255" g="0" b="0" /> <text string="No Target" /> </widget> --- 55,58 ---- *************** *** 69,73 **** <widget name="Target HP Pct" factory="pawsTextBox"> <frame x="129" y="65" width="40" height="10" border="no"/> - <textcolour r="255" g="0" b="0" /> <text string="0%" /> </widget> --- 64,67 ---- *************** *** 77,81 **** <widget name="Time" factory="pawsTextBox"> <frame x="6" y="80" width="100" height="40" border="no"/> - <textcolour r="255" g="255" b="255" /> <text string="Time: " /> </widget> --- 71,74 ---- *************** *** 85,89 **** <widget name="My Progression" factory="pawsTextBox"> <frame x="180" y="95" width="100" height="40" border="no"/> - <textcolour r="255" g="255" b="255" /> <text string=" " /> </widget> --- 78,81 ---- *************** *** 96,100 **** <widget name="My Experience Pct" factory="pawsTextBox"> <frame x="129" y="95" width="40" height="10" border="no"/> - <textcolour r="255" g="0" b="0" /> <text string="0%" /> </widget> --- 88,91 ---- *************** *** 106,110 **** <widget name="KFactor Pct" factory="pawsTextBox"> <frame x="129" y="105" width="40" height="10" border="no"/> - <textcolour r="255" g="0" b="0" /> <text string="0%" /> </widget> --- 97,100 ---- Index: imagelist.xml =================================================================== RCS file: /cvsroot/planeshift/planeshift/data/imagelist.xml,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** imagelist.xml 18 Oct 2003 12:26:00 -0000 1.29 --- imagelist.xml 30 Oct 2003 00:50:23 -0000 1.30 *************** *** 80,83 **** --- 80,91 ---- </image> + <image file="/this/art/gui/darkblue_bg.png" resource="Blue Background" tiled="true" > + <alpha level="0" /> + </image> + + <image file="/this/art/gui/darkblue_title.png" resource="Blue Title" > + <alpha level="0" /> + </image> + <image file="/this/art/gui/accepted_back.png" resource="Accepted Background"> <alpha level="200" /> Index: chat.xml =================================================================== RCS file: /cvsroot/planeshift/planeshift/data/chat.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** chat.xml 4 Oct 2003 22:25:35 -0000 1.10 --- chat.xml 30 Oct 2003 00:50:23 -0000 1.11 *************** *** 5,16 **** ContextMenu="data/chatmenu.xml" resizable="yes" > ! <frame x="400" y="0" width="400" height="320" border="default" /> <minframe width="275" height="145"/> ! <bgimage resource="Standard Background" alpha="200" /> ! <widget name="SystemText" factory="pawsMessageTextBox"> <frame x="4" y="4" width="392" height="96" border="yes"/> - <text font="/planeshift/data/ttf/verdana.ttf" /> <attachpoints> --- 5,16 ---- ContextMenu="data/chatmenu.xml" resizable="yes" > ! <font name="/planeshift/data/ttf/verdana.ttf" r="255" g="255" b="255" size="8" /> <frame x="400" y="0" width="400" height="320" border="default" /> <minframe width="275" height="145"/> ! <bgimage resource="Blue Background" alpha="200" /> ! <childborders> ! <colour r="0" g="0" b="0" /> <colour r="0" g="0" b="255" /> <colour r="32" g="32" b="32" /> <colour r="148" g="138" b="255" /> <colour r="64" g="64" b="64" /> </childborders> <widget name="SystemText" factory="pawsMessageTextBox"> <frame x="4" y="4" width="392" height="96" border="yes"/> <attachpoints> *************** *** 19,23 **** <attach point="ATTACH_LEFT" /> <attach point="PROPORTIONAL_BOTTOM" /> ! </attachpoints> </widget> --- 19,23 ---- <attach point="ATTACH_LEFT" /> <attach point="PROPORTIONAL_BOTTOM" /> ! </attachpoints> </widget> *************** *** 36,40 **** <widget name="InputText" factory="pawsEditTextBox"> <frame x="4" y="260" width="392" height="30" border="yes"/> - <text font="/planeshift/data/ttf/verdana.ttf" /> <attachpoints> <attach point="ATTACH_RIGHT" /> --- 36,39 ---- *************** *** 45,53 **** </widget> ! <widget name="Say Button" factory="pawsButton" toggle="yes" id="1" > <frame x="4" y="295" width="64" height="16" border="no" /> ! <buttonup resource="Say Up" /> ! <buttondown resource="Say Down" /> ! <attachpoints> <attach point="ATTACH_LEFT" /> --- 44,52 ---- </widget> ! <widget name="Say Button" factory="pawsButton" toggle="yes" id="1" shadows="yes" > <frame x="4" y="295" width="64" height="16" border="no" /> ! <buttonup resource="Blue Title" /> ! <buttondown resource="Blue Title" /> ! <label text="Say" /> <attachpoints> <attach point="ATTACH_LEFT" /> *************** *** 56,63 **** </widget> ! <widget name="Shout Button" factory="pawsButton" toggle="yes" id="2" > <frame x="70" y="295" width="64" height="16" border="no" /> ! <buttonup resource="Shout Up" /> ! <buttondown resource="Shout Down" /> <attachpoints> --- 55,63 ---- </widget> ! <widget name="Shout Button" factory="pawsButton" toggle="yes" id="2" shadows="yes" > <frame x="70" y="295" width="64" height="16" border="no" /> ! <buttonup resource="Blue Title" /> ! <buttondown resource="Blue Title" /> ! <label text="Shout" /> <attachpoints> *************** *** 67,74 **** </widget> ! <widget name="Guild Button" factory="pawsButton" toggle="yes" id="3" > <frame x="136" y="295" width="64" height="16" border="no" /> ! <buttonup resource="Guild Up" /> ! <buttondown resource="Guild Down" /> <attachpoints> --- 67,75 ---- </widget> ! <widget name="Guild Button" factory="pawsButton" toggle="yes" id="3" shadows="yes" > <frame x="136" y="295" width="64" height="16" border="no" /> ! <buttonup resource="Blue Title" /> ! <buttondown resource="Blue Title" /> ! <label text="Guild" /> <attachpoints> *************** *** 78,85 **** </widget> ! <widget name="Group Button" factory="pawsButton" toggle="yes" id="4" > <frame x="202" y="295" width="64" height="16" border="no" /> ! <buttonup resource="Group Up" /> ! <buttondown resource="Group Down" /> <attachpoints> --- 79,87 ---- </widget> ! <widget name="Group Button" factory="pawsButton" toggle="yes" id="4" shadows="yes" > <frame x="202" y="295" width="64" height="16" border="no" /> ! <buttonup resource="Blue Title" /> ! <buttondown resource="Blue Title" /> ! <label text="Group" /> <attachpoints> Index: charpick.xml =================================================================== RCS file: /cvsroot/planeshift/planeshift/data/charpick.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** charpick.xml 19 Aug 2003 01:04:44 -0000 1.2 --- charpick.xml 30 Oct 2003 00:50:23 -0000 1.3 *************** *** 34,39 **** <widget name="label" factory="pawsTextBox"> <frame x="575" y="350" width="100" height="30" border="no"/> ! <text font="/planeshift/data/ttf/verdana.ttf" ! string="Join Game" /> </widget> --- 34,38 ---- <widget name="label" factory="pawsTextBox"> <frame x="575" y="350" width="100" height="30" border="no"/> ! <text string="Join Game" /> </widget> |