Merge branch 'develop' into popup-control

This commit is contained in:
Alexander Eckart committed 2012-03-21 16:21:08 +01:00
commit faa7ebb964
17 files changed
+564 -392

No files matched your search

@@ -534,7 +534,7 @@
<TextColor>TextColor</TextColor>
<!--<TextSColor>: Selected text color from ColorScheme (high priority)-->
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextColor</TextSColor>
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<!--<TextMaxW>: Maximum text width (if exists)-->
+2 -5
View File
@@ -119,10 +119,7 @@
<H>9</H>
<!--<Color>: Static color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<R>0,68</R>
<G>0,89</G>
<B>0,97</B>
<A>0,40</A>
<Color>TimeBar</Color>
<!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
@@ -138,7 +135,7 @@
<H>9</H>
<!--<Color>: Static color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color>
<Color>TimeBarSentence</Color>
<!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->