Merge branch 'master' into weatherfc

This commit is contained in:
louis 2015-01-13 12:54:37 +01:00
commit 604ae1c8cc
2 changed files with 4 additions and 4 deletions

View File

@ -247,13 +247,13 @@
{error} true if message is a error message {error} true if message is a error message
--> -->
<message> <message>
<area x="5%" y="80%" width="90%" height="15%" layer="6"> <area x="5%" y="25%" width="90%" height="50%" layer="6">
<drawimage condition="{status}" imagetype="skinpart" path="messageblue" x="0" y="0" width="100%" height="100%" /> <drawimage condition="{status}" imagetype="skinpart" path="messageblue" x="0" y="0" width="100%" height="100%" />
<drawimage condition="{info}" imagetype="skinpart" path="messagegreen" x="0" y="0" width="100%" height="100%" /> <drawimage condition="{info}" imagetype="skinpart" path="messagegreen" x="0" y="0" width="100%" height="100%" />
<drawimage condition="{warning}" imagetype="skinpart" path="messageyellow" x="0" y="0" width="100%" height="100%" /> <drawimage condition="{warning}" imagetype="skinpart" path="messageyellow" x="0" y="0" width="100%" height="100%" />
<drawimage condition="{error}" imagetype="skinpart" path="messagered" x="0" y="0" width="100%" height="100%" /> <drawimage condition="{error}" imagetype="skinpart" path="messagered" x="0" y="0" width="100%" height="100%" />
</area> </area>
<area x="5%" y="80%" width="90%" height="15%" layer="7"> <area x="5%" y="25%" width="90%" height="50%" layer="7">
<drawtext align="center" valign="center" font="{regular}" fontsize="40%" color="{clrWhite}" text="{text}" /> <drawtext align="center" valign="center" font="{regular}" fontsize="40%" color="{clrWhite}" text="{text}" />
</area> </area>
</message> </message>

View File

@ -237,13 +237,13 @@
{error} true if message is a error message {error} true if message is a error message
--> -->
<message> <message>
<area x="5%" y="80%" width="90%" height="15%" layer="6"> <area x="5%" y="25%" width="90%" height="50%" layer="6">
<drawimage condition="{status}" imagetype="skinpart" path="messageblue" x="0" y="0" width="100%" height="100%" /> <drawimage condition="{status}" imagetype="skinpart" path="messageblue" x="0" y="0" width="100%" height="100%" />
<drawimage condition="{info}" imagetype="skinpart" path="messagegreen" x="0" y="0" width="100%" height="100%" /> <drawimage condition="{info}" imagetype="skinpart" path="messagegreen" x="0" y="0" width="100%" height="100%" />
<drawimage condition="{warning}" imagetype="skinpart" path="messageyellow" x="0" y="0" width="100%" height="100%" /> <drawimage condition="{warning}" imagetype="skinpart" path="messageyellow" x="0" y="0" width="100%" height="100%" />
<drawimage condition="{error}" imagetype="skinpart" path="messagered" x="0" y="0" width="100%" height="100%" /> <drawimage condition="{error}" imagetype="skinpart" path="messagered" x="0" y="0" width="100%" height="100%" />
</area> </area>
<area x="5%" y="80%" width="90%" height="15%" layer="7"> <area x="5%" y="25%" width="90%" height="50%" layer="7">
<drawtext align="center" valign="center" font="{regular}" fontsize="40%" color="{clrWhite}" text="{text}" /> <drawtext align="center" valign="center" font="{regular}" fontsize="40%" color="{clrWhite}" text="{text}" />
</area> </area>
</message> </message>