[Planeshift-cvs] CVS: planeshift/data merchant.xml,1.1,1.2

[Andrew C. <ac...@us...>]

Update of /cvsroot/planeshift/planeshift/data
In directory sc8-pr-cvs1:/tmp/cvs-serv14009/data

Modified Files:
	merchant.xml 
Log Message:
Fixed merchant window to look a bit better

Index: merchant.xml
===================================================================
RCS file: /cvsroot/planeshift/planeshift/data/merchant.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** merchant.xml	20 Jul 2003 02:06:51 -0000	1.1
--- merchant.xml	27 Jul 2003 23:21:10 -0000	1.2
***************
*** 4,8 ****
          movable="yes">
  
!     <frame x="100" y="100" width="540" height="250" border="yes" />
  	<bgimage resource="Standard Background" alpha="0" />
  	
--- 4,8 ----
          movable="yes">
  
!     <frame x="100" y="100" width="600" height="250" border="yes" />
  	<bgimage resource="Standard Background" alpha="0" />
  	
***************
*** 21,27 ****
      </widget>
      <widget name="CountLabel" factory="pawsTextBox" >
! 	    <frame x="10" y="190" width="50" height="30" border="yes"/>
! 	    <text string="Count" />
! 	</widget>
      
      
--- 21,27 ----
      </widget>
      <widget name="CountLabel" factory="pawsTextBox" >
!         <frame x="10" y="190" width="50" height="30" />
!         <text string="Count" />
!     </widget>
      
      
***************
*** 33,37 ****
          </widget>
          <widget name="BuyText" factory="pawsTextBox">
!             <frame x="25" y="5" width="50" height="20" />
              <text string="Buy" />
          </widget>
--- 33,37 ----
          </widget>
          <widget name="BuyText" factory="pawsTextBox">
!             <frame x="25" y="1" width="50" height="30" />
              <text string="Buy" />
          </widget>
***************
*** 42,46 ****
          </widget>
          <widget name="SellText" factory="pawsTextBox">
!             <frame x="95" y="5" width="50" height="20" />
              <text string="Sell" />
          </widget>
--- 42,46 ----
          </widget>
          <widget name="SellText" factory="pawsTextBox">
!             <frame x="95" y="1" width="50" height="30" />
              <text string="Sell" />
          </widget>
***************
*** 49,61 ****
      
      <widget name="Categories" factory="pawsListBox" id="10">
!         <frame x="5" y="40" width="200" height="150" border="yes" />
!         <columns total="1" height="20">
              <column num="1" name="Category" width="200" factory="pawsTextBox" />
          </columns>
      </widget>
  
  
      <widget name="Items" factory="pawsListBox"  >
!         <frame x="230" y="40" width="300" height="150" border="yes" />
          <columns total="4" height="32">
              <column num="1" name="#"     width="20"  factory="pawsTextBox" />
--- 49,63 ----
      
      <widget name="Categories" factory="pawsListBox" id="10">
!         <frame x="5" y="40" width="240" height="150" border="yes" />
! 
!         <columns total="1" height="30">
              <column num="1" name="Category" width="200" factory="pawsTextBox" />
          </columns>
+ 
      </widget>
  
  
      <widget name="Items" factory="pawsListBox"  >
!         <frame x="250" y="40" width="340" height="150" border="yes" />
          <columns total="4" height="32">
              <column num="1" name="#"     width="20"  factory="pawsTextBox" />