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

Rename Lyric.SelColor to Lyric.ProcessedColor

Browse Source
This commit is contained in:
Flamefire committed 2014-10-23 00:48:52 +02:00
1 parent 10c456cbff
commit a51e7c5698
6 files changed
+19 -19
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Output/Themes/Ambient/Screens/ScreenSing.xml
+6 -6
View File
@@ -1738,7 +1738,7 @@
<Z>-1</Z> <Z>-1</Z>
</Rect> </Rect>
<Color Name="LyricMainColor" /> <Color Name="LyricMainColor" />
<SelColor Name="LyricSelColor" /> <ProcessedColor Name="LyricProcessedColor" />
</Lyric> </Lyric>
<Lyric Name="LyricSub"> <Lyric Name="LyricSub">
<Rect> <Rect>
@@ -1749,7 +1749,7 @@
<Z>-1</Z> <Z>-1</Z>
</Rect> </Rect>
<Color Name="LyricSubColor" /> <Color Name="LyricSubColor" />
<SelColor Name="LyricSelColor" /> <ProcessedColor Name="LyricProcessedColor" />
</Lyric> </Lyric>
<Lyric Name="LyricMainDuet"> <Lyric Name="LyricMainDuet">
<Rect> <Rect>
@@ -1760,7 +1760,7 @@
<Z>-1</Z> <Z>-1</Z>
</Rect> </Rect>
<Color Name="LyricMainColor" /> <Color Name="LyricMainColor" />
<SelColor Name="LyricSelColor" /> <ProcessedColor Name="LyricProcessedColor" />
</Lyric> </Lyric>
<Lyric Name="LyricSubDuet"> <Lyric Name="LyricSubDuet">
<Rect> <Rect>
@@ -1771,7 +1771,7 @@
<Z>-1</Z> <Z>-1</Z>
</Rect> </Rect>
<Color Name="LyricSubColor" /> <Color Name="LyricSubColor" />
<SelColor Name="LyricSelColor" /> <ProcessedColor Name="LyricProcessedColor" />
</Lyric> </Lyric>
<Lyric Name="LyricMainTop"> <Lyric Name="LyricMainTop">
<Rect> <Rect>
@@ -1782,7 +1782,7 @@
<Z>-1</Z> <Z>-1</Z>
</Rect> </Rect>
<Color Name="LyricMainColor" /> <Color Name="LyricMainColor" />
<SelColor Name="LyricSelColor" /> <ProcessedColor Name="LyricProcessedColor" />
</Lyric> </Lyric>
<Lyric Name="LyricSubTop"> <Lyric Name="LyricSubTop">
<Rect> <Rect>
@@ -1793,7 +1793,7 @@
<Z>-1</Z> <Z>-1</Z>
</Rect> </Rect>
<Color Name="LyricSubColor" /> <Color Name="LyricSubColor" />
<SelColor Name="LyricSelColor" /> <ProcessedColor Name="LyricProcessedColor" />
</Lyric> </Lyric>
</Lyrics> </Lyrics>
<SelectSlides /> <SelectSlides />
Output/Themes/Ambient/Skin Blue.xml
+2 -2
View File
@@ -164,12 +164,12 @@
<B>1,000</B> <B>1,000</B>
<A>0,000</A> <A>0,000</A>
</Invisible> </Invisible>
<LyricSelColor> <LyricProcessedColor>
<R>0,000</R> <R>0,000</R>
<G>0,000</G> <G>0,000</G>
<B>1,000</B> <B>1,000</B>
<A>1,000</A> <A>1,000</A>
</LyricSelColor> </LyricProcessedColor>
<LyricMainColor> <LyricMainColor>
<R>0,000</R> <R>0,000</R>
<G>0,000</G> <G>0,000</G>
Output/Themes/Ambient/Skin Green.xml
+2 -2
View File
@@ -158,12 +158,12 @@
<B>1,000</B> <B>1,000</B>
<A>0,000</A> <A>0,000</A>
</Invisible> </Invisible>
<LyricSelColor> <LyricProcessedColor>
<R>0,000</R> <R>0,000</R>
<G>1,000</G> <G>1,000</G>
<B>0,000</B> <B>0,000</B>
<A>1,000</A> <A>1,000</A>
</LyricSelColor> </LyricProcessedColor>
<LyricMainColor> <LyricMainColor>
<R>0,000</R> <R>0,000</R>
<G>0,000</G> <G>0,000</G>
Output/Themes/Ambient/Skin Red.xml
+2 -2
View File
@@ -158,12 +158,12 @@
<B>1,000</B> <B>1,000</B>
<A>0,000</A> <A>0,000</A>
</Invisible> </Invisible>
<LyricSelColor> <LyricProcessedColor>
<R>1,000</R> <R>1,000</R>
<G>0,000</G> <G>0,000</G>
<B>0,000</B> <B>0,000</B>
<A>1,000</A> <A>1,000</A>
</LyricSelColor> </LyricProcessedColor>
<LyricMainColor> <LyricMainColor>
<R>0,000</R> <R>0,000</R>
<G>0,000</G> <G>0,000</G>
Output/Themes/Ambient/Skin Yellow.xml
+2 -2
View File
@@ -158,12 +158,12 @@
<B>1,000</B> <B>1,000</B>
<A>0,000</A> <A>0,000</A>
</Invisible> </Invisible>
<LyricSelColor> <LyricProcessedColor>
<R>1,000</R> <R>1,000</R>
<G>1,000</G> <G>1,000</G>
<B>0,000</B> <B>0,000</B>
<A>1,000</A> <A>1,000</A>
</LyricSelColor> </LyricProcessedColor>
<LyricMainColor> <LyricMainColor>
<R>0,000</R> <R>0,000</R>
<G>0,000</G> <G>0,000</G>
VocaluxeLib/Menu/CLyric.cs
+5 -5
View File
@@ -30,7 +30,7 @@ namespace VocaluxeLib.Menu
public SRectF Rect; public SRectF Rect;
public SThemeColor Color; public SThemeColor Color;
public SThemeColor SelColor; public SThemeColor ProcessedColor;
} }
public class CLyric : CMenuElementBase, IMenuElement, IThemeable public class CLyric : CMenuElementBase, IMenuElement, IThemeable
@@ -130,8 +130,8 @@ namespace VocaluxeLib.Menu
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/A", ref _Color.A); _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/A", ref _Color.A);
} }
if (xmlReader.GetValue(item + "/SColor", out _Theme.SelColor.Name, String.Empty)) if (xmlReader.GetValue(item + "/SColor", out _Theme.ProcessedColor.Name, String.Empty))
_ThemeLoaded &= _Theme.SelColor.Get(_PartyModeID, out _ColorProcessed); _ThemeLoaded &= _Theme.ProcessedColor.Get(_PartyModeID, out _ColorProcessed);
else else
{ {
_ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SR", ref _ColorProcessed.R); _ThemeLoaded &= xmlReader.TryGetFloatValue(item + "/SR", ref _ColorProcessed.R);
@@ -144,7 +144,7 @@ namespace VocaluxeLib.Menu
{ {
_Theme.Name = elementName; _Theme.Name = elementName;
_Theme.Color.Color = _Color; _Theme.Color.Color = _Color;
_Theme.SelColor.Color = _ColorProcessed; _Theme.ProcessedColor.Color = _ColorProcessed;
LoadSkin(); LoadSkin();
} }
return _ThemeLoaded; return _ThemeLoaded;
@@ -429,7 +429,7 @@ namespace VocaluxeLib.Menu
public void LoadSkin() public void LoadSkin()
{ {
_Theme.Color.Get(_PartyModeID, out _Color); _Theme.Color.Get(_PartyModeID, out _Color);
_Theme.SelColor.Get(_PartyModeID, out _ColorProcessed); _Theme.ProcessedColor.Get(_PartyModeID, out _ColorProcessed);
MaxRect = _Theme.Rect; MaxRect = _Theme.Rect;
_Text = new CText(X, Y, Z, H, W, EAlignment.Left, EStyle.Bold, "Normal", _Color, String.Empty); _Text = new CText(X, Y, Z, H, W, EAlignment.Left, EStyle.Bold, "Normal", _Color, String.Empty);