Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into popup-control

Browse Source
This commit is contained in:
Alexander Eckart committed 2012-03-21 16:21:08 +01:00
2 parents c3d737107a f3f7098437
commit faa7ebb964
17 files changed
+564 -392
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Output/Themes/Ambient/Screens/ScreenNames.xml
+1 -1
View File
@@ -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)-->
Output/Themes/Ambient/Screens/ScreenSing.xml
+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-->
Output/Themes/Ambient/Skin Blue.xml
+12
View File
@@ -178,6 +178,18 @@
<B>0,300</B>
<A>1,000</A>
</LyricSubColor>
<TimeBar>
<R>0,800</R>
<G>0,950</G>
<B>1,000</B>
<A>0,500</A>
</TimeBar>
<TimeBarSentence>
<R>0,800</R>
<G>0,950</G>
<B>1,000</B>
<A>0,850</A>
</TimeBarSentence>
</ColorSchemes>
<Skins>
<BG_Default>[Blue]BG_Default.png</BG_Default>
Output/Themes/Ambient/Skin Green.xml
+12
View File
@@ -178,6 +178,18 @@
<B>0,300</B>
<A>1,000</A>
</LyricSubColor>
<TimeBar>
<R>0,800</R>
<G>0,950</G>
<B>1,000</B>
<A>0,500</A>
</TimeBar>
<TimeBarSentence>
<R>0,800</R>
<G>0,950</G>
<B>1,000</B>
<A>0,850</A>
</TimeBarSentence>
</ColorSchemes>
<Skins>
<BG_Default>[Green]BG_Default.png</BG_Default>
Output/Themes/Ambient/Skin Red.xml
+12
View File
@@ -178,6 +178,18 @@
<B>0,300</B>
<A>1,000</A>
</LyricSubColor>
<TimeBar>
<R>0,800</R>
<G>0,950</G>
<B>1,000</B>
<A>0,500</A>
</TimeBar>
<TimeBarSentence>
<R>0,800</R>
<G>0,950</G>
<B>1,000</B>
<A>0,850</A>
</TimeBarSentence>
</ColorSchemes>
<Skins>
<BG_Default>[Red]BG_Default.png</BG_Default>
Output/Themes/Ambient/Skin Yellow.xml
+12
View File
@@ -178,6 +178,18 @@
<B>0,300</B>
<A>1,000</A>
</LyricSubColor>
<TimeBar>
<R>0,800</R>
<G>0,950</G>
<B>1,000</B>
<A>0,500</A>
</TimeBar>
<TimeBarSentence>
<R>0,800</R>
<G>0,950</G>
<B>1,000</B>
<A>0,850</A>
</TimeBarSentence>
</ColorSchemes>
<Skins>
<BG_Default>[Yellow]BG_Default.png</BG_Default>