From: <ko...@us...> - 2009-02-28 00:51:07
|
Revision: 3117 http://planeshift.svn.sourceforge.net/planeshift/?rev=3117&view=rev Author: kougaro Date: 2009-02-28 00:33:48 +0000 (Sat, 28 Feb 2009) Log Message: ----------- merged r3051-3116 from trunk Modified Paths: -------------- personal/kougaro/data/gui/buddy.xml personal/kougaro/data/gui/chat.xml personal/kougaro/data/gui/configkeys.xml personal/kougaro/data/gui/configsound.xml personal/kougaro/data/gui/configwindow.xml personal/kougaro/data/gui/gmguiwindow.xml personal/kougaro/data/gui/helpwindow.xml personal/kougaro/data/gui/ok.xml personal/kougaro/data/gui/petition.xml personal/kougaro/data/gui/petitiongm.xml personal/kougaro/data/gui/pslaunch.xml personal/kougaro/data/gui/questnotebook.xml personal/kougaro/data/gui/quitinfo.xml personal/kougaro/data/gui/shortcutwindow.xml personal/kougaro/data/gui/spellwindow.xml personal/kougaro/data/gui/styles.xml personal/kougaro/data/gui/yesno.xml personal/kougaro/data/help.xml personal/kougaro/data/options/shortcutcommands_def.xml personal/kougaro/data/options/sound_def.xml personal/kougaro/docs/history.txt personal/kougaro/docs/todo.txt personal/kougaro/pslaunch.cfg personal/kougaro/src/client/cmdusers.cpp personal/kougaro/src/client/gui/inventorywindow.cpp personal/kougaro/src/client/gui/pawsbuddy.cpp personal/kougaro/src/client/gui/pawsbuddy.h personal/kougaro/src/client/gui/pawscharcreatemain.cpp personal/kougaro/src/client/gui/pawsconfigsound.cpp personal/kougaro/src/client/gui/pawsconfigsound.h personal/kougaro/src/client/gui/pawscreditswindow.cpp personal/kougaro/src/client/gui/pawsgameboard.cpp personal/kougaro/src/client/gui/pawsgroupwindow.cpp personal/kougaro/src/client/gui/pawshelp.cpp personal/kougaro/src/client/gui/pawsilluminationwindow.cpp personal/kougaro/src/client/gui/pawspetitiongmwindow.cpp personal/kougaro/src/client/gui/pawspetitiongmwindow.h personal/kougaro/src/client/gui/pawspetitionwindow.cpp personal/kougaro/src/client/gui/pawspetitionwindow.h personal/kougaro/src/client/gui/pawsquestwindow.cpp personal/kougaro/src/client/gui/pawsquestwindow.h personal/kougaro/src/client/gui/pawsslot.cpp personal/kougaro/src/client/gui/psmainwidget.cpp personal/kougaro/src/client/gui/shortcutwindow.cpp personal/kougaro/src/client/gui/shortcutwindow.h personal/kougaro/src/client/iclient/isoundmngr.h personal/kougaro/src/client/modehandler.cpp personal/kougaro/src/client/psengine.cpp personal/kougaro/src/client/sound/pssoundmngr.cpp personal/kougaro/src/client/sound/pssoundmngr.h personal/kougaro/src/common/net/messages.cpp personal/kougaro/src/common/net/messages.h personal/kougaro/src/common/paws/pawsborder.cpp personal/kougaro/src/common/paws/pawsbutton.cpp personal/kougaro/src/common/paws/pawscrollbar.cpp personal/kougaro/src/common/paws/pawscrollbar.h personal/kougaro/src/common/paws/pawsframedrawable.cpp personal/kougaro/src/common/paws/pawsframedrawable.h personal/kougaro/src/common/paws/pawsimagedrawable.h personal/kougaro/src/common/paws/pawslistbox.cpp personal/kougaro/src/common/paws/pawsmanager.cpp personal/kougaro/src/common/paws/pawsmanager.h personal/kougaro/src/common/paws/pawsprogressbar.cpp personal/kougaro/src/common/paws/pawspromptwindow.cpp personal/kougaro/src/common/paws/pawsspinbox.cpp personal/kougaro/src/common/paws/pawsspinbox.h personal/kougaro/src/common/paws/pawsstringpromptwindow.cpp personal/kougaro/src/common/paws/pawsstringpromptwindow.h personal/kougaro/src/common/paws/pawsstyles.cpp personal/kougaro/src/common/paws/pawstabwindow.cpp personal/kougaro/src/common/paws/pawstabwindow.h personal/kougaro/src/common/paws/pawstextbox.cpp personal/kougaro/src/common/paws/pawstexturemanager.cpp personal/kougaro/src/common/paws/pawstexturemanager.h personal/kougaro/src/common/paws/pawstextwrap.cpp personal/kougaro/src/common/paws/pawstree.cpp personal/kougaro/src/common/paws/pawswidget.cpp personal/kougaro/src/common/paws/pawswidget.h personal/kougaro/src/common/paws/pawsyesnobox.cpp personal/kougaro/src/common/paws/pawsyesnobox.h personal/kougaro/src/common/util/psxmlparser.cpp personal/kougaro/src/npcclient/npc.cpp personal/kougaro/src/npcclient/pathfind.h personal/kougaro/src/npcclient/tribe.h personal/kougaro/src/npcclient/tribeneed.h personal/kougaro/src/npcclient/walkpoly.h personal/kougaro/src/pslaunch/pawslauncherwindow.cpp personal/kougaro/src/pslaunch/pawslauncherwindow.h personal/kougaro/src/pslaunch/pslaunch.cpp personal/kougaro/src/pslaunch/updaterengine.cpp personal/kougaro/src/pslaunch/updaterengine.h personal/kougaro/src/server/adminmanager.cpp personal/kougaro/src/server/adminmanager.h personal/kougaro/src/server/bulkobjects/dictionary.cpp personal/kougaro/src/server/bulkobjects/pscharinventory.cpp personal/kougaro/src/server/bulkobjects/psitem.cpp personal/kougaro/src/server/bulkobjects/psquestprereqops.cpp personal/kougaro/src/server/commandmanager.cpp personal/kougaro/src/server/gem.cpp personal/kougaro/src/server/guildmanager.cpp personal/kougaro/src/server/msgmanager.cpp personal/kougaro/src/server/msgmanager.h personal/kougaro/src/server/psserver.cpp personal/kougaro/src/server/psserver.h personal/kougaro/src/server/slotmanager.cpp personal/kougaro/src/server/usermanager.cpp personal/kougaro/src/server/usermanager.h personal/kougaro/src/server/workmanager.h personal/kougaro/src/tools/pawseditor/pawseditorapp.cpp Property Changed: ---------------- personal/kougaro/ Property changes on: personal/kougaro ___________________________________________________________________ Modified: svn:mergeinfo - /personal/Xordan:1745,1752,1812,1838,1887,1894,2012,2014-2017,2055-2056,2062,2064,2270,2272-2273,2277-2278,2283-2284,2286-2287,2290-2291,2330,2333-2334,2336,2424,2592,2595-2596,2598-2603,2613 /trunk:2804-2870,2873-2972,2975-3050 + /personal/Xordan:1745,1752,1812,1838,1887,1894,2012,2014-2017,2055-2056,2062,2064,2270,2272-2273,2277-2278,2283-2284,2286-2287,2290-2291,2330,2333-2334,2336,2424,2592,2595-2596,2598-2603,2613 /trunk:2804-2870,2873-2972,2975-3050,3052-3116 Modified: personal/kougaro/data/gui/buddy.xml =================================================================== --- personal/kougaro/data/gui/buddy.xml 2009-02-27 17:42:32 UTC (rev 3116) +++ personal/kougaro/data/gui/buddy.xml 2009-02-28 00:33:48 UTC (rev 3117) @@ -1,69 +1,37 @@ <widget_description> <widget name="BuddyWindow" factory="pawsBuddyWindow" - visible="no" savepositions="yes" movable="yes" keepaspect="no" configurable="yes" resizable="yes"> + visible="no" savepositions="yes" movable="yes" keepaspect="no" configurable="yes" resizable="yes" style="New Standard GUI"> <frame x="0" y="100" width="170" height="290" border="yes" /> <minframe width="165" height="230" /> - <maxframe width="355" height="860" /> - <title resource="Blue Title" text="Buddy List" align="left" close_button="yes" /> - <bgimage resource="Buddy Background" alpha="128" /> - - + <maxframe width="355" height="860" /> + + <title resource="Scaling Title Bar" text="Buddy List" align="left" close_button="yes" /> + <widget name="BuddyList" factory="pawsListBox" > - <frame x="33" y="33" width="135" height="219" border="no" /> - <highlight resource="Hightlight" alpha="128" /> + <frame x="12" y="12" width="145" height="240" border="no" /> <columns height="16"> <column width="250" > - <widget name="Name" factory="pawsTextBox"> + <widget name="Name" factory="pawsTextBox" border="yes"> <font name="/planeshift/data/ttf/LiberationMono-Regular.ttf" size="10" scalefont="no" /> </widget> </column> </columns> - <attachpoints> - <attach point="PROPORTIONAL_RIGHT" /> - <attach point="PROPORTIONAL_TOP" /> - <attach point="PROPORTIONAL_LEFT" /> - <attach point="PROPORTIONAL_BOTTOM" /> - </attachpoints> </widget> - <widget name="edit" factory="pawsButton" toggle="no" id="4000" shadows="yes"> - <frame x="5" y="263" width="40" height="20" border="yes" /> - <buttonup resource="Standard Button" /> - <buttondown resource="Standard Button" /> - <attachpoints> - <attach point="PROPORTIONAL_RIGHT" /> - <attach point="ATTACH_LEFT" /> - <attach point="PROPORTIONAL_TOP" /> - <attach point="ATTACH_BOTTOM" /> - </attachpoints> + <widget name="edit" factory="pawsButton" id="4000"> + <frame x="10" y="263" width="35" height="20" border="no" /> <label text="Edit" /> </widget> - <widget name="add" factory="pawsButton" toggle="no" id="3000" shadows="yes"> - <frame x="50" y="263" width="40" height="20" border="yes" /> - <buttonup resource="Standard Button" /> - <buttondown resource="Standard Button" /> - <attachpoints> - <attach point="PROPORTIONAL_RIGHT" /> - <attach point="PROPORTIONAL_LEFT" /> - <attach point="PROPORTIONAL_TOP" /> - <attach point="ATTACH_BOTTOM" /> - </attachpoints> + <widget name="add" factory="pawsButton" id="3000"> + <frame x="65" y="263" width="30" height="20" border="no" /> <label text="Add" /> </widget> - <widget name="remove" factory="pawsButton" toggle="no" id="2000" shadows="yes"> - <frame x="95" y="263" width="60" height="20" border="yes" /> - <buttonup resource="Standard Button" /> - <buttondown resource="Standard Button" /> - <attachpoints> - <attach point="PROPORTIONAL_RIGHT" /> - <attach point="PROPORTIONAL_LEFT" /> - <attach point="PROPORTIONAL_TOP" /> - <attach point="ATTACH_BOTTOM" /> - </attachpoints> + <widget name="remove" factory="pawsButton" id="2000"> + <frame x="120" y="263" width="40" height="20" border="no" /> <label text="Remove" /> </widget> Modified: personal/kougaro/data/gui/chat.xml =================================================================== --- personal/kougaro/data/gui/chat.xml 2009-02-27 17:42:32 UTC (rev 3116) +++ personal/kougaro/data/gui/chat.xml 2009-02-28 00:33:48 UTC (rev 3117) @@ -1,229 +1,106 @@ <widget_description> - <widget name="ChatWindow" factory="pawsChatWindow" visible="yes" savepositions="yes" movable="yes" resizable="yes" keepaspect="no" configurable="yes"> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="180" g="180" b="180" size="8" /> + <widget name="ChatWindow" factory="pawsChatWindow" visible="yes" savepositions="yes" movable="yes" resizable="yes" keepaspect="no" configurable="yes" style="New Standard GUI"> <frame x="360" y="300" width="330" height="122" border="no" /> <minframe width="280" height="110" /> - <bgimage resource="Chat Background" alpha="128" /> <title resource="Nanaki Title Bar" text="Communication" align="left" close_button="yes"/> - <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="InputText" factory="pawsEditTextBox"> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="180" g="180" b="180" size="9" scalefont="no" /> - <frame x="18" y="90" width="287" height="15" border="no" /> + <frame x="6" y="100" width="315" height="20" border="yes" /> <attachpoints> <attach point="ATTACH_RIGHT" /> - <attach point="PROPORTIONAL_BOTTOM" /> - <attach point="PROPORTIONAL_TOP" /> + <attach point="ATTACH_BOTTOM" /> <attach point="ATTACH_LEFT" /> </attachpoints> </widget> <widget name="Chat Tabs" factory="pawsTabWindow"> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="180" g="180" b="180" size="9" scalefont="no" /> - <frame x="6" y="2" width="330" height="100" border="no" /> + + <defaultstyle widget="pawsButton" style="New Standard Tab"/> + + <frame x="6" y="2" width="320" height="95" border="no" /> <attachpoints> <attach point="ATTACH_RIGHT" /> <attach point="ATTACH_TOP" /> <attach point="ATTACH_LEFT" /> - <attach point="PROPORTIONAL_BOTTOM" /> + <attach point="ATTACH_BOTTOM" /> </attachpoints> - <childborders> + <!--childborders> <colour r="0" g="0" b="0" /> <colour r="32" g="32" b="32" /> <colour r="180" g="180" b="180" /> <colour r="180" g="180" b="180" /> <colour r="220" g="220" b="220" /> - </childborders> - <widget name="Main Button" factory="pawsButton" toggle="yes" id="1000" shadows="yes"> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="180" g="180" b="180" size="8" scalefont="yes" /> - <frame x="19" y="0" width="25" height="16" border="no" /> - <buttonup resource="Chat Tab Button Up" /> - <buttondown resource="Chat Tab Button Down" /> - <buttonspecial resource="Chat Tab Button Special" /> - <attachpoints> - <attach point="PROPORTIONAL_RIGHT" /> - <attach point="PROPORTIONAL_LEFT" /> - <attach point="ATTACH_TOP" /> - <attach point="PROPORTIONAL_BOTTOM" /> - </attachpoints> + </childborders--> + + <widget name="Main Button" factory="pawsButton" id="1000" shadows="yes"> <label text="Main" /> + <frame x="0" y="5" width="25" height="16" border="no" /> </widget> - <widget name="NPC Button" factory="pawsButton" toggle="yes" id="1002" shadows="yes"> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="180" g="180" b="180" size="8" scalefont="yes" /> - <frame x="45" y="0" width="30" height="16" border="no" /> - <buttonup resource="Chat Tab Button Up" /> - <buttondown resource="Chat Tab Button Down" /> - <buttonspecial resource="Chat Tab Button Special" /> - <attachpoints> - <attach point="PROPORTIONAL_RIGHT" /> - <attach point="PROPORTIONAL_LEFT" /> - <attach point="ATTACH_TOP" /> - <attach point="PROPORTIONAL_BOTTOM" /> - </attachpoints> + + <widget name="NPC Button" factory="pawsButton" id="1002" shadows="yes"> <label text="NPC" /> + <frame x="25" y="5" width="30" height="16" border="no" /> </widget> - <widget name="Tell Button" factory="pawsButton" toggle="yes" id="1003" shadows="yes"> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="180" g="180" b="180" size="8" scalefont="yes" /> - <frame x="76" y="0" width="30" height="16" border="no" /> - <buttonup resource="Chat Tab Button Up" /> - <buttondown resource="Chat Tab Button Down" /> - <buttonspecial resource="Chat Tab Button Special" /> - <attachpoints> - <attach point="PROPORTIONAL_RIGHT" /> - <attach point="PROPORTIONAL_LEFT" /> - <attach point="ATTACH_TOP" /> - <attach point="PROPORTIONAL_BOTTOM" /> - </attachpoints> + + <widget name="Tell Button" factory="pawsButton" id="1003" shadows="yes"> <label text="Tells" /> + <frame x="56" y="5" width="30" height="16" border="no" /> </widget> - <widget name="Guild Button" factory="pawsButton" toggle="yes" id="1004" shadows="yes"> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="180" g="180" b="180" size="8" scalefont="yes" /> - <frame x="107" y="0" width="35" height="16" border="no" /> - <buttonup resource="Chat Tab Button Up" /> - <buttondown resource="Chat Tab Button Down" /> - <buttonspecial resource="Chat Tab Button Special" /> - <attachpoints> - <attach point="PROPORTIONAL_RIGHT" /> - <attach point="PROPORTIONAL_LEFT" /> - <attach point="ATTACH_TOP" /> - <attach point="PROPORTIONAL_BOTTOM" /> - </attachpoints> + + <widget name="Guild Button" factory="pawsButton" id="1004" shadows="yes"> <label text="Guild" /> + <frame x="87" y="5" width="35" height="16" border="no" /> </widget> - <widget name="Group Button" factory="pawsButton" toggle="yes" id="1005" shadows="yes"> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="180" g="180" b="180" size="8" scalefont="yes" /> - <frame x="143" y="0" width="35" height="16" border="no" /> - <buttonup resource="Chat Tab Button Up" /> - <buttondown resource="Chat Tab Button Down" /> - <buttonspecial resource="Chat Tab Button Special" /> - <attachpoints> - <attach point="PROPORTIONAL_RIGHT" /> - <attach point="PROPORTIONAL_LEFT" /> - <attach point="ATTACH_TOP" /> - <attach point="PROPORTIONAL_BOTTOM" /> - </attachpoints> + + <widget name="Group Button" factory="pawsButton" id="1005" shadows="yes"> <label text="Group" /> + <frame x="123" y="5" width="35" height="16" border="no" /> </widget> - <widget name="Auction Button" factory="pawsButton" toggle="yes" id="1006" shadows="yes"> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="180" g="180" b="180" size="8" scalefont="yes" /> - <frame x="179" y="0" width="40" height="16" border="no" /> - <buttonup resource="Chat Tab Button Up" /> - <buttondown resource="Chat Tab Button Down" /> - <buttonspecial resource="Chat Tab Button Special" /> - <attachpoints> - <attach point="PROPORTIONAL_RIGHT" /> - <attach point="PROPORTIONAL_LEFT" /> - <attach point="ATTACH_TOP" /> - <attach point="PROPORTIONAL_BOTTOM" /> - </attachpoints> + + <widget name="Auction Button" factory="pawsButton" id="1006" shadows="yes"> <label text="Auction" /> + <frame x="159" y="5" width="40" height="16" border="no" /> </widget> - <widget name="System Button" factory="pawsButton" toggle="yes" id="1001" shadows="yes"> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="180" g="180" b="180" size="8" scalefont="yes" /> - <frame x="220" y="0" width="45" height="16" border="no" /> - <buttonup resource="Chat Tab Button Up" /> - <buttondown resource="Chat Tab Button Down" /> - <buttonspecial resource="Chat Tab Button Special" /> - <attachpoints> - <attach point="PROPORTIONAL_RIGHT" /> - <attach point="PROPORTIONAL_LEFT" /> - <attach point="ATTACH_TOP" /> - <attach point="PROPORTIONAL_BOTTOM" /> - </attachpoints> + + <widget name="System Button" factory="pawsButton" id="1001"> <label text="System" /> + <frame x="200" y="5" width="45" height="16" border="no" /> </widget> - <widget name="Help Button" factory="pawsButton" toggle="yes" id="1007" shadows="yes"> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="180" g="180" b="180" size="8" scalefont="yes" /> - <frame x="285" y="0" width="30" height="16" border="no" /> - <buttonup resource="Chat Tab Button Up" /> - <buttondown resource="Chat Tab Button Down" /> - <buttonspecial resource="Chat Tab Button Special" /> - <attachpoints> - <attach point="PROPORTIONAL_RIGHT" /> - <attach point="PROPORTIONAL_LEFT" /> - <attach point="ATTACH_TOP" /> - <attach point="PROPORTIONAL_BOTTOM" /> - </attachpoints> + <widget name="Help Button" factory="pawsButton" id="1007"> <label text="Help" /> + <frame x="285" y="5" width="30" height="16" border="no" /> </widget> <widget name="MainText" factory="pawsMessageTextBox" visible="no" id="1100"> - <frame x="18" y="18" width="300" height="74" border="no" /> - <attachpoints> - <attach point="ATTACH_RIGHT" /> - <attach point="PROPORTIONAL_TOP" /> - <attach point="PROPORTIONAL_LEFT" /> - <attach point="PROPORTIONAL_BOTTOM" /> - </attachpoints> + <frame x="0" y="20" width="320" height="80" border="no" /> </widget> + <widget name="SystemText" factory="pawsMessageTextBox" visible="no" id="1101"> - <frame x="18" y="18" width="300" height="74" border="no" /> - <attachpoints> - <attach point="ATTACH_RIGHT" /> - <attach point="PROPORTIONAL_TOP" /> - <attach point="PROPORTIONAL_LEFT" /> - <attach point="PROPORTIONAL_BOTTOM" /> - </attachpoints> + <frame x="0" y="20" width="320" height="80" border="no" /> </widget> + <widget name="NpcText" factory="pawsMessageTextBox" visible="no" id="1102"> - <frame x="18" y="18" width="300" height="74" border="no" /> - <attachpoints> - <attach point="ATTACH_RIGHT" /> - <attach point="PROPORTIONAL_TOP" /> - <attach point="PROPORTIONAL_LEFT" /> - <attach point="PROPORTIONAL_BOTTOM" /> - </attachpoints> + <frame x="0" y="20" width="320" height="80" border="no" /> </widget> + <widget name="TellText" factory="pawsMessageTextBox" visible="no" id="1103"> - <frame x="18" y="18" width="300" height="74" border="no" /> - <attachpoints> - <attach point="ATTACH_RIGHT" /> - <attach point="PROPORTIONAL_TOP" /> - <attach point="PROPORTIONAL_LEFT" /> - <attach point="PROPORTIONAL_BOTTOM" /> - </attachpoints> + <frame x="0" y="20" width="320" height="80" border="no" /> </widget> + <widget name="GuildText" factory="pawsMessageTextBox" visible="no" id="1104"> - <frame x="18" y="18" width="300" height="74" border="no" /> - <attachpoints> - <attach point="ATTACH_RIGHT" /> - <attach point="PROPORTIONAL_TOP" /> - <attach point="PROPORTIONAL_LEFT" /> - <attach point="PROPORTIONAL_BOTTOM" /> - </attachpoints> + <frame x="0" y="20" width="320" height="80" border="no" /> </widget> + <widget name="GroupText" factory="pawsMessageTextBox" visible="no" id="1105"> - <frame x="18" y="18" width="300" height="74" border="no" /> - <attachpoints> - <attach point="ATTACH_RIGHT" /> - <attach point="PROPORTIONAL_TOP" /> - <attach point="PROPORTIONAL_LEFT" /> - <attach point="PROPORTIONAL_BOTTOM" /> - </attachpoints> + <frame x="0" y="20" width="320" height="80" border="no" /> </widget> + <widget name="AuctionText" factory="pawsMessageTextBox" visible="no" id="1106"> - <frame x="18" y="18" width="300" height="74" border="no" /> - <attachpoints> - <attach point="ATTACH_RIGHT" /> - <attach point="PROPORTIONAL_TOP" /> - <attach point="PROPORTIONAL_LEFT" /> - <attach point="PROPORTIONAL_BOTTOM" /> - </attachpoints> + <frame x="0" y="20" width="320" height="80" border="no" /> </widget> + <widget name="HelpText" factory="pawsMessageTextBox" visible="no" id="1107"> - <frame x="18" y="18" width="300" height="74" border="no" /> - <attachpoints> - <attach point="ATTACH_RIGHT" /> - <attach point="PROPORTIONAL_TOP" /> - <attach point="PROPORTIONAL_LEFT" /> - <attach point="PROPORTIONAL_BOTTOM" /> - </attachpoints> + <frame x="0" y="20" width="320" height="80" border="no" /> </widget> </widget> </widget> Modified: personal/kougaro/data/gui/configkeys.xml =================================================================== --- personal/kougaro/data/gui/configkeys.xml 2009-02-27 17:42:32 UTC (rev 3116) +++ personal/kougaro/data/gui/configkeys.xml 2009-02-28 00:33:48 UTC (rev 3117) @@ -1,7 +1,10 @@ <widget_description> <widget name="ConfigKeysTree" factory="pawsTreeNode" - visible="yes" savepositions="no" movable="no" resizable="no" > - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="200" g="200" b="200" size="10" scalefont="no" /> + visible="yes" savepositions="no" movable="no" resizable="no" > + + <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="200" g="200" b="200" size="10" scalefont="no" /> + <bgimage resource="Scaling Widget Background" /> + <widget factory="pawsSeqTreeNode"> <widget factory="pawsWidgetTreeNode" name="Movement"> <nodewidget> Modified: personal/kougaro/data/gui/configsound.xml =================================================================== --- personal/kougaro/data/gui/configsound.xml 2009-02-27 17:42:32 UTC (rev 3116) +++ personal/kougaro/data/gui/configsound.xml 2009-02-28 00:33:48 UTC (rev 3117) @@ -1,89 +1,103 @@ <widget_description> <widget name="ConfigPvPTree" factory="pawsConfigPvP" visible="no" savepositions="no" movable="no" resizable="no" >\ - <frame x="225" y="10" width="400" height="300" border="no" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="200" g="200" b="200" size="10" scalefont="no" /> - + <frame x="225" y="10" width="400" height="300" border="no" /> + <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="200" g="200" b="200" size="10" scalefont="no" /> + <widget name="music" factory="pawsCheckBox"> <frame x="10" y="10" width="190" height="20" /> <text string="Background music"/> </widget> - + <widget name="ambient" factory="pawsCheckBox"> - <frame x="10" y="40" width="190" height="20" /> + <frame x="10" y="35" width="190" height="20" /> <text string="Ambient sounds"/> </widget> - + <widget name="actions" factory="pawsCheckBox"> - <frame x="10" y="70" width="190" height="20" /> + <frame x="10" y="60" width="190" height="20" /> <text string="Actions sounds"/> </widget> - + <widget name="gui" factory="pawsCheckBox"> - <frame x="10" y="100" width="190" height="20" /> + <frame x="10" y="85" width="190" height="20" /> <text string="Interface sounds"/> </widget> - + + <widget name="voices" factory="pawsCheckBox"> + <frame x="10" y="110" width="190" height="20" /> + <text string="Voices"/> + </widget> + <widget name="" factory="pawsTextBox"> <frame x="10" y="140" width="140" height="20" /> <text string="Master Volume"/> </widget> - + <widget name="generalVol" factory="pawsScrollBar" direction="horizontal" > <frame x="150" y="140" width="100" height="15" border="no" /> </widget> - + <widget name="" factory="pawsTextBox"> <frame x="10" y="170" width="140" height="20" /> <text string="Music Volume"/> </widget> - + <widget name="musicVol" factory="pawsScrollBar" direction="horizontal" > <frame x="150" y="170" width="100" height="15" border="no" /> </widget> - + <widget name="" factory="pawsTextBox"> - <frame x="10" y="200" width="140" height="20" /> + <frame x="10" y="195" width="140" height="20" /> <text string="Ambient Volume"/> </widget> - + <widget name="ambientVol" factory="pawsScrollBar" direction="horizontal" > - <frame x="150" y="200" width="100" height="15" border="no" /> + <frame x="150" y="195" width="100" height="15" border="no" /> </widget> - + <widget name="" factory="pawsTextBox"> - <frame x="10" y="230" width="140" height="20" /> + <frame x="10" y="220" width="140" height="20" /> <text string="Actions Volume"/> </widget> - + <widget name="actionsVol" factory="pawsScrollBar" direction="horizontal" > - <frame x="150" y="230" width="100" height="15" border="no" /> + <frame x="150" y="220" width="100" height="15" border="no" /> </widget> - + <widget name="" factory="pawsTextBox"> - <frame x="10" y="260" width="140" height="20" /> + <frame x="10" y="245" width="140" height="20" /> <text string="Interface Volume"/> </widget> - - <widget name="guiVol" factory="pawsScrollBar" direction="horizontal" > - <frame x="150" y="260" width="100" height="15" border="no" /> + + <widget name="guiVol" factory="pawsScrollBar" direction="horizontal" > + <frame x="150" y="245" width="100" height="15" border="no" /> </widget> - - <widget name="muteOnFocusLoss" factory="pawsCheckBox"> - <frame x="10" y="280" width="220" height="20" /> - <text string="Mute sounds on focus loss"/> + + <widget name="" factory="pawsTextBox"> + <frame x="10" y="270" width="140" height="20" /> + <text string="Voices Volume"/> </widget> - + + <widget name="voicesVol" factory="pawsScrollBar" direction="horizontal" > + <frame x="150" y="270" width="100" height="15" border="no" /> + </widget> + <widget name="combatMusic" factory="pawsCheckBox"> <frame x="200" y="10" width="220" height="20" /> <text string="Combat music"/> </widget> <widget name="loopBGM" factory="pawsCheckBox"> - <frame x="200" y="40" width="220" height="20" /> + <frame x="200" y="35" width="220" height="20" /> <text string="Loop background music"/> </widget> + <widget name="muteOnFocusLoss" factory="pawsCheckBox"> + <frame x="200" y="60" width="220" height="20" /> + <text string="Mute on focus loss"/> + </widget> + </widget> -</widget_description> \ No newline at end of file +</widget_description> Modified: personal/kougaro/data/gui/configwindow.xml =================================================================== --- personal/kougaro/data/gui/configwindow.xml 2009-02-27 17:42:32 UTC (rev 3116) +++ personal/kougaro/data/gui/configwindow.xml 2009-02-28 00:33:48 UTC (rev 3117) @@ -1,21 +1,18 @@ <?xml version="1.0"?> <widget_description> -<widget name="ConfigWindow" factory="pawsConfigWindow" +<pawsConfigWindow name="ConfigWindow" visible="no" savepositions="yes" movable="yes" resizable="no" - configurable="yes" > + configurable="yes" style="New Standard GUI"> <frame x="10" y="100" width="680" height="346" border="yes" /> - <title resource="Blue Title" text="Options" align="left" close_button="yes"/> - <bgimage resource="Config Background" alpha="128"/> + <title resource="Scaling Title Bar" text="Options" align="left" close_button="yes"/> + + <pawsSimpleTree name="ConfigTree" > - <widget name="ConfigTree" factory="pawsSimpleTree" > - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="200" g="200" b="200" size="10" scalefont="no" /> - <frame x="10" y="10" width="200" height="300" border="no" /> - <bgimage resource="Options Background" /> - + <widget factory="pawsSimpleTreeNode"> <frame x="225" y="10" width="400" height="300" border="yes" /> @@ -32,10 +29,10 @@ <attr name="SectionName" value="entityinteract"/> <attr name="factory" value="pawsConfigEntityInteraction"/> </widget> - </widget> + </widget> <widget factory="pawsSimpleTreeNode" label="Graphics"> - <widget factory="pawsSimpleTreeNode" label="Camera"> + <widget factory="pawsSimpleTreeNode" label="Camera"> <attr name="SectionName" value="camera"/> <attr name="factory" value="pawsConfigCamera"/> </widget> @@ -53,12 +50,12 @@ </widget> </widget> - <widget factory="pawsSimpleTreeNode" label="Sound"> + <widget factory="pawsSimpleTreeNode" label="Sound"> <widget factory="pawsSimpleTreeNode" label="General"> <attr name="SectionName" value="configsound"/> <attr name="factory" value="pawsConfigSound"/> </widget> - </widget> + </widget> <widget factory="pawsSimpleTreeNode" label="PvP"> <widget factory="pawsSimpleTreeNode" label="Confirmation"> @@ -83,27 +80,23 @@ <widget factory="pawsSimpleTreeNode" label="Chat - Bubbles"> <attr name="SectionName" value="chatbubbles"/> <attr name="factory" value="pawsConfigChatBubbles"/> - </widget> + </widget> </widget> </widget> - </widget> + </pawsSimpleTree> - <widget name="OKButton" factory="pawsButton" id="-10" toggle="no"> + <pawsButton name="OKButton" id="-10" toggle="no"> <frame x="10" y="320" width="80" height="20" border="no"/> - <buttonup resource="Blue Title"/> - <buttondown resource="Blue Title"/> <label text="Save"/> - </widget> + </pawsButton> - <widget name="ResetButton" factory="pawsButton" id="-20" toggle="no"> + <pawsButton name="ResetButton" id="-20" toggle="no"> <frame x="100" y="320" width="80" height="20" border="no"/> - <buttonup resource="Blue Title"/> - <buttondown resource="Blue Title"/> <label text="Reset"/> - </widget> + </pawsButton> -</widget> +</pawsConfigWindow> </widget_description> \ No newline at end of file Modified: personal/kougaro/data/gui/gmguiwindow.xml =================================================================== --- personal/kougaro/data/gui/gmguiwindow.xml 2009-02-27 17:42:32 UTC (rev 3116) +++ personal/kougaro/data/gui/gmguiwindow.xml 2009-02-28 00:33:48 UTC (rev 3117) @@ -1,9 +1,9 @@ <widget_description> - <widget name="GmGUI" factory="pawsGmGUIWindow" style="topwindow"> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> - <frame x="0" y="0" width="630" height="425" /> - <title text="Game Master Options" /> - <bgimage resource="GM Background" /> + <widget name="GmGUI" factory="pawsGmGUIWindow" + visible="no" savepositions="yes" movable="yes" + resizable="no" style="New Standard GUI"> + <frame x="0" y="0" width="630" height="425" border="yes"/> + <title resource="Scaling Title Bar" text="Game Master Options" align="left" close_button="yes" /> <widget name="GM Tabs" factory="pawsTabWindow" style="tabwindow"> <frame y="0" width="630" height="425" /> @@ -15,31 +15,16 @@ </attachpoints> <!-- Tabs, there are three tabs. --> <widget name="Players Button" factory="pawsButton" style="tabbuttonskills" id="1000"> - <frame x="20" y="7" width="69" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> + <frame x="20" y="5" width="69" height="20" /> <label text="Players" /> - <attachpoints> - <attach point="PROPORTIONAL_RIGHT" /> - <attach point="ATTACH_LEFT" /> - </attachpoints> </widget> <widget name="Action Button" factory="pawsButton" style="tabbuttonskills" id="1002"> - <frame x="89" y="7" width="69" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> + <frame x="89" y="5" width="69" height="20" /> <label text="Actions" /> - <attachpoints> - <attach point="PROPORTIONAL_RIGHT" /> - <attach point="PROPORTIONAL_LEFT" /> - </attachpoints> </widget> <widget name="Attributes Button" factory="pawsButton" style="tabbuttonskills" id="1003" > - <frame x="158" y="7" width="69" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> + <frame x="158" y="5" width="69" height="20" /> <label text="Attributes" /> - <attachpoints> - <attach point="ATTACH_RIGHT" /> - <attach point="PROPORTIONAL_LEFT" /> - </attachpoints> </widget> <!-- The Tab Panels --> <!-- The Player Panel here --> @@ -51,48 +36,44 @@ <attach point="ATTACH_LEFT" /> <attach point="PROPORTIONAL_BOTTOM" /> </attachpoints> - <widget name="PlayerList" factory="pawsListBox" id="1201" style="listbox"> - <frame x="20" y="5" width="465" height="352" /> + <widget name="PlayerList" factory="pawsListBox" id="1201" > + <frame x="20" y="10" width="458" height="350" /> <highlight resource="Hightlight" alpha="128" /> <columns height="25" headings="yes"> <column width="110" > - <widget name="First Name" factory="pawsTextBox"></widget> + <pawsTextBox name="First Name"/> </column> <column width="90" > - <widget name="Last Name" factory="pawsTextBox"></widget> + <pawsTextBox name="Last Name"/> </column> <column width="40" > - <widget name="Gnd" factory="pawsTextBox"></widget> + <pawsTextBox name="Gnd"/> </column> <column width="140" > - <widget name="Guild" factory="pawsTextBox"></widget> + <pawsTextBox name="Guild"/> </column> <column width="120" > - <widget name="Sector" factory="pawsTextBox"></widget> + <pawsTextBox name="Sector"/> </column> </columns> </widget> - <widget name="RefreshPlayerList" factory="pawsButton" id="1298" style="button"> + <widget name="RefreshPlayerList" factory="pawsButton" id="1298"> <frame x="25" y="370" width="130" height="20" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <label text="Refresh List" /> </widget> <widget name="PlayerCount" factory="pawsTextBox" > <frame x="240" y="375" width="200" height="20"/> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> </widget> <widget name="SectorLbl" factory="pawsTextBox" style="label" > <frame x="490" y="5" width="120" height="20"/> <text string="Sector:" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> </widget> <widget name="MoveTarget" factory="pawsTextBox" style="label" > - <frame x="525" y="37" width="30" height="20"/> + <frame x="525" y="40" width="30" height="20"/> <text string="SL" horizAdjust="CENTRE" vertAdjust="CENTRE" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="8" /> </widget> <widget name="TargetLeft" factory="pawsButton" toggle="no" id="1211" > <frame x="507" y="40" width="20" height="20" border="no" /> @@ -125,86 +106,71 @@ <buttondown resource="Down Arrow" /> </widget> - <widget name="AidPet" factory="pawsButton" toggle="no" id="1210" style="button"> + <widget name="AidPet" factory="pawsButton" toggle="no" id="1210" > <frame x="490" y="80" width="115" height="20" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <label text="Teleport To Player" /> </widget> <widget name="KillWarn" factory="pawsTextBox" style="label" > <frame x="490" y="105" width="115" height="20" /> <text string="!!!WARNING!!!" horizAdjust="CENTRE" vertAdjust="CENTRE" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="0" b="0" size="10" /> </widget> - <widget name="Kill" factory="pawsButton" toggle="no" id="1233" style="button"> + <widget name="Kill" factory="pawsButton" toggle="no" id="1233" > <frame x="490" y="125" width="115" height="20" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <label text="Kill Player" /> </widget> - <widget name="Mute" factory="pawsButton" id="1231" style="button"> + <widget name="Mute" factory="pawsButton" id="1231" > <frame x="490" y="160" width="115" height="20" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <label text="Mute Player" /> </widget> - <widget name="Unmute" factory="pawsButton" id="1232" style="button"> + <widget name="Unmute" factory="pawsButton" id="1232" > <frame x="490" y="185" width="115" height="20" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <label text="Unmute Player" /> </widget> - <widget name="ChangeName" factory="pawsButton" id="1234" style="button"> + <widget name="ChangeName" factory="pawsButton" id="1234" > <frame x="490" y="220" width="115" height="20" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <label text="Change name" /> </widget> - <widget name="ChangeNameRnd" factory="pawsButton" id="1235" style="button"> + <widget name="ChangeNameRnd" factory="pawsButton" id="1235" > <frame x="490" y="245" width="115" height="20" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <label text="Random name" /> </widget> - <widget name="Kick" factory="pawsButton" id="1230" style="button"> + <widget name="Kick" factory="pawsButton" id="1230" > <frame x="490" y="280" width="115" height="20" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <label text="Kick Player" /> </widget> <widget name="BanMin" factory="pawsEditTextBox"> - <frame x="500" y="309" width="20" height="20" border="no"/> + <frame x="500" y="312" width="20" height="20" border="no"/> <text string="30" horizAdjust="CENTRE" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> </widget> <widget name="BanHrs" factory="pawsEditTextBox"> - <frame x="534" y="309" width="20" height="20" border="no"/> + <frame x="534" y="312" width="20" height="20" border="no"/> <text string="0" horizAdjust="CENTRE" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> </widget> <widget name="BanDays" factory="pawsEditTextBox"> - <frame x="568" y="309" width="20" height="20" border="no"/> + <frame x="568" y="312" width="20" height="20" border="no"/> <text string="0" horizAdjust="CENTRE" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> </widget> <widget name="BanMinlbl" factory="pawsTextBox" style="label"> <frame x="490" y="314" width="20" height="20" /> <text string="M:" horizAdjust="CENTRE" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="0" b="0" size="9" /> </widget> <widget name="BanHrslbl" factory="pawsTextBox" style="label"> <frame x="524" y="314" width="20" height="20" /> <text string="H:" horizAdjust="CENTRE" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="0" b="0" size="9" /> </widget> <widget name="BanDayslbl" factory="pawsTextBox" style="label"> <frame x="558" y="314" width="20" height="20" /> <text string="D:" horizAdjust="CENTRE" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="0" b="0" size="9" /> </widget> - <widget name="Ban" factory="pawsButton" id="1236" style="button"> - <frame x="490" y="330" width="115" height="20" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> + <widget name="Ban" factory="pawsButton" id="1236" > + <frame x="490" y="335" width="115" height="20" /> <label text="Ban" /> </widget> @@ -218,64 +184,58 @@ <attach point="ATTACH_LEFT" /> <attach point="PROPORTIONAL_BOTTOM" /> </attachpoints> - <widget name="ActionList" factory="pawsListBox" id="1265" style="listbox"> - <frame x="20" y="5" width="580" height="335" border="no"/> + <widget name="ActionList" factory="pawsListBox" id="1265" > + <frame x="20" y="10" width="580" height="330" /> <highlight resource="Hightlight" alpha="128" /> <columns height="24" headings="yes"> <column width="20" > - <widget name="Id" factory="pawsTextBox"></widget> + <pawsTextBox name="Id"/> </column> <column width="160" > - <widget name="Name" factory="pawsTextBox"></widget> + <pawsTextBox name="Name"/> </column> <column width="135" > - <widget name="Mesh" factory="pawsTextBox"></widget> + <pawsTextBox name="Mesh"/> </column> <column width="40" > - <widget name="Poly" factory="pawsTextBox"></widget> + <pawsTextBox name="Poly"/> </column> <column width="145" > - <widget name="Pos" factory="pawsTextBox"></widget> + <pawsTextBox name="Pos"/> </column> <column width="120" > - <widget name="Type" factory="pawsTextBox"></widget> + <pawsTextBox name="Type"/> </column> </columns> </widget> - <widget name="cmdRefresh" factory="pawsButton" id="1260" style="button"> + <widget name="cmdRefresh" factory="pawsButton" id="1260" > <frame x="20" y="350" width="105" height="20" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <label text="Refresh List" /> </widget> - <widget name="cmdReload" factory="pawsButton" id="1266" style="button"> + <widget name="cmdReload" factory="pawsButton" id="1266" > <frame x="20" y="375" width="105" height="20" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <label text="Reload Cache" /> </widget> - <widget name="cmdAdd" factory="pawsButton" id="1261" style="button"> + <widget name="cmdAdd" factory="pawsButton" id="1261" > <frame x="140" y="350" width="105" height="20" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <label text="Add New" /> </widget> - <widget name="cmdAddLink" factory="pawsButton" id="1262" style="button"> + <widget name="cmdAddLink" factory="pawsButton" id="1262" > <frame x="140" y="375" width="105" height="20" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <label text="Add Linked" /> </widget> - <widget name="cmdEdit" factory="pawsButton" id="1263" style="button"> + <widget name="cmdEdit" factory="pawsButton" id="1263" > <frame x="260" y="350" width="105" height="20" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <label text="Edit" /> </widget> - <widget name="cmdDelete" factory="pawsButton" id="1264" style="button"> + <widget name="cmdDelete" factory="pawsButton" id="1264" > <frame x="260" y="375" width="105" height="20" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <label text="Delete" /> </widget> @@ -292,16 +252,14 @@ </attachpoints> - <widget name="listattributes" factory="pawsButton" toggle="no" id="1250" style="button"> + <widget name="listattributes" factory="pawsButton" toggle="no" id="1250" > <frame x="30" y="20" width="160" height="20" border="no" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <label text="List Attributes" /> </widget> <widget name="invincible" factory="pawsTextBox" id="1251" visible="no" tooltip="set invincible"> <frame x="30" y="44" width="160" height="20" border="no" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <text string="Invincible" /> </widget> <widget name="toggleInvincible" factory="pawsCheckBox" id="1251" visible="no"> @@ -312,7 +270,6 @@ <widget name="invisible" factory="pawsTextBox" visible="no" tooltip="set invisible"> <frame x="30" y="68" width="160" height="20" border="no" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <text string="Invisible" /> </widget> <widget name="toggleInvisible" factory="pawsCheckBox" id="1252" visible="no"> @@ -323,7 +280,6 @@ <widget name="viewall" factory="pawsTextBox" visible="no" tooltip="set viewall"> <frame x="30" y="92" width="160" height="20" border="no"/> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <text string="View all" /> </widget> <widget name="toggleViewAll" factory="pawsCheckBox" id="1253" visible="no"> @@ -334,7 +290,6 @@ <widget name="nevertired" factory="pawsTextBox" visible="no" tooltip="set nevertired"> <frame x="30" y="116" width="160" height="20" border="no"/> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <text string="Never tired" /> </widget> <widget name="toggleNeverTired" factory="pawsCheckBox" id="1254" visible="no"> @@ -345,7 +300,6 @@ <widget name="nofalldamage" factory="pawsTextBox" visible="no" tooltip="set nofalldamage"> <frame x="30" y="140" width="160" height="20" border="no" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <text string="No Fall Damage" /> </widget> <widget name="toggleNoFallDamage" factory="pawsCheckBox" id="1255" visible="no"> @@ -356,7 +310,6 @@ <widget name="infiniteinventory" factory="pawsTextBox" visible="no" tooltip="set infiniteinventory"> <frame x="30" y="164" width="160" height="20" border="no" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <text string="Infinite Inventory" /> </widget> <widget name="toggleInfiniteInventory" factory="pawsCheckBox" id="1256" visible="no"> @@ -367,7 +320,6 @@ <widget name="questtester" factory="pawsTextBox" visible="no" tooltip="set questtester"> <frame x="30" y="188" width="160" height="20" border="no" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <text string="Quest Testing" /> </widget> <widget name="toggleQuestTester" factory="pawsCheckBox" id="1257" visible="no"> @@ -378,7 +330,6 @@ <widget name="infinitemana" factory="pawsTextBox" visible="no" tooltip="set infinitemana"> <frame x="30" y="212" width="160" height="20" border="no" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <text string="Infinite Mana" /> </widget> <widget name="toggleInfiniteMana" factory="pawsCheckBox" id="1258" visible="no"> @@ -389,7 +340,6 @@ <widget name="instantcast" factory="pawsTextBox" visible="no" tooltip="set instantcast"> <frame x="30" y="236" width="160" height="20" border="no" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <text string="Instant Cast" /> </widget> <widget name="toggleInstantCast" factory="pawsCheckBox" id="1259" visible="no"> @@ -399,7 +349,6 @@ <widget name="givekillexp" factory="pawsTextBox" visible="no" tooltip="set givekillexp"> <frame x="30" y="260" width="160" height="20" border="no" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="10" /> <text string="Give Kill Experience" /> </widget> <widget name="toggleGiveKillExp" factory="pawsCheckBox" id="1267" visible="no"> Modified: personal/kougaro/data/gui/helpwindow.xml =================================================================== --- personal/kougaro/data/gui/helpwindow.xml 2009-02-27 17:42:32 UTC (rev 3116) +++ personal/kougaro/data/gui/helpwindow.xml 2009-02-28 00:33:48 UTC (rev 3117) @@ -1,10 +1,14 @@ <widget_description> - <widget name="HelpWindow" factory="pawsHelp" visible="no" savepositions="yes" movable="yes" resizable="no" configurable="yes"> - <frame x="100" y="90" width="630" height="285" border="yes"/> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="200" g="200" b="200" size="10" scalefont="no" /> - <bgimage resource="Help Background" alpha="0"/> - <title resource="Blue Title" text="Help" align="left" close_button="yes"/> - <widget name="HelpText" factory="pawsMultiLineTextBox"> + <pawsHelp name="HelpWindow" visible="no" savepositions="yes" movable="yes" resizable="yes" configurable="yes" style="New Standard GUI"> + + <frame x="100" y="90" width="630" height="285" border="yes"/> + <title resource="Scaling Title Bar" text="Help" align="left" close_button="yes"/> + + <pawsSimpleTree name="HelpTree"> + <frame x="27" y="29" width="250" height ="224" border="yes" /> + </pawsSimpleTree> + + <pawsMultiLineTextBox name="HelpText"> <frame x="294" y="29" width="300" height="224" border="no"/> <attachpoints> <attach point="ATTACH_RIGHT"/> @@ -12,6 +16,7 @@ <attach point="ATTACH_LEFT"/> <attach point="ATTACH_BOTTOM"/> </attachpoints> - </widget> - </widget> + </pawsMultiLineTextBox> + + </pawsHelp> </widget_description> Modified: personal/kougaro/data/gui/ok.xml =================================================================== --- personal/kougaro/data/gui/ok.xml 2009-02-27 17:42:32 UTC (rev 3116) +++ personal/kougaro/data/gui/ok.xml 2009-02-28 00:33:48 UTC (rev 3117) @@ -1,26 +1,24 @@ <widget_description> -<widget name="OkWindow" factory="pawsOkBox" - visible="no" savepositions="no" movable="yes" - resizable="no" style="New Standard GUI" > +<pawsOkBox name="OkWindow" + visible="no" savepositions="no" movable="yes" + resizable="no" style="New Standard GUI" > <frame x="0" y="0" width="644" height="300" border="no" /> - <bgimage resource="YesNo" alpha="0" /> <form> <enter... [truncated message content] |