Skip to content

Commit

Permalink
* Markup fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
ChrisOelmueller committed Apr 16, 2012
1 parent 3fba642 commit 67f0126
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<!-- Enemy warehouse overview tab -->
<Container size="250,350">
<TabBG amount="4"/>
<Icon name="player_emblem" position="25,50"/>
<Icon name="player_emblem" position="25,50" />

<Container position="0,70" size="600,400" >
<Container position="0,70" size="600,400">

<HBox position="22,7" min_size="170,20" size="230,20" >
<HBox position="22,7" min_size="170,20" size="230,20">
<Spacer min_size="0" max_size="50" />
<Label name="headline" text="" /> <!-- set to owner player name-->
</HBox>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<Container size="250,450">
<TabBG amount="6"/>

<Container position="0,70" size="245,350" >
<Container position="0,70" size="245,350">

<HBox position="22,7" min_size="170,20" size="230,20" >
<HBox position="22,7" min_size="170,20" size="230,20">
<Spacer min_size="0" max_size="50" />
<Label name='headline' border_size="0" text="Resource deposit"/>
<Label name="headline" border_size="0" text="Resource deposit" />
</HBox>

<Icon image="content/gui/images/background/hr.png" position="20,30" />
Expand All @@ -17,10 +17,10 @@
<Icon image="content/gui/images/background/hr.png" position="20,210" />
-->
<VBox position="25,50">
<Label name="res_dep_description_lbl" text="This is a resource deposit where you can build a mine to dig up resources." wrap_text="1" max_size="212,100"/>
<Label name="res_dep_description_lbl" text="This is a resource deposit where you can build a mine to dig up resources." wrap_text="1" max_size="212,100" />
<Label name="res_dep_description_lbl2" text="It contains these resources:" wrap_text="1" max_size="212,100"
comment="It == The resource deposit" />
<Inventory name="inventory" size="200,100"/>
<Inventory name="inventory" size="200,100" />
</VBox>

</Container>
Expand Down
4 changes: 2 additions & 2 deletions content/gui/xml/ingame/tabwidget/ships/tradetab.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<Icon image="content/gui/images/background/inv_bg.png" position="110,35" name="slot" />
<Icon image="content/gui/images/background/inv_bg.png" position="165,35" name="slot" />

<Inventory name="inventory_ship" size="300,150" position="1,36" uncached="1"/>
<Inventory name="inventory_ship" size="300,150" position="1,36" uncached="1" />

</Container>

Expand Down Expand Up @@ -93,7 +93,7 @@
<Icon image="content/gui/images/background/inv_bg.png" position=" 0,20" name="slot" />
<Icon image="content/gui/images/background/inv_bg.png" position=" 55,20" name="slot" />
<Icon image="content/gui/images/background/inv_bg.png" position="110,20" name="slot" />
<BuySellInventory name="buying_inventory" size="300,70" position="1,21" uncached="1"/>
<BuySellInventory name="buying_inventory" size="300,70" position="1,21" uncached="1" />
</Container>
</Container>
<Container name="domestic" position="20,260" size="250,210"> <!-- Only one of international / domestic is displayed -->
Expand Down
2 changes: 1 addition & 1 deletion horizons/gui/widgets/inventory.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ def _draw(self):
if not new_res:
break # all done

# add remaning slots for slotstorage or just add it without consideration for other storage kinds
# add remaining slots for slotstorage or just add it without consideration for other storage kinds
self._res_order += new_res

for resid in self._res_order:
Expand Down

0 comments on commit 67f0126

Please sign in to comment.