From: <wel...@us...> - 2008-09-23 21:49:56
|
Revision: 2187 http://planeshift.svn.sourceforge.net/planeshift/?rev=2187&view=rev Author: weltall2 Date: 2008-09-23 21:49:45 +0000 (Tue, 23 Sep 2008) Log Message: ----------- - Removed uneccessary focusing of the listbox entries on Select() fixing FS#2182 - Changed return window in char creation if cp < 0: it's logical going back to the last screen (childhood events) and not to the first screen with characther name/race selection - Increased space available for the name of the quests in the quest notebook - Fixed misplacement of GP and randomize button text and incoherence of the first screen with all the others, also fixed identation Modified Paths: -------------- trunk/data/gui/birth.xml trunk/data/gui/childhood.xml trunk/data/gui/lifeevents.xml trunk/data/gui/questnotebook.xml trunk/docs/history.txt trunk/src/client/gui/pawssummary.cpp trunk/src/common/paws/pawslistbox.cpp Modified: trunk/data/gui/birth.xml =================================================================== --- trunk/data/gui/birth.xml 2008-09-23 13:43:30 UTC (rev 2186) +++ trunk/data/gui/birth.xml 2008-09-23 21:49:45 UTC (rev 2187) @@ -1,95 +1,95 @@ <widget_description> - <widget name="CharBirth" factory="pawsCharBirth" + <widget name="CharBirth" factory="pawsCharBirth" visible="no" movable="no" resizable="no" resizetoscreen="yes" > <frame x="0" y="0" width="800" height="600" border="no" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="15" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="15" resizetoscreen="yes" /> <bgimage resource="Charbirth Background" /> - + <!-- Title --> <widget name="label_birth" factory="pawsTextBox"> <frame x="230" y="10" width="350" height="40" border="no"/> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="26" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="26" resizetoscreen="yes" /> <text string="BIRTH" horizAdjust="CENTRE" /> </widget> - + <!-- CP --> <widget name="CP" factory="pawsTextBox"> - <frame x="695" y="133" width="70" height="30" border="no" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="14" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> + <frame x="693" y="133" width="75" height="30" border="no" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="15" resizetoscreen="yes" /> <text string="CP: 0" horizAdjust="CENTRE" /> </widget> - + <!-- Randomize button --> <widget name="randomize" factory="pawsButton"> <frame x="693" y="210" width="75" height="30" border="no" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="12" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="13" resizetoscreen="yes" /> <label text="Randomize"/> </widget> <widget name="label" factory="pawsTextBox"> <frame x="210" y="95" width="70" height="30" border="no" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="16" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="16" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> <text string="Day:" horizAdjust="CENTRE" /> </widget> <!-- Date of birth --> - <widget name="day" factory="pawsComboBox"> + <widget name="day" factory="pawsComboBox"> <frame x="242" y="116" width="59" height="35" border="no"/> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="13" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="13" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> <listbox rows="6" height="20" text="Day" alpha="100"/> </widget> <widget name="label" factory="pawsTextBox"> <frame x="350" y="95" width="70" height="30" border="no" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="13" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="13" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> <text string="Month:" horizAdjust="CENTRE" /> </widget> - - <widget name="month" factory="pawsComboBox" id="5"> + + <widget name="month" factory="pawsComboBox" id="5"> <frame x="355" y="116" width="91" height="35" border="no"/> <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="13" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> <listbox rows="6" height="25" text="Month" alpha="100"/> </widget> - + <widget name="label" factory="pawsTextBox"> <frame x="475" y="95" width="70" height="30" border="no" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="13" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="13" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> <text string="Year:" horizAdjust="CENTRE" /> </widget> - + <widget name="year" factory="pawsTextBox"> <frame x="496" y="118" width="70" height="30" border="no" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="13" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="13" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> <text string="750" horizAdjust="CENTRE" /> </widget> - <widget name="zodiac_img" factory="pawsWidget"> + <widget name="zodiac_img" factory="pawsWidget"> <frame x="148" y="240" width="82" height="82" border="no"/> </widget> <widget name="zodiac" factory="pawsTextBox"> <frame x="270" y="222" width="210" height="25" border="no"/> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="18" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="18" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> <text string=""/> </widget> - + <widget name="zodiac_description" factory="pawsMultiLineTextBox"> <frame x="275" y="242" width="400" height="100" border="no"/> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="11" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="11" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> <text string="Choose a month of birth"/> </widget> <!-- Siblings --> <widget name="text" factory="pawsTextBox" > <frame x="202" y="354" width="80" height="30" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="18" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="18" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> <text string="Siblings" /> </widget> <widget name="Siblings" factory="pawsRadioButtonGroup"> <frame x ="200" y="385" width="130" height="120" /> <radio on="radioon2" off="radiooff2" size="16"/> - + <widget name="sibling0" factory="pawsRadioButton" id="0" visible="no"> <frame x="2" y="5" width="100" height="30" /> <text string="1 Sibling" position="right"/> @@ -109,28 +109,28 @@ <frame x="2" y="95" width="100" height="30" /> <text string="1 Sibling" position="right"/> </widget> - + </widget> <widget name="sibling_desc" factory="pawsMultiLineTextBox" > <frame x="395" y="377" width="260" height="115" border="no" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="11" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" size="11" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> <text string="Select your sibling count" /> </widget> - + <!-- Navigation Buttons --> <widget name="BackButton" factory="pawsButton" id="6000"> <frame x="30" y="503" width="80" height="50" border="no" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="28" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="28" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> <label text="Prev"/> </widget> <widget name="NextButton" factory="pawsButton" id="5000"> <frame x="699" y="516" width="80" height="55" border="no" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="28" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" size="28" sr="0" sg="0" sb="0" shadow="yes" resizetoscreen="yes" /> <label text="Next"/> </widget> - + </widget> </widget_description> Modified: trunk/data/gui/childhood.xml =================================================================== --- trunk/data/gui/childhood.xml 2008-09-23 13:43:30 UTC (rev 2186) +++ trunk/data/gui/childhood.xml 2008-09-23 21:49:45 UTC (rev 2187) @@ -1,35 +1,35 @@ <widget_description> - <widget name="Childhood" factory="pawsChildhoodWindow" + <widget name="Childhood" factory="pawsChildhoodWindow" visible="no" movable="no" resizable="no" resizetoscreen="yes" > <frame x="0" y="0" width="800" height="600" border="no" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="15" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="15" resizetoscreen="yes" /> <bgimage resource="Childhood Background" /> - + <!-- Title --> - <widget name="label_childhood" factory="pawsTextBox"> + <widget name="label_childhood" factory="pawsTextBox"> <frame x="230" y="10" width="350" height="40" border="no"/> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="26" resizetoscreen="yes" /> - <text string="CHILDHOOD" horizAdjust="CENTRE" /> - </widget> - + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="26" resizetoscreen="yes" /> + <text string="CHILDHOOD" horizAdjust="CENTRE" /> + </widget> + <!-- CP --> <widget name="CP" factory="pawsTextBox"> - <frame x="695" y="133" width="70" height="30" border="no" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="15" resizetoscreen="yes" /> + <frame x="693" y="133" width="75" height="30" border="no" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="15" resizetoscreen="yes" /> <text string="CP: 0" horizAdjust="CENTRE" /> - </widget> - + </widget> + <!-- Birth Event --> <widget name="text" factory="pawsTextBox" > <frame x="204" y="122" width="110" height="30" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="15" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="15" resizetoscreen="yes" /> <text string="Birth Event:" horizAdjust="CENTRE" /> </widget> - + <widget name="bevent" factory="pawsListBox" id="1" > <frame x="180" y="138" width="162" height="96" border="no" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="13" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="13" resizetoscreen="yes" /> <scrollbar arrowup="Up Arrow" arrowdown="Down Arrow" arrowsize="8" width="15" border="no"/> <columns height="20"> <column width="148" > @@ -40,20 +40,20 @@ <widget name="bdesc" factory="pawsMultiLineTextBox" > <frame x="380" y="135" width="290" height="100" border="no" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="13" /> + <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="13" /> <text string="Select event that happend on your birthday" /> </widget> - <!-- For Childhood activity --> + <!-- For Childhood activity --> <widget name="text" factory="pawsTextBox" > <frame x="204" y="244" width="110" height="30" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="15" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="15" resizetoscreen="yes" /> <text string="Activity:" horizAdjust="CENTRE" /> </widget> - + <widget name="activity" factory="pawsListBox" id="2" > <frame x="181" y="263" width="165" height="91" border="no" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="13" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="13" resizetoscreen="yes" /> <scrollbar arrowup="Up Arrow" arrowdown="Down Arrow" arrowsize="8" width="15" border="no"/> <columns height="20"> <column width="151" > @@ -63,20 +63,20 @@ </widget> <widget name="adesc" factory="pawsMultiLineTextBox" > <frame x="380" y="259" width="290" height="100" border="no" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="13" /> + <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="13" /> <text string="Select your childhood game" /> </widget> <!-- For house --> <widget name="text" factory="pawsTextBox" > <frame x="204" y="373" width="110" height="30" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="15" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="15" resizetoscreen="yes" /> <text string="House:" horizAdjust="CENTRE" /> </widget> <widget name="house" factory="pawsListBox" id="3"> <frame x="182" y="392" width="167" height="91" border="no" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="13" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="13" resizetoscreen="yes" /> <scrollbar arrowup="Up Arrow" arrowdown="Down Arrow" arrowsize="8" width="15" border="no"/> <columns height="20"> <column width="153" > @@ -84,33 +84,33 @@ </column> </columns> </widget> - + <widget name="hdesc" factory="pawsMultiLineTextBox" > <frame x="380" y="388" width="290" height="100" border="no" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="13" /> + <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="13" /> <text string="Select your childhood home" /> - </widget> + </widget> - <!-- Randomize button --> + <!-- Randomize button --> <widget name="randomize" factory="pawsButton"> <frame x="693" y="210" width="75" height="30" border="no" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="13" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="13" resizetoscreen="yes" /> <label text="Randomize"/> </widget> - + <!-- Navigation Buttons --> <widget name="BackButton" factory="pawsButton" id="6000"> <frame x="30" y="503" width="80" height="50" border="no" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="28" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="28" resizetoscreen="yes" /> <label text="Prev"/> </widget> <widget name="NextButton" factory="pawsButton" id="5000"> <frame x="699" y="516" width="80" height="55" border="no" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="28" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="28" resizetoscreen="yes" /> <label text="Next"/> </widget> - + </widget> - + </widget_description> Modified: trunk/data/gui/lifeevents.xml =================================================================== --- trunk/data/gui/lifeevents.xml 2008-09-23 13:43:30 UTC (rev 2186) +++ trunk/data/gui/lifeevents.xml 2008-09-23 21:49:45 UTC (rev 2187) @@ -1,66 +1,66 @@ <widget_description> - <widget name="LifeEvents" factory="pawsLifeEventWindow" + <widget name="LifeEvents" factory="pawsLifeEventWindow" visible="no" movable="no" resizable="no" resizetoscreen="yes" > <frame x="0" y="0" width="800" height="600" border="no" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="15" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="15" resizetoscreen="yes" /> <bgimage resource="Lifeevent Background" /> - + <!-- Title --> - <widget name="label_events" factory="pawsTextBox"> + <widget name="label_events" factory="pawsTextBox"> <frame x="230" y="10" width="350" height="40" border="no"/> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="26" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="26" resizetoscreen="yes" /> <text string="LIFE EVENTS" horizAdjust="CENTRE" /> </widget> - + <!-- CP --> <widget name="CP" factory="pawsTextBox"> - <frame x="695" y="133" width="70" height="30" border="no" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="15" resizetoscreen="yes" /> + <frame x="693" y="133" width="75" height="30" border="no" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="15" resizetoscreen="yes" /> <text string="CP: 0" horizAdjust="CENTRE" /> - </widget> - + </widget> + <!-- Randomize button --> <widget name="randomize" factory="pawsButton"> <frame x="693" y="210" width="75" height="30" border="no" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="13" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="13" resizetoscreen="yes" /> <label text="Randomize"/> </widget> - + <widget name="Life Event" factory="pawsSelectorBox" > <frame x="160" y="127" width="466" height="210" border="no" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="12" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="12" resizetoscreen="yes" /> <available width="210" rowheight="24" /> <selected width="210" rowheight="24" /> <addbutton x="220" y="85" /> <removebutton x="220" y="123" /> </widget> - + <widget name="EventDesc" factory="pawsMultiLineTextBox"> <frame x="162" y="390" width="193" height="90" border="no" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="13" /> + <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="13" /> <text string="Description" /> </widget> - + <widget name="SelEventDesc" factory="pawsMultiLineTextBox"> <frame x="437" y="390" width="193" height="90" border="no" /> - <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="13" /> + <font name="/planeshift/data/ttf/LiberationSans-Regular.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="13" /> <text string="Description" /> </widget> - + <!-- Navigation Buttons --> <widget name="BackButton" factory="pawsButton" id="6000"> <frame x="30" y="503" width="80" height="50" border="no" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="28" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="28" resizetoscreen="yes" /> <label text="Prev"/> </widget> <widget name="NextButton" factory="pawsButton" id="5000"> <frame x="699" y="516" width="80" height="55" border="no" /> - <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="28" resizetoscreen="yes" /> + <font name="/planeshift/data/ttf/cupandtalon.ttf" r="255" g="255" b="255" sr="0" sg="0" sb="0" shadow="yes" size="28" resizetoscreen="yes" /> <label text="Next"/> </widget> </widget> - + </widget_description> Modified: trunk/data/gui/questnotebook.xml =================================================================== --- trunk/data/gui/questnotebook.xml 2008-09-23 13:43:30 UTC (rev 2186) +++ trunk/data/gui/questnotebook.xml 2008-09-23 21:49:45 UTC (rev 2187) @@ -32,7 +32,7 @@ <frame x="16" y="27" width="186" height="161"/> <highlight resource="Hightlight" alpha="128" /> <columns height="30" headings="no" xmlbinding="q" > - <column width="130" xmlbinding="desc" > + <column width="166" xmlbinding="desc" > <widget name="Name" factory="pawsTextBox" style="label"> </widget> </column> @@ -49,7 +49,7 @@ <frame x="16" y="27" width="186" height="161" /> <highlight resource="Hightlight" alpha="128" /> <columns height="30" headings="no" xmlbinding="q" > - <column width="130" xmlbinding="desc" > + <column width="166" xmlbinding="desc" > <widget name="Name" factory="pawsTextBox" style="label"> </widget> </column> @@ -83,7 +83,7 @@ <frame x="16" y="27" width="186" height="161"/> <highlight resource="Hightlight" alpha="128" /> <columns height="30" headings="no" xmlbinding="event" > - <column width="130" xmlbinding="name" > + <column width="166" xmlbinding="name" > <widget name="Name" factory="pawsTextBox" style="label"></widget> </column> <column width="7" xmlbinding="role" > @@ -102,7 +102,7 @@ <frame x="16" y="27" width="186" height="161" /> <highlight resource="Hightlight" alpha="128" /> <columns height="30" headings="no" xmlbinding="event" > - <column width="130" xmlbinding="name" > + <column width="166" xmlbinding="name" > <widget name="Name" factory="pawsTextBox" style="label"></widget> </column> <column width="7" xmlbinding="role" > Modified: trunk/docs/history.txt =================================================================== --- trunk/docs/history.txt 2008-09-23 13:43:30 UTC (rev 2186) +++ trunk/docs/history.txt 2008-09-23 21:49:45 UTC (rev 2187) @@ -8,7 +8,13 @@ - Better readability of quest description in the questnotebook patch by caarrie and some identation fixes by me - Added a workaround for cal3d repository problems in the compiling guide patch by Vorodie - and additional things include/lib paths for MSVC by f-rd + and additional things about include/lib paths for MSVC by f-rd +- Removed uneccessary focusing of the listbox entries on Select() fixing FS#2182 +- Changed return window in char creation if cp < 0: it's logical going back to the last screen + (childhood events) and not to the first screen with characther name/race selection +- Increased space available for the name of the quests in the quest notebook +- Fixed misplacement of GP and randomize button text and incoherence of the first + screen with all the others, also fixed identation *** 2008-09-23 by Steven Patrick - Fixed FS#2267 - Equipping items in invalid slots makes them disappear, Modified: trunk/src/client/gui/pawssummary.cpp =================================================================== --- trunk/src/client/gui/pawssummary.cpp 2008-09-23 13:43:30 UTC (rev 2186) +++ trunk/src/client/gui/pawssummary.cpp 2008-09-23 21:49:45 UTC (rev 2187) @@ -147,7 +147,7 @@ if ( createManager->GetCurrentCP() < 0 ) { PawsManager::GetSingleton().CreateWarningBox( "You cannot have a negative CP value." ); - PawsManager::GetSingleton().FindWidget("CharCreateMain")->Show(); + PawsManager::GetSingleton().FindWidget("LifeEvents")->Show(); PawsManager::GetSingleton().FindWidget("Summary")->Hide(); return; } Modified: trunk/src/common/paws/pawslistbox.cpp =================================================================== --- trunk/src/common/paws/pawslistbox.cpp 2008-09-23 13:43:30 UTC (rev 2186) +++ trunk/src/common/paws/pawslistbox.cpp 2008-09-23 21:49:45 UTC (rev 2187) @@ -477,8 +477,6 @@ return true; } - PawsManager::GetSingleton().SetCurrentFocusedWidget( row ); - for ( int x = 0; x < (int)rows.GetSize(); x++ ) { if ( rows[x] == row ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |