From: Kenny G. <ken...@us...> - 2007-01-30 07:40:55
|
Update of /cvsroot/planeshift/planeshift/data/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32219/data/gui Modified Files: gmaddeditaction.xml guildwindow.xml questnotebook.xml shortcutwindow.xml Log Message: - Remove multiline support from pawsEditTextBox, convert all code to use pawsMultilineEditTextBox instead. - More crash and bug fixes in pawsMultilineEditTextBox (weren't triggered before). Index: gmaddeditaction.xml =================================================================== RCS file: /cvsroot/planeshift/planeshift/data/gui/gmaddeditaction.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** gmaddeditaction.xml 26 Dec 2006 19:37:29 -0000 1.6 --- gmaddeditaction.xml 30 Jan 2007 07:40:54 -0000 1.7 *************** *** 2,6 **** <widget name="AddEditActionWindow" factory="pawsGMActionWindow" style="topwindow" resizable="no"> ! <frame x="0" y="0" width="360" height="310" /> <title text="Add/Edit Action" /> --- 2,6 ---- <widget name="AddEditActionWindow" factory="pawsGMActionWindow" style="topwindow" resizable="no"> ! <frame x="0" y="0" width="360" height="370" /> <title text="Add/Edit Action" /> *************** *** 141,148 **** <text string="Action:" horizAdjust="LEFT" /> </widget> ! <widget name="txtAction" factory="pawsEditTextBox" style="textinput" multiline="yes"> ! <frame x="55" y="245" width="200" height="60"/> <text string="" horizAdjust="LEFT" /> </widget> </widget> ! </widget_description> \ No newline at end of file --- 141,148 ---- <text string="Action:" horizAdjust="LEFT" /> </widget> ! <widget name="txtAction" factory="pawsMultilineEditTextBox" style="textinput"> ! <frame x="5" y="265" width="350" height="100"/> <text string="" horizAdjust="LEFT" /> </widget> </widget> ! </widget_description> Index: guildwindow.xml =================================================================== RCS file: /cvsroot/planeshift/planeshift/data/gui/guildwindow.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** guildwindow.xml 2 Dec 2005 00:38:41 -0000 1.11 --- guildwindow.xml 30 Jan 2007 07:40:54 -0000 1.12 *************** *** 622,626 **** ! <widget name="motd" factory="pawsEditTextBox" multiline="yes"> <frame x="24" y="37" width="390" height="150" border="no"/> --- 622,626 ---- ! <widget name="motd" factory="pawsMultilineEditTextBox"> <frame x="24" y="37" width="390" height="150" border="no"/> Index: questnotebook.xml =================================================================== RCS file: /cvsroot/planeshift/planeshift/data/gui/questnotebook.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** questnotebook.xml 21 Dec 2006 12:02:56 -0000 1.10 --- questnotebook.xml 30 Jan 2007 07:40:54 -0000 1.11 *************** *** 148,152 **** <text string="Your notes:" /> </widget> ! <widget name="Notes" factory="pawsEditTextBox" multiline="yes" style="textinput"> <frame x="30" y="255" width="490" height="100" /> </widget> --- 148,152 ---- <text string="Your notes:" /> </widget> ! <widget name="Notes" factory="pawsMultilineEditTextBox" style="textinput"> <frame x="30" y="255" width="490" height="100" /> </widget> Index: shortcutwindow.xml =================================================================== RCS file: /cvsroot/planeshift/planeshift/data/gui/shortcutwindow.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** shortcutwindow.xml 16 Jul 2006 15:51:16 -0000 1.8 --- shortcutwindow.xml 30 Jan 2007 07:40:54 -0000 1.9 *************** *** 40,44 **** <text string="Enter the command(s):" /> </widget> ! <widget name="CommandBox" factory="pawsEditTextBox" multiline="yes"> <frame x="20" y="73" width="300" height="203" border="yes" /> <attachpoints> --- 40,44 ---- <text string="Enter the command(s):" /> </widget> ! <widget name="CommandBox" factory="pawsMultilineEditTextBox"> <frame x="20" y="73" width="300" height="203" border="yes" /> <attachpoints> |