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

Merge remote-tracking branch 'upstream/develop' into medley

Browse Source
This commit is contained in:
Florian Kuepper committed 2012-06-17 13:37:48 +02:00
2 parents a4f253bf67 37e554fcc0
commit 3616774bb2
23 files changed
+1003 -248
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Output/Languages/Deutsch.xml
+5
View File
@@ -157,6 +157,7 @@
<TR_SCRENNO_BUTTON_SOUND>Sound</TR_SCRENNO_BUTTON_SOUND>
<TR_SCREENO_BUTTON_RECORD>Aufnahme</TR_SCREENO_BUTTON_RECORD>
<TR_SCREENO_BUTTON_VIDEO>Video</TR_SCREENO_BUTTON_VIDEO>
<TR_SCREENO_BUTTON_LYRICS>Songtext</TR_SCREENO_BUTTON_LYRICS>
<TR_SCREENO_BUTTON_THEME>Design</TR_SCREENO_BUTTON_THEME>
<!--ScreenOptionsGame-->
<TR_SCREENOGAME_OPTIONS>Spieleinstellungen</TR_SCREENOGAME_OPTIONS>
@@ -191,6 +192,10 @@
<TR_SCREENOTHEME_TIMERLOOK>Aussehen des Timers</TR_SCREENOTHEME_TIMERLOOK>
<TR_SCREENOTHEME_FADEINFO>Spieler-Infos ein/ausblenden</TR_SCREENOTHEME_FADEINFO>
<TR_SCREENOTHEME_COVERLOADING>Cover Ladeverhalten</TR_SCREENOTHEME_COVERLOADING>
<!--ScreenOptionsLyrics-->
<TR_SCREENOLYRICS_OPTIONS>Songtexteinstellungen</TR_SCREENOLYRICS_OPTIONS>
<TR_SCREENOLYRICS_STYLE>Stil</TR_SCREENOLYRICS_STYLE>
<TR_SCREENOLYRICS_ONTOP>Oben anzeigen</TR_SCREENOLYRICS_ONTOP>
<!--ScreenOptionsVideo-->
<TR_SCREENOVIDEO_OPTIONS>Videoeinstellungen</TR_SCREENOVIDEO_OPTIONS>
<TR_SCREENOVIDEO_VIDEOBACKGROUNDS>Video-Hintergründe</TR_SCREENOVIDEO_VIDEOBACKGROUNDS>
Output/Languages/English.xml
+5
View File
@@ -157,6 +157,7 @@
<TR_SCRENNO_BUTTON_SOUND>Sound</TR_SCRENNO_BUTTON_SOUND>
<TR_SCREENO_BUTTON_RECORD>Record</TR_SCREENO_BUTTON_RECORD>
<TR_SCREENO_BUTTON_VIDEO>Video</TR_SCREENO_BUTTON_VIDEO>
<TR_SCREENO_BUTTON_LYRICS>Lyrics</TR_SCREENO_BUTTON_LYRICS>
<TR_SCREENO_BUTTON_THEME>Theme</TR_SCREENO_BUTTON_THEME>
<!--ScreenOptionsGame-->
<TR_SCREENOGAME_OPTIONS>Game Options</TR_SCREENOGAME_OPTIONS>
@@ -191,6 +192,10 @@
<TR_SCREENOTHEME_TIMERLOOK>Timer-Look</TR_SCREENOTHEME_TIMERLOOK>
<TR_SCREENOTHEME_FADEINFO>Fade player-info</TR_SCREENOTHEME_FADEINFO>
<TR_SCREENOTHEME_COVERLOADING>Cover Loading Behavior</TR_SCREENOTHEME_COVERLOADING>
<!--ScreenOptionsLyrics-->
<TR_SCREENOLYRICS_OPTIONS>Lyrics Options</TR_SCREENOLYRICS_OPTIONS>
<TR_SCREENOLYRICS_STYLE>Style</TR_SCREENOLYRICS_STYLE>
<TR_SCREENOLYRICS_ONTOP>Lyrics on top</TR_SCREENOLYRICS_ONTOP>
<!--ScreenOptionsVideo-->
<TR_SCREENOVIDEO_OPTIONS>Video Options</TR_SCREENOVIDEO_OPTIONS>
<TR_SCREENOVIDEO_VIDEOBACKGROUNDS>Video Backgrounds</TR_SCREENOVIDEO_VIDEOBACKGROUNDS>
Output/Themes/Ambient.xml
+2 -5
View File
@@ -12,9 +12,6 @@
<Skin>Cursor</Skin>
<W>40,000</W>
<H>40,000</H>
<R>0,675</R>
<G>0,890</G>
<B>0,969</B>
<A>1,000</A>
<Color>StaticColor</Color>
</Cursor>
</root>
</root>
Output/Themes/Ambient/Screens/ScreenOptions.xml
+61 -6
View File
@@ -62,7 +62,7 @@
<!--<SkinSelected>: Texture name for selected button-->
<SkinSelected>Button</SkinSelected>
<!--<X>, <Y>, <Z>, <W>, <H>: Button position, width and height-->
<X>145</X>
<X>54,7</X>
<Y>600</Y>
<Z>0,00</Z>
<W>150</W>
@@ -117,7 +117,7 @@
<!--<SkinSelected>: Texture name for selected button-->
<SkinSelected>Button</SkinSelected>
<!--<X>, <Y>, <Z>, <W>, <H>: Button position, width and height-->
<X>355</X>
<X>259,4</X>
<Y>600</Y>
<Z>0,00</Z>
<W>150</W>
@@ -172,7 +172,7 @@
<!--<SkinSelected>: Texture name for selected button-->
<SkinSelected>Button</SkinSelected>
<!--<X>, <Y>, <Z>, <W>, <H>: Button position, width and height-->
<X>565</X>
<X>464,1</X>
<Y>600</Y>
<Z>0,00</Z>
<W>150</W>
@@ -227,7 +227,7 @@
<!--<SkinSelected>: Texture name for selected button-->
<SkinSelected>Button</SkinSelected>
<!--<X>, <Y>, <Z>, <W>, <H>: Button position, width and height-->
<X>775</X>
<X>668,8</X>
<Y>600</Y>
<Z>0,00</Z>
<W>150</W>
@@ -276,13 +276,68 @@
<Height>26</Height>
</SReflection>
</ButtonOptionsVideo>
<ButtonOptionsLyrics>
<!--<Skin>: Texture name-->
<Skin>Button</Skin>
<!--<SkinSelected>: Texture name for selected button-->
<SkinSelected>Button</SkinSelected>
<!--<X>, <Y>, <Z>, <W>, <H>: Button position, width and height-->
<X>873,5</X>
<Y>600</Y>
<Z>0,00</Z>
<W>150</W>
<H>50</H>
<!--<Color>: Button color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>ButtonColor</Color>
<!--<SColor>: Selected button color from ColorScheme (high priority)-->
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
<SColor>ButtonSColor</SColor>
<Text>
<!--<X>, <Y>: Text position-->
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>ButtonTextColor</Color>
<!--<SColor>: Selected Text color from ColorScheme (high priority)-->
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align: Left, Center, Right-->
<Align>Center</Align>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
<Font>Outline</Font>
<!--<Text>: Text or translation tag-->
<Text>TR_SCREENO_BUTTON_LYRICS</Text>
</Text>
<!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
<Reflection>
<Space>10</Space>
<Height>26</Height>
</Reflection>
<!--<SReflection> If exists:-->
<!-- <Space>: Reflection Space of selected button-->
<!-- <Height>: Reflection Height of selected button-->
<SReflection>
<Space>10</Space>
<Height>26</Height>
</SReflection>
</ButtonOptionsLyrics>
<ButtonOptionsTheme>
<!--<Skin>: Texture name-->
<Skin>Button</Skin>
<!--<SkinSelected>: Texture name for selected button-->
<SkinSelected>Button</SkinSelected>
<!--<X>, <Y>, <Z>, <W>, <H>: Button position, width and height-->
<X>985</X>
<X>1078,2</X>
<Y>600</Y>
<Z>0,00</Z>
<W>150</W>
@@ -332,4 +387,4 @@
</SReflection>
</ButtonOptionsTheme>
</ScreenOptions>
</root>
</root>
Output/Themes/Ambient/Screens/ScreenOptionsLyrics.xml
+299
View File
@@ -0,0 +1,299 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<ScreenOptionsLyrics>
<ScreenVersion>1</ScreenVersion>
<Background1>
<!--<Type>: Background type: None, Color, Texture, Video-->
<Type>Video</Type>
<!--<Video>: Background video name-->
<Video>BG_Video</Video>
<!--<Skin>: Background Texture name-->
<Skin>BG_Options</Skin>
<!--<Color>: Background color for type "Color" from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>BackgroundColor</Color>
</Background1>
<Static1>
<!--<Skin>: Texture name-->
<Skin>Menu</Skin>
<!--<X>, <Y>, <Z>, <W>, <H>: Static position, width and height-->
<X>40</X>
<Y>40</Y>
<Z>0,00</Z>
<W>1200</W>
<H>50</H>
<!--<Color>: Static color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color>
<!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
</Static1>
<Text1>
<!--<X>, <Y>: Text position-->
<X>640</X>
<Y>48</Y>
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color>
<!--<SColor>: Selected Text color from ColorScheme (high priority)-->
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
<SColor>TextSColor</SColor>
<!--<Align>: Text align: Left, Center, Right-->
<Align>Center</Align>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
<Font>Outline</Font>
<!--<Text>: Text or translation tag-->
<Text>TR_SCREENOLYRICS_OPTIONS</Text>
<!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
</Text1>
<Text2>
<!--<X>, <Y>: Text position-->
<X>75</X>
<Y>105</Y>
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color>
<!--<SColor>: Selected Text color from ColorScheme (high priority)-->
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
<SColor>TextSColor</SColor>
<!--<Align>: Text align: Left, Center, Right-->
<Align>Left</Align>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
<Font>Outline</Font>
<!--<Text>: Text or translation tag-->
<Text>TR_SCREENOLYRICS_STYLE</Text>
<!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
</Text2>
<Text3>
<!--<X>, <Y>: Text position-->
<X>75</X>
<Y>165</Y>
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>StaticColor</Color>
<!--<SColor>: Selected Text color from ColorScheme (high priority)-->
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
<SColor>TextSColor</SColor>
<!--<Align>: Text align: Left, Center, Right-->
<Align>Left</Align>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
<Font>Outline</Font>
<!--<Text>: Text or translation tag-->
<Text>TR_SCREENOLYRICS_ONTOP</Text>
<!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
</Text3>
<ButtonExit>
<!--<Skin>: Texture name-->
<Skin>Button</Skin>
<!--<SkinSelected>: Texture name for selected button-->
<SkinSelected>Button</SkinSelected>
<!--<X>, <Y>, <Z>, <W>, <H>: Button position, width and height-->
<X>145</X>
<Y>600</Y>
<Z>0,00</Z>
<W>150</W>
<H>50</H>
<!--<Color>: Button color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>ButtonColor</Color>
<!--<SColor>: Selected button color from ColorScheme (high priority)-->
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
<SColor>ButtonSColor</SColor>
<Text>
<!--<X>, <Y>: Text position-->
<X>75</X>
<Y>10</Y>
<!--<H>: Text height-->
<H>32</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>142</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>ButtonTextColor</Color>
<!--<SColor>: Selected Text color from ColorScheme (high priority)-->
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
<SColor>ButtonTextSColor</SColor>
<!--<Align>: Text align: Left, Center, Right-->
<Align>Center</Align>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
<Style>Bold</Style>
<!--<Font>: Text font name-->
<Font>Outline</Font>
<!--<Text>: Text or translation tag-->
<Text>TR_BUTTON_BACK</Text>
</Text>
<!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
<Reflection>
<Space>10</Space>
<Height>26</Height>
</Reflection>
<!--<SReflection> If exists:-->
<!-- <Space>: Reflection Space of selected button-->
<!-- <Height>: Reflection Height of selected button-->
<SReflection>
<Space>10</Space>
<Height>26</Height>
</SReflection>
</ButtonExit>
<SelectSlideLyricStyle>
<!--<Skin>: Texture name-->
<Skin>Invisible</Skin>
<!--<SkinArrowLeft>: Texture name of left arrow-->
<SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
<!--<SkinArrowRight>: Texture name of right arrow-->
<SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
<!--<SkinSelected>: Texture name for selected SelectSlide-->
<SkinSelected>SelectSlide</SkinSelected>
<!--<SkinArrowLeftSelected>: Texture name of selected left arrow-->
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<!--<SkinArrowRightSelected>: Texture name of selected right arrow-->
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<!--<SkinHighlighted>: Texture name for highlighted SelectSlide-->
<SkinHighlighted>SelectSlide</SkinHighlighted>
<!--<X>, <Y>, <Z>, <W>, <H>: SelectSlide position, width and height-->
<X>500</X>
<Y>100</Y>
<Z>0,00</Z>
<W>700</W>
<H>50</H>
<!--<ArrowLeftX>, <ArrowLeftY>, <ArrowLeftZ>, <ArrowLeftW>, <ArrowLeftH>: Left arrow position, width and height-->
<ArrowLeftX>505</ArrowLeftX>
<ArrowLeftY>105</ArrowLeftY>
<ArrowLeftZ>0,00</ArrowLeftZ>
<ArrowLeftW>40</ArrowLeftW>
<ArrowLeftH>40</ArrowLeftH>
<!--<ArrowRightX>, <ArrowRightY>, <ArrowRightZ>, <ArrowRightW>, <ArrowRightH>: Right arrow position, width and height-->
<ArrowRightX>1170</ArrowRightX>
<ArrowRightY>105</ArrowRightY>
<ArrowRightZ>0,00</ArrowRightZ>
<ArrowRightW>40</ArrowRightW>
<ArrowRightH>40</ArrowRightH>
<!--<Color>: SelectSlide color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>SelectSlideColor</Color>
<!--<SColor>: Selected SelectSlide color from ColorScheme (high priority)-->
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
<SColor>SelectSlideSColor</SColor>
<!--<HColor>: Highlighted SelectSlide color from ColorScheme (high priority)-->
<!--or <HR>, <HG>, <HB>, <HA> (lower priority)-->
<HColor>SelectSlideHColor</HColor>
<!--<ArrowColor>: Arrow color from ColorScheme (high priority)-->
<!--or <ArrowR>, <ArrowG>, <ArrowB>, <ArrowA> (lower priority)-->
<ArrowColor>ArrowColor</ArrowColor>
<!--<ArrowSColor>: Selected arrow color from ColorScheme (high priority)-->
<!--or <ArrowSR>, <ArrowSG>, <ArrowSB>, <ArrowSA> (lower priority)-->
<ArrowSColor>ArrowSColor</ArrowSColor>
<!--<TextColor>: Text color from ColorScheme (high priority)-->
<!--or <TextR>, <TextG>, <TextB>, <TextA> (lower priority)-->
<TextColor>TextColor</TextColor>
<!--<TextSColor>: Selected text color from ColorScheme (high priority)-->
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>205,33</TextMaxW>
<!--<TextFont>: Text font name-->
<TextFont>Outline</TextFont>
<!--<TextStyle>: Text style: Normal, Italic, Bold, BoldItalic-->
<TextStyle>Bold</TextStyle>
<!--<NumVisible>: Number of visible elements in the slide-->
<NumVisible>4</NumVisible>
</SelectSlideLyricStyle>
<SelectSlideLyricsOnTop>
<!--<Skin>: Texture name-->
<Skin>Invisible</Skin>
<!--<SkinArrowLeft>: Texture name of left arrow-->
<SkinArrowLeft>SelectSlideArrowLeft</SkinArrowLeft>
<!--<SkinArrowRight>: Texture name of right arrow-->
<SkinArrowRight>SelectSlideArrowRight</SkinArrowRight>
<!--<SkinSelected>: Texture name for selected SelectSlide-->
<SkinSelected>SelectSlide</SkinSelected>
<!--<SkinArrowLeftSelected>: Texture name of selected left arrow-->
<SkinArrowLeftSelected>SelectSlideArrowLeft</SkinArrowLeftSelected>
<!--<SkinArrowRightSelected>: Texture name of selected right arrow-->
<SkinArrowRightSelected>SelectSlideArrowRight</SkinArrowRightSelected>
<!--<SkinHighlighted>: Texture name for highlighted SelectSlide-->
<SkinHighlighted>SelectSlide</SkinHighlighted>
<!--<X>, <Y>, <Z>, <W>, <H>: SelectSlide position, width and height-->
<X>500</X>
<Y>160</Y>
<Z>0,00</Z>
<W>700</W>
<H>50</H>
<!--<ArrowLeftX>, <ArrowLeftY>, <ArrowLeftZ>, <ArrowLeftW>, <ArrowLeftH>: Left arrow position, width and height-->
<ArrowLeftX>505</ArrowLeftX>
<ArrowLeftY>165</ArrowLeftY>
<ArrowLeftZ>0,00</ArrowLeftZ>
<ArrowLeftW>40</ArrowLeftW>
<ArrowLeftH>40</ArrowLeftH>
<!--<ArrowRightX>, <ArrowRightY>, <ArrowRightZ>, <ArrowRightW>, <ArrowRightH>: Right arrow position, width and height-->
<ArrowRightX>1170</ArrowRightX>
<ArrowRightY>165</ArrowRightY>
<ArrowRightZ>0,00</ArrowRightZ>
<ArrowRightW>40</ArrowRightW>
<ArrowRightH>40</ArrowRightH>
<!--<Color>: SelectSlide color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>SelectSlideColor</Color>
<!--<SColor>: Selected SelectSlide color from ColorScheme (high priority)-->
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
<SColor>SelectSlideSColor</SColor>
<!--<HColor>: Highlighted SelectSlide color from ColorScheme (high priority)-->
<!--or <HR>, <HG>, <HB>, <HA> (lower priority)-->
<HColor>SelectSlideHColor</HColor>
<!--<ArrowColor>: Arrow color from ColorScheme (high priority)-->
<!--or <ArrowR>, <ArrowG>, <ArrowB>, <ArrowA> (lower priority)-->
<ArrowColor>ArrowColor</ArrowColor>
<!--<ArrowSColor>: Selected arrow color from ColorScheme (high priority)-->
<!--or <ArrowSR>, <ArrowSG>, <ArrowSB>, <ArrowSA> (lower priority)-->
<ArrowSColor>ArrowSColor</ArrowSColor>
<!--<TextColor>: Text color from ColorScheme (high priority)-->
<!--or <TextR>, <TextG>, <TextB>, <TextA> (lower priority)-->
<TextColor>TextColor</TextColor>
<!--<TextSColor>: Selected text color from ColorScheme (high priority)-->
<!--or <TextSR>, <TextSG>, <TextSB>, <TextSA> (lower priority)-->
<TextSColor>TextSColor</TextSColor>
<!--<TextH>: Text height-->
<TextH>32,00</TextH>
<!--<TextMaxW>: Maximum text width (if exists)-->
<TextMaxW>205,33</TextMaxW>
<!--<TextFont>: Text font name-->
<TextFont>Outline</TextFont>
<!--<TextStyle>: Text style: Normal, Italic, Bold, BoldItalic-->
<TextStyle>Bold</TextStyle>
<!--<NumVisible>: Number of visible elements in the slide-->
<NumVisible>2</NumVisible>
</SelectSlideLyricsOnTop>
</ScreenOptionsLyrics>
</root>
Output/Themes/Ambient/Screens/ScreenOptionsSound.xml
+3 -9
View File
@@ -40,16 +40,10 @@
<!--<MaxW>: Maximum text width (if exists)-->
<!--<Color>: Text 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>1,00</A>
<Color>StaticColor</Color>
<!--<SColor>: Selected Text color from ColorScheme (high priority)-->
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
<SR>0,68</SR>
<SG>0,89</SG>
<SB>0,97</SB>
<SA>1,00</SA>
<SColor>TextSColor</SColor>
<!--<Align>: Text align: Left, Center, Right-->
<Align>Center</Align>
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
@@ -394,4 +388,4 @@
<NumVisible>1</NumVisible>
</SelectSlideBackgroundMusicSource>
</ScreenOptionsSound>
</root>
</root>
Output/Themes/Ambient/Screens/ScreenSing.xml
+3 -12
View File
@@ -170,10 +170,7 @@
<H>45</H>
<!--<Color>: Static color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<R>0,00</R>
<G>0,00</G>
<B>1,00</B>
<A>0,50</A>
<Color>LyricHelper</Color>
<!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
@@ -189,10 +186,7 @@
<H>45</H>
<!--<Color>: Static color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<R>0,00</R>
<G>0,00</G>
<B>1,00</B>
<A>0,50</A>
<Color>LyricHelper</Color>
<!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
@@ -208,10 +202,7 @@
<H>45</H>
<!--<Color>: Static color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<R>0,00</R>
<G>0,00</G>
<B>1,00</B>
<A>0,50</A>
<Color>LyricHelper</Color>
<!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
Output/Themes/Ambient/Skin Blue.xml
+6
View File
@@ -250,6 +250,12 @@
<B>0,300</B>
<A>1,000</A>
</LyricSubColor>
<LyricHelper>
<R>0,00</R>
<G>0,00</G>
<B>1,00</B>
<A>0,50</A>
</LyricHelper>
<TimeBar>
<R>0,800</R>
<G>0,950</G>
Output/Themes/Ambient/Skin Green.xml
+54 -48
View File
@@ -120,86 +120,86 @@
</Player6Dim2>
<BackgroundColor>
<R>0,000</R>
<G>0,000</G>
<B>0,750</B>
<G>0,750</G>
<B>0,000</B>
<A>1,000</A>
</BackgroundColor>
<StaticColor>
<R>0,675</R>
<G>0,890</G>
<B>0,969</B>
<R>0,709</R>
<G>0,968</G>
<B>0,674</B>
<A>1,000</A>
</StaticColor>
<StaticWarningColor>
<R>0,675</R>
<G>0,890</G>
<B>0,969</B>
<R>0,709</R>
<G>0,968</G>
<B>0,674</B>
<A>1,000</A>
</StaticWarningColor>
<ButtonColor>
<R>0,675</R>
<G>0,890</G>
<B>0,969</B>
<R>0,709</R>
<G>0,968</G>
<B>0,674</B>
<A>0,300</A>
</ButtonColor>
<ButtonSColor>
<R>0,675</R>
<G>0,890</G>
<B>0,969</B>
<R>0,709</R>
<G>0,968</G>
<B>0,674</B>
<A>1,000</A>
</ButtonSColor>
<ButtonTextColor>
<R>0,675</R>
<G>0,890</G>
<B>0,969</B>
<R>0,709</R>
<G>0,968</G>
<B>0,674</B>
<A>0,500</A>
</ButtonTextColor>
<ButtonTextSColor>
<R>0,675</R>
<G>0,890</G>
<B>0,969</B>
<R>0,709</R>
<G>0,968</G>
<B>0,674</B>
<A>1,000</A>
</ButtonTextSColor>
<SelectSlideColor>
<R>0,675</R>
<G>0,890</G>
<B>0,969</B>
<R>0,709</R>
<G>0,968</G>
<B>0,674</B>
<A>1,000</A>
</SelectSlideColor>
<SelectSlideHColor>
<R>0,675</R>
<G>0,890</G>
<B>0,969</B>
<R>0,709</R>
<G>0,968</G>
<B>0,674</B>
<A>1,000</A>
</SelectSlideHColor>
<SelectSlideSColor>
<R>0,675</R>
<G>0,890</G>
<B>0,969</B>
<R>0,709</R>
<G>0,968</G>
<B>0,674</B>
<A>0,500</A>
</SelectSlideSColor>
<ArrowColor>
<R>0,675</R>
<G>0,890</G>
<B>0,969</B>
<R>0,709</R>
<G>0,968</G>
<B>0,674</B>
<A>0,300</A>
</ArrowColor>
<ArrowSColor>
<R>0,675</R>
<G>0,890</G>
<B>0,969</B>
<R>0,709</R>
<G>0,968</G>
<B>0,674</B>
<A>1,000</A>
</ArrowSColor>
<TextColor>
<R>0,675</R>
<G>0,890</G>
<B>0,969</B>
<R>0,709</R>
<G>0,968</G>
<B>0,674</B>
<A>0,500</A>
</TextColor>
<TextSColor>
<R>0,675</R>
<G>0,890</G>
<B>0,969</B>
<R>0,709</R>
<G>0,968</G>
<B>0,674</B>
<A>1,000</A>
</TextSColor>
<TextWarningColor>
@@ -234,8 +234,8 @@
</Invisible>
<LyricHighlight>
<R>0,000</R>
<G>0,000</G>
<B>1,000</B>
<G>1,000</G>
<B>0,000</B>
<A>1,000</A>
</LyricHighlight>
<LyricMainColor>
@@ -250,17 +250,23 @@
<B>0,300</B>
<A>1,000</A>
</LyricSubColor>
<LyricHelper>
<R>0,00</R>
<G>1,00</G>
<B>0,00</B>
<A>0,50</A>
</LyricHelper>
<TimeBar>
<R>0,800</R>
<G>0,950</G>
<B>1,000</B>
<G>1,000</G>
<B>0,811</B>
<A>0,500</A>
</TimeBar>
<TimeBarSentence>
<R>0,800</R>
<G>0,950</G>
<B>1,000</B>
<A>0,850</A>
<G>1,000</G>
<B>0,811</B>
<A>0,811</A>
</TimeBarSentence>
</ColorSchemes>
<Skins>
Output/Themes/Ambient/Skin Red.xml
+55 -49
View File
@@ -119,87 +119,87 @@
<A>0,400</A>
</Player6Dim2>
<BackgroundColor>
<R>0,000</R>
<R>0,750</R>
<G>0,000</G>
<B>0,750</B>
<B>0,000</B>
<A>1,000</A>
</BackgroundColor>
<StaticColor>
<R>0,675</R>
<G>0,890</G>
<B>0,969</B>
<R>0,968</R>
<G>0,674</G>
<B>0,674</B>
<A>1,000</A>
</StaticColor>
<StaticWarningColor>
<R>0,675</R>
<G>0,890</G>
<B>0,969</B>
<R>0,968</R>
<G>0,674</G>
<B>0,674</B>
<A>1,000</A>
</StaticWarningColor>
<ButtonColor>
<R>0,675</R>
<G>0,890</G>
<B>0,969</B>
<R>0,968</R>
<G>0,674</G>
<B>0,674</B>
<A>0,300</A>
</ButtonColor>
<ButtonSColor>
<R>0,675</R>
<G>0,890</G>
<B>0,969</B>
<R>0,968</R>
<G>0,674</G>
<B>0,674</B>
<A>1,000</A>
</ButtonSColor>
<ButtonTextColor>
<R>0,675</R>
<G>0,890</G>
<B>0,969</B>
<R>0,968</R>
<G>0,674</G>
<B>0,674</B>
<A>0,500</A>
</ButtonTextColor>
<ButtonTextSColor>
<R>0,675</R>
<G>0,890</G>
<B>0,969</B>
<R>0,968</R>
<G>0,674</G>
<B>0,674</B>
<A>1,000</A>
</ButtonTextSColor>
<SelectSlideColor>
<R>0,675</R>
<G>0,890</G>
<B>0,969</B>
<R>0,968</R>
<G>0,674</G>
<B>0,674</B>
<A>1,000</A>
</SelectSlideColor>
<SelectSlideHColor>
<R>0,675</R>
<G>0,890</G>
<B>0,969</B>
<R>0,968</R>
<G>0,674</G>
<B>0,674</B>
<A>1,000</A>
</SelectSlideHColor>
<SelectSlideSColor>
<R>0,675</R>
<G>0,890</G>
<B>0,969</B>
<R>0,968</R>
<G>0,674</G>
<B>0,674</B>
<A>0,500</A>
</SelectSlideSColor>
<ArrowColor>
<R>0,675</R>
<G>0,890</G>
<B>0,969</B>
<R>0,968</R>
<G>0,674</G>
<B>0,674</B>
<A>0,300</A>
</ArrowColor>
<ArrowSColor>
<R>0,675</R>
<G>0,890</G>
<B>0,969</B>
<R>0,968</R>
<G>0,674</G>
<B>0,674</B>
<A>1,000</A>
</ArrowSColor>
<TextColor>
<R>0,675</R>
<G>0,890</G>
<B>0,969</B>
<R>0,968</R>
<G>0,674</G>
<B>0,674</B>
<A>0,500</A>
</TextColor>
<TextSColor>
<R>0,675</R>
<G>0,890</G>
<B>0,969</B>
<R>0,968</R>
<G>0,674</G>
<B>0,674</B>
<A>1,000</A>
</TextSColor>
<TextWarningColor>
@@ -233,9 +233,9 @@
<A>0,000</A>
</Invisible>
<LyricHighlight>
<R>0,000</R>
<R>1,000</R>
<G>0,000</G>
<B>1,000</B>
<B>0,000</B>
<A>1,000</A>
</LyricHighlight>
<LyricMainColor>
@@ -250,16 +250,22 @@
<B>0,300</B>
<A>1,000</A>
</LyricSubColor>
<LyricHelper>
<R>1,00</R>
<G>0,00</G>
<B>0,00</B>
<A>0,50</A>
</LyricHelper>
<TimeBar>
<R>0,800</R>
<G>0,950</G>
<B>1,000</B>
<R>1,000</R>
<G>0,800</G>
<B>0,800</B>
<A>0,500</A>
</TimeBar>
<TimeBarSentence>
<R>0,800</R>
<G>0,950</G>
<B>1,000</B>
<R>1,000</R>
<G>0,800</G>
<B>0,800</B>
<A>0,850</A>
</TimeBarSentence>
</ColorSchemes>
Output/Themes/Ambient/Skin Yellow.xml
+57 -51
View File
@@ -119,87 +119,87 @@
<A>0,400</A>
</Player6Dim2>
<BackgroundColor>
<R>0,000</R>
<G>0,000</G>
<B>0,750</B>
<R>0,750</R>
<G>0,750</G>
<B>0,000</B>
<A>1,000</A>
</BackgroundColor>
<StaticColor>
<R>0,675</R>
<G>0,890</G>
<B>0,969</B>
<R>0,968</R>
<G>0,956</G>
<B>0,674</B>
<A>1,000</A>
</StaticColor>
<StaticWarningColor>
<R>0,675</R>
<G>0,890</G>
<B>0,969</B>
<R>0,968</R>
<G>0,956</G>
<B>0,674</B>
<A>1,000</A>
</StaticWarningColor>
<ButtonColor>
<R>0,675</R>
<G>0,890</G>
<B>0,969</B>
<R>0,968</R>
<G>0,956</G>
<B>0,674</B>
<A>0,300</A>
</ButtonColor>
<ButtonSColor>
<R>0,675</R>
<G>0,890</G>
<B>0,969</B>
<R>0,968</R>
<G>0,956</G>
<B>0,674</B>
<A>1,000</A>
</ButtonSColor>
<ButtonTextColor>
<R>0,675</R>
<G>0,890</G>
<B>0,969</B>
<R>0,968</R>
<G>0,956</G>
<B>0,674</B>
<A>0,500</A>
</ButtonTextColor>
<ButtonTextSColor>
<R>0,675</R>
<G>0,890</G>
<B>0,969</B>
<R>0,968</R>
<G>0,956</G>
<B>0,674</B>
<A>1,000</A>
</ButtonTextSColor>
<SelectSlideColor>
<R>0,675</R>
<G>0,890</G>
<B>0,969</B>
<R>0,968</R>
<G>0,956</G>
<B>0,674</B>
<A>1,000</A>
</SelectSlideColor>
<SelectSlideHColor>
<R>0,675</R>
<G>0,890</G>
<B>0,969</B>
<R>0,968</R>
<G>0,956</G>
<B>0,674</B>
<A>1,000</A>
</SelectSlideHColor>
<SelectSlideSColor>
<R>0,675</R>
<G>0,890</G>
<B>0,969</B>
<R>0,968</R>
<G>0,956</G>
<B>0,674</B>
<A>0,500</A>
</SelectSlideSColor>
<ArrowColor>
<R>0,675</R>
<G>0,890</G>
<B>0,969</B>
<R>0,968</R>
<G>0,956</G>
<B>0,674</B>
<A>0,300</A>
</ArrowColor>
<ArrowSColor>
<R>0,675</R>
<G>0,890</G>
<B>0,969</B>
<R>0,968</R>
<G>0,956</G>
<B>0,674</B>
<A>1,000</A>
</ArrowSColor>
<TextColor>
<R>0,675</R>
<G>0,890</G>
<B>0,969</B>
<R>0,968</R>
<G>0,956</G>
<B>0,674</B>
<A>0,500</A>
</TextColor>
<TextSColor>
<R>0,675</R>
<G>0,890</G>
<B>0,969</B>
<R>0,968</R>
<G>0,956</G>
<B>0,674</B>
<A>1,000</A>
</TextSColor>
<TextWarningColor>
@@ -233,9 +233,9 @@
<A>0,000</A>
</Invisible>
<LyricHighlight>
<R>0,000</R>
<G>0,000</G>
<B>1,000</B>
<R>1,000</R>
<G>1,000</G>
<B>0,000</B>
<A>1,000</A>
</LyricHighlight>
<LyricMainColor>
@@ -250,16 +250,22 @@
<B>0,300</B>
<A>1,000</A>
</LyricSubColor>
<LyricHelper>
<R>1,00</R>
<G>1,00</G>
<B>0,00</B>
<A>0,50</A>
</LyricHelper>
<TimeBar>
<R>0,800</R>
<G>0,950</G>
<B>1,000</B>
<R>0,949</R>
<G>1,000</G>
<B>0,800</B>
<A>0,500</A>
</TimeBar>
<TimeBarSentence>
<R>0,800</R>
<G>0,950</G>
<B>1,000</B>
<R>0,949</R>
<G>1,000</G>
<B>0,800</B>
<A>0,850</A>
</TimeBarSentence>
</ColorSchemes>
Output/Themes/Changelog/Changelog_ScreenOptionsLyrics.txt
+17
View File
@@ -0,0 +1,17 @@
ScreenOptionsSound
++++++++++
Version 1:
Add:
<ButtonExit>
<SelectSlideLyricStyle>
<SelectSlideLyricsOnTop>
and some texts for description (Text1, Text2, Text3)
TR_SCREENOLYRICS_OPTIONS
TR_SCREENOLYRICS_STYLE
TR_SCREENOLYRICS_ONTOP
++++++++++
Vocaluxe/Base/CConfig.cs
+5
View File
@@ -227,6 +227,7 @@ namespace Vocaluxe.Base
public static List<string> SongFolder = new List<string>();
public static ESongMenu SongMenu = ESongMenu.TR_CONFIG_TILE_BOARD;
public static ESongSorting SongSorting = ESongSorting.TR_CONFIG_ARTIST;
public static EOffOn IgnoreArticles = EOffOn.TR_CONFIG_ON;
public static float ScoreAnimationTime = 10;
public static ETimerMode TimerMode = ETimerMode.TR_CONFIG_TIMERMODE_REMAINING;
public static int NumPlayer = 2;
@@ -367,6 +368,7 @@ namespace Vocaluxe.Base
CHelper.TryGetEnumValueFromXML<ESongMenu>("//root/Game/SongMenu", navigator, ref SongMenu);
CHelper.TryGetEnumValueFromXML<ESongSorting>("//root/Game/SongSorting", navigator, ref SongSorting);
CHelper.TryGetEnumValueFromXML<EOffOn>("//root/Game/IgnoreArticles", navigator, ref IgnoreArticles);
CHelper.TryGetFloatValueFromXML("//root/Game/ScoreAnimationTime", navigator, ref ScoreAnimationTime);
CHelper.TryGetEnumValueFromXML<ETimerMode>("//root/Game/TimerMode", navigator, ref TimerMode);
CHelper.TryGetIntValueFromXML("//root/Game/NumPlayer", navigator, ref NumPlayer);
@@ -610,6 +612,9 @@ namespace Vocaluxe.Base
writer.WriteComment("SongSorting: " + ListStrings(Enum.GetNames(typeof(ESongSorting))));
writer.WriteElementString("SongSorting", Enum.GetName(typeof(ESongSorting), SongSorting));
writer.WriteComment("Ignore articles on song-sorting: " + ListStrings(Enum.GetNames(typeof(EOffOn))));
writer.WriteElementString("IgnoreArticles", Enum.GetName(typeof(EOffOn), IgnoreArticles));
writer.WriteComment("ScoreAnimationTime: Values >= 1 or 0 for no animation. Time is in seconds.");
writer.WriteElementString("ScoreAnimationTime", ScoreAnimationTime.ToString());
Vocaluxe/Base/CSongs.cs
+166 -34
View File
@@ -353,12 +353,24 @@ namespace Vocaluxe.Base
int res = s1.SortString.ToUpper().CompareTo(s2.SortString.ToUpper());
if (res == 0)
{
res = _Songs[s1.SongID].Artist.ToUpper().CompareTo(_Songs[s2.SongID].Artist.ToUpper());
if (res == 0)
if (CConfig.IgnoreArticles == EOffOn.TR_CONFIG_ON)
{
return _Songs[s1.SongID].Title.ToUpper().CompareTo(_Songs[s2.SongID].Title.ToUpper());
res = _Songs[s1.SongID].ArtistSorting.ToUpper().CompareTo(_Songs[s2.SongID].ArtistSorting.ToUpper());
if (res == 0)
{
return _Songs[s1.SongID].TitleSorting.ToUpper().CompareTo(_Songs[s2.SongID].TitleSorting.ToUpper());
}
return res;
}
else
{
res = _Songs[s1.SongID].Artist.ToUpper().CompareTo(_Songs[s2.SongID].Artist.ToUpper());
if (res == 0)
{
return _Songs[s1.SongID].Title.ToUpper().CompareTo(_Songs[s2.SongID].Title.ToUpper());
}
return res;
}
return res;
}
return res;
});
@@ -407,12 +419,24 @@ namespace Vocaluxe.Base
int res = s1.SortString.ToUpper().CompareTo(s2.SortString.ToUpper());
if (res == 0)
{
res = _Songs[s1.SongID].Artist.ToUpper().CompareTo(_Songs[s2.SongID].Artist.ToUpper());
if (res == 0)
if (CConfig.IgnoreArticles == EOffOn.TR_CONFIG_ON)
{
return _Songs[s1.SongID].Title.ToUpper().CompareTo(_Songs[s2.SongID].Title.ToUpper());
res = _Songs[s1.SongID].ArtistSorting.ToUpper().CompareTo(_Songs[s2.SongID].ArtistSorting.ToUpper());
if (res == 0)
{
return _Songs[s1.SongID].TitleSorting.ToUpper().CompareTo(_Songs[s2.SongID].TitleSorting.ToUpper());
}
return res;
}
else
{
res = _Songs[s1.SongID].Artist.ToUpper().CompareTo(_Songs[s2.SongID].Artist.ToUpper());
if (res == 0)
{
return _Songs[s1.SongID].Title.ToUpper().CompareTo(_Songs[s2.SongID].Title.ToUpper());
}
return res;
}
return res;
}
return res;
});
@@ -480,12 +504,24 @@ namespace Vocaluxe.Base
int res = s1.SortString.ToUpper().CompareTo(s2.SortString.ToUpper());
if (res == 0)
{
res = _Songs[s1.SongID].Artist.ToUpper().CompareTo(_Songs[s2.SongID].Artist.ToUpper());
if (res == 0)
if (CConfig.IgnoreArticles == EOffOn.TR_CONFIG_ON)
{
return _Songs[s1.SongID].Title.ToUpper().CompareTo(_Songs[s2.SongID].Title.ToUpper());
res = _Songs[s1.SongID].ArtistSorting.ToUpper().CompareTo(_Songs[s2.SongID].ArtistSorting.ToUpper());
if (res == 0)
{
return _Songs[s1.SongID].TitleSorting.ToUpper().CompareTo(_Songs[s2.SongID].TitleSorting.ToUpper());
}
return res;
}
else
{
res = _Songs[s1.SongID].Artist.ToUpper().CompareTo(_Songs[s2.SongID].Artist.ToUpper());
if (res == 0)
{
return _Songs[s1.SongID].Title.ToUpper().CompareTo(_Songs[s2.SongID].Title.ToUpper());
}
return res;
}
return res;
}
return res;
});
@@ -506,17 +542,29 @@ namespace Vocaluxe.Base
case ESongSorting.TR_CONFIG_ARTIST:
foreach (CSong song in _SongList)
{
_SortList.Add(new SongPointer(song.ID, song.Artist));
_SortList.Add(new SongPointer(song.ID, song.Artist));
}
_SortList.Sort(delegate(SongPointer s1, SongPointer s2)
{
int res = s1.SortString.ToUpper().CompareTo(s2.SortString.ToUpper());
if (res == 0)
{
if (CConfig.IgnoreArticles == EOffOn.TR_CONFIG_ON)
{
return _Songs[s1.SongID].Title.ToUpper().CompareTo(_Songs[s2.SongID].Title.ToUpper());
int res = _Songs[s1.SongID].ArtistSorting.ToUpper().CompareTo(_Songs[s2.SongID].ArtistSorting.ToUpper());
if (res == 0)
{
return _Songs[s1.SongID].TitleSorting.ToUpper().CompareTo(_Songs[s2.SongID].TitleSorting.ToUpper());
}
return res;
}
else
{
int res = s1.SortString.ToUpper().CompareTo(s2.SortString.ToUpper());
if (res == 0)
{
return _Songs[s1.SongID].Title.ToUpper().CompareTo(_Songs[s2.SongID].Title.ToUpper());
}
return res;
}
return res;
});
_SongsSortList = _SortList.ToArray();
@@ -535,7 +583,10 @@ namespace Vocaluxe.Base
case ESongSorting.TR_CONFIG_ARTIST_LETTER:
foreach (CSong song in _SongList)
{
_SortList.Add(new SongPointer(song.ID, song.Artist));
if (CConfig.IgnoreArticles == EOffOn.TR_CONFIG_ON)
_SortList.Add(new SongPointer(song.ID, song.ArtistSorting));
else
_SortList.Add(new SongPointer(song.ID, song.Artist));
}
_SortList.Sort(delegate(SongPointer s1, SongPointer s2)
@@ -543,7 +594,14 @@ namespace Vocaluxe.Base
int res = s1.SortString.ToUpper().CompareTo(s2.SortString.ToUpper());
if (res == 0)
{
return _Songs[s1.SongID].Title.ToUpper().CompareTo(_Songs[s2.SongID].Title.ToUpper());
if (CConfig.IgnoreArticles == EOffOn.TR_CONFIG_ON)
{
return _Songs[s1.SongID].TitleSorting.ToUpper().CompareTo(_Songs[s2.SongID].TitleSorting.ToUpper());
}
else
{
return _Songs[s1.SongID].Title.ToUpper().CompareTo(_Songs[s2.SongID].Title.ToUpper());
}
}
return res;
});
@@ -555,6 +613,20 @@ namespace Vocaluxe.Base
for (int i=0; i < _SongsSortList.Length; i++)
{
Char firstLetter = Char.ToUpper(_SongsSortList[i].SortString[0]);
//Fix for german Umlaute
switch (firstLetter)
{
case 'Ä':
firstLetter = 'A';
break;
case 'Ö':
firstLetter = 'O';
break;
case 'Ü':
firstLetter = 'U';
break;
}
if (!Char.IsLetter(firstLetter))
{
@@ -583,7 +655,10 @@ namespace Vocaluxe.Base
case ESongSorting.TR_CONFIG_TITLE_LETTER:
foreach (CSong song in _SongList)
{
_SortList.Add(new SongPointer(song.ID, song.Title));
if (CConfig.IgnoreArticles == EOffOn.TR_CONFIG_ON)
_SortList.Add(new SongPointer(song.ID, song.TitleSorting));
else
_SortList.Add(new SongPointer(song.ID, song.Title));
}
_SortList.Sort(delegate(SongPointer s1, SongPointer s2)
@@ -591,7 +666,14 @@ namespace Vocaluxe.Base
int res = s1.SortString.ToUpper().CompareTo(s2.SortString.ToUpper());
if (res == 0)
{
return _Songs[s1.SongID].Artist.ToUpper().CompareTo(_Songs[s2.SongID].Artist.ToUpper());
if (CConfig.IgnoreArticles == EOffOn.TR_CONFIG_ON)
{
return _Songs[s1.SongID].ArtistSorting.ToUpper().CompareTo(_Songs[s2.SongID].ArtistSorting.ToUpper());
}
else
{
return _Songs[s1.SongID].Artist.ToUpper().CompareTo(_Songs[s2.SongID].Artist.ToUpper());
}
}
return res;
});
@@ -603,6 +685,20 @@ namespace Vocaluxe.Base
for (int i=0; i < _SongsSortList.Length; i++)
{
Char firstLetter = Char.ToUpper(_SongsSortList[i].SortString[0]);
//Fix for german Umlaute
switch (firstLetter)
{
case 'Ä':
firstLetter = 'A';
break;
case 'Ö':
firstLetter = 'O';
break;
case 'Ü':
firstLetter = 'U';
break;
}
if (!Char.IsLetter(firstLetter))
{
@@ -639,12 +735,24 @@ namespace Vocaluxe.Base
int res = s1.SortString.CompareTo(s2.SortString);
if (res == 0)
{
res = _Songs[s1.SongID].Artist.ToUpper().CompareTo(_Songs[s2.SongID].Artist.ToUpper());
if (res == 0)
if (CConfig.IgnoreArticles == EOffOn.TR_CONFIG_ON)
{
return _Songs[s1.SongID].Title.ToUpper().CompareTo(_Songs[s2.SongID].Title.ToUpper());
res = _Songs[s1.SongID].ArtistSorting.ToUpper().CompareTo(_Songs[s2.SongID].ArtistSorting.ToUpper());
if (res == 0)
{
return _Songs[s1.SongID].TitleSorting.ToUpper().CompareTo(_Songs[s2.SongID].TitleSorting.ToUpper());
}
return res;
}
else
{
res = _Songs[s1.SongID].Artist.ToUpper().CompareTo(_Songs[s2.SongID].Artist.ToUpper());
if (res == 0)
{
return _Songs[s1.SongID].Title.ToUpper().CompareTo(_Songs[s2.SongID].Title.ToUpper());
}
return res;
}
return res;
}
return res;
});
@@ -686,12 +794,24 @@ namespace Vocaluxe.Base
int res = s1.SortString.CompareTo(s2.SortString);
if (res == 0)
{
res = _Songs[s1.SongID].Artist.ToUpper().CompareTo(_Songs[s2.SongID].Artist.ToUpper());
if (res == 0)
if (CConfig.IgnoreArticles == EOffOn.TR_CONFIG_ON)
{
return _Songs[s1.SongID].Title.ToUpper().CompareTo(_Songs[s2.SongID].Title.ToUpper());
res = _Songs[s1.SongID].ArtistSorting.ToUpper().CompareTo(_Songs[s2.SongID].ArtistSorting.ToUpper());
if (res == 0)
{
return _Songs[s1.SongID].TitleSorting.ToUpper().CompareTo(_Songs[s2.SongID].TitleSorting.ToUpper());
}
return res;
}
else
{
res = _Songs[s1.SongID].Artist.ToUpper().CompareTo(_Songs[s2.SongID].Artist.ToUpper());
if (res == 0)
{
return _Songs[s1.SongID].Title.ToUpper().CompareTo(_Songs[s2.SongID].Title.ToUpper());
}
return res;
}
return res;
}
return res;
});
@@ -740,12 +860,24 @@ namespace Vocaluxe.Base
int res = s1.SortString.CompareTo(s2.SortString);
if (res == 0)
{
res = _Songs[s1.SongID].Artist.ToUpper().CompareTo(_Songs[s2.SongID].Artist.ToUpper());
if (res == 0)
if (CConfig.IgnoreArticles == EOffOn.TR_CONFIG_ON)
{
return _Songs[s1.SongID].Title.ToUpper().CompareTo(_Songs[s2.SongID].Title.ToUpper());
res = _Songs[s1.SongID].ArtistSorting.ToUpper().CompareTo(_Songs[s2.SongID].ArtistSorting.ToUpper());
if (res == 0)
{
return _Songs[s1.SongID].TitleSorting.ToUpper().CompareTo(_Songs[s2.SongID].TitleSorting.ToUpper());
}
return res;
}
else
{
res = _Songs[s1.SongID].Artist.ToUpper().CompareTo(_Songs[s2.SongID].Artist.ToUpper());
if (res == 0)
{
return _Songs[s1.SongID].Title.ToUpper().CompareTo(_Songs[s2.SongID].Title.ToUpper());
}
return res;
}
return res;
}
return res;
});
Vocaluxe/Lib/Song/CSong.cs
+26
View File
@@ -117,6 +117,9 @@ namespace Vocaluxe.Lib.Song
public string Title = String.Empty;
public string Artist = String.Empty;
public string TitleSorting = String.Empty;
public string ArtistSorting = String.Empty;
public float Start = 0f;
public float Finish = 0f;
@@ -346,6 +349,18 @@ namespace Vocaluxe.Lib.Song
HeaderFlags |= EHeaderFlags.Artist;
}
break;
case "TITLE-ON-SORTING":
if (Value != String.Empty)
{
this.TitleSorting = Value;
}
break;
case "ARTIST-ON-SORTING":
if (Value != String.Empty)
{
this.ArtistSorting = Value;
}
break;
case "MP3":
if (File.Exists(Path.Combine(this.Folder, Value)))
{
@@ -517,6 +532,17 @@ namespace Vocaluxe.Lib.Song
CheckFiles();
//Before saving this tags to .txt: Check, if ArtistSorting and Artist are equal, then don't save this tag.
if (this.ArtistSorting == "")
{
this.ArtistSorting = this.Artist;
}
if (this.TitleSorting == "")
{
this.TitleSorting = this.Title;
}
return true;
}
Vocaluxe/Menu/CGraphics.cs
+15 -3
View File
@@ -27,11 +27,12 @@ namespace Vocaluxe.Menu
ScreenOptionsSound = 10,
ScreenOptionsRecord = 11,
ScreenOptionsVideo = 12,
ScreenOptionsTheme = 13,
ScreenOptionsLyrics = 13,
ScreenOptionsTheme = 14,
ScreenNames = 14,
ScreenNames = 15,
ScreenCredits = 15,
ScreenCredits = 16,
ScreenNull = -1
}
@@ -228,6 +229,7 @@ namespace Vocaluxe.Menu
_Screens.Add(new CScreenOptionsSound());
_Screens.Add(new CScreenOptionsRecord());
_Screens.Add(new CScreenOptionsVideo());
_Screens.Add(new CScreenOptionsLyrics());
_Screens.Add(new CScreenOptionsTheme());
_Screens.Add(new CScreenNames());
_Screens.Add(new CScreenCredits());
@@ -690,6 +692,16 @@ namespace Vocaluxe.Menu
{
_Cursor.UnloadTextures();
if (CTheme.Cursor.color != string.Empty)
{
SColorF color;
color = CTheme.GetColor(CTheme.Cursor.color);
CTheme.Cursor.r = color.R;
CTheme.Cursor.g = color.G;
CTheme.Cursor.b = color.B;
CTheme.Cursor.a = color.A;
}
_Cursor = new CCursor(
CTheme.Cursor.SkinName,
new SColorF(CTheme.Cursor.r, CTheme.Cursor.g, CTheme.Cursor.b, CTheme.Cursor.a),
Vocaluxe/Menu/CLyric.cs
+64 -18
View File
@@ -444,37 +444,49 @@ namespace Vocaluxe.Menu
{
float x = _X - _width / 2; // most left position
foreach (SNote note in _Notes)
//find last active note
int last_note = -1;
for (int i = 0; i < _Notes.Count; i++)
{
if (CurrentBeat >= _Notes[i].StartBeat)
last_note = i;
}
int jump_note = -1;
int end_beat = -1;
float jumpx = 0f;
for (int note = 0; note < _Notes.Count; note++)
{
_Text.X = x;
_Text.Style = EStyle.Bold;
_Text.Text = note.Text;
_Text.Text = _Notes[note].Text;
RectangleF rect = CDraw.GetTextBounds(_Text);
if (note.Type == ENoteType.Freestyle)
if (_Notes[note].Type == ENoteType.Freestyle)
_Text.Style = EStyle.BoldItalic;
if (CurrentBeat >= note.StartBeat)
if (CurrentBeat >= _Notes[note].StartBeat)
{
if (CurrentBeat <= note.EndBeat)
bool last = note == _Notes.Count - 1;
int endbeat = _Notes[note].EndBeat;
if (note < _Notes.Count - 1)
endbeat = _Notes[note + 1].StartBeat - 1;
if (CurrentBeat <= _Notes[note].EndBeat)
{
_Text.Color = ColorProcessed;
float diff = note.EndBeat - note.StartBeat;
if (diff == 0)
_Text.Draw();
else
{
float y = _Text.Y;
_Text.Y -= _Text.Height * 0.1f;
_Text.Draw();
_Text.Y = y;
}
jump_note = note;
end_beat = endbeat;
jumpx = _Text.X;
}
else
{
// already passed
_Text.Color = Color;
if (note == last_note)
_Text.Color = ColorProcessed;
else
_Text.Color = Color;
_Text.Draw();
}
@@ -488,6 +500,40 @@ namespace Vocaluxe.Menu
x += rect.Width;
}
if (jump_note > 0)
{
if (_Notes[jump_note].Duration == 0)
return;
_Text.X = jumpx;
_Text.Text = _Notes[jump_note].Text;
_Text.Color = ColorProcessed;
_Text.Style = EStyle.Bold;
if (_Notes[jump_note].Type == ENoteType.Freestyle)
_Text.Style = EStyle.BoldItalic;
float diff = _Notes[jump_note].EndBeat - _Notes[jump_note].StartBeat;
if (diff <= 0f)
diff = 1f;
float p = (CurrentBeat - _Notes[jump_note].StartBeat) / diff;
if (p > 1f)
p = 1f;
p = 1f - p;
if (diff == 1)
_Text.Draw();
else
{
float y = _Text.Y;
_Text.Y -= _Text.Height * 0.1f * p;
_Text.Draw();
_Text.Y = y;
}
}
}
#endregion draw
Vocaluxe/Menu/CNameSelection.cs
+24 -11
View File
@@ -90,17 +90,7 @@ namespace Vocaluxe.Menu
public void Init()
{
_Tiles.Clear();
for (int i = 0; i < _NumH; i++)
{
for (int j = 0; j < _NumW; j++)
{
SRectF rect = new SRectF(Rect.X + j * (_TileW + _SpaceW), Rect.Y + i * (_TileH + _SpaceH), _TileW, _TileH, Rect.Z);
CStatic tileStatic = new CStatic(_TextureEmptyTile, ColorEmptyTile, rect);
CText tileText = new CText(rect.X + rect.W / 2, rect.Y + rect.H + _Theme.NameSpace, rect.Z, _Theme.NameHeight, rect.W, EAlignment.Center, _Theme.NameStyle, _Theme.NameFont, _Theme.NameColor, "");
_Tiles.Add(new CTile(tileStatic, tileText, -1));
}
}
PrepareTiles();
PlayerSelector = new CStatic();
PlayerSelector.Texture = _TextureTileSelected;
@@ -482,12 +472,35 @@ namespace Vocaluxe.Menu
{
_TextureEmptyTile = CTheme.GetSkinTexture(_Theme.TextureEmptyTileName);
_TextureTileSelected = CTheme.GetSkinTexture(_Theme.TextureTileSelectedName);
if (_Theme.ColorEmptyTileName != String.Empty)
ColorEmptyTile = CTheme.GetColor(_Theme.ColorEmptyTileName);
if (_Theme.NameColorName != String.Empty)
_Theme.NameColor = CTheme.GetColor(_Theme.NameColorName);
}
public void ReloadTextures()
{
UnloadTextures();
LoadTextures();
PrepareTiles();
}
private void PrepareTiles()
{
_Tiles.Clear();
for (int i = 0; i < _NumH; i++)
{
for (int j = 0; j < _NumW; j++)
{
SRectF rect = new SRectF(Rect.X + j * (_TileW + _SpaceW), Rect.Y + i * (_TileH + _SpaceH), _TileW, _TileH, Rect.Z);
CStatic tileStatic = new CStatic(_TextureEmptyTile, ColorEmptyTile, rect);
CText tileText = new CText(rect.X + rect.W / 2, rect.Y + rect.H + _Theme.NameSpace, rect.Z, _Theme.NameHeight, rect.W, EAlignment.Center, _Theme.NameStyle, _Theme.NameFont, _Theme.NameColor, "");
_Tiles.Add(new CTile(tileStatic, tileText, -1));
}
}
}
private void UpdateVisibleProfiles()
Vocaluxe/Menu/SongMenu/CSongMenuTileBoard.cs
+1
View File
@@ -663,6 +663,7 @@ namespace Vocaluxe.Menu.SongMenu
_Theme.songMenuTileBoard.TextArtist.ReloadTextures();
_Theme.songMenuTileBoard.TextTitle.ReloadTextures();
_Theme.songMenuTileBoard.TextSongLength.ReloadTextures();
}
}
}
Vocaluxe/Screens/CScreenOptions.cs
+8 -1
View File
@@ -18,6 +18,7 @@ namespace Vocaluxe.Screens
private const string ButtonOptionsSound = "ButtonOptionsSound";
private const string ButtonOptionsRecord = "ButtonOptionsRecord";
private const string ButtonOptionsVideo = "ButtonOptionsVideo";
private const string ButtonOptionsLyrics = "ButtonOptionsLyrics";
private const string ButtonOptionsTheme = "ButtonOptionsTheme";
public CScreenOptions()
@@ -31,7 +32,7 @@ namespace Vocaluxe.Screens
_ThemeName = "ScreenOptions";
_ScreenVersion = ScreenVersion;
_ThemeButtons = new string[] { ButtonOptionsGame, ButtonOptionsSound, ButtonOptionsRecord, ButtonOptionsVideo, ButtonOptionsTheme };
_ThemeButtons = new string[] { ButtonOptionsGame, ButtonOptionsSound, ButtonOptionsRecord, ButtonOptionsVideo, ButtonOptionsLyrics, ButtonOptionsTheme };
}
public override bool HandleInput(KeyEvent KeyEvent)
@@ -68,6 +69,9 @@ namespace Vocaluxe.Screens
if (Buttons[htButtons(ButtonOptionsVideo)].Selected)
CGraphics.FadeTo(EScreens.ScreenOptionsVideo);
if (Buttons[htButtons(ButtonOptionsLyrics)].Selected)
CGraphics.FadeTo(EScreens.ScreenOptionsLyrics);
if (Buttons[htButtons(ButtonOptionsTheme)].Selected)
CGraphics.FadeTo(EScreens.ScreenOptionsTheme);
@@ -95,6 +99,9 @@ namespace Vocaluxe.Screens
if (Buttons[htButtons(ButtonOptionsVideo)].Selected)
CGraphics.FadeTo(EScreens.ScreenOptionsVideo);
if (Buttons[htButtons(ButtonOptionsLyrics)].Selected)
CGraphics.FadeTo(EScreens.ScreenOptionsLyrics);
if (Buttons[htButtons(ButtonOptionsTheme)].Selected)
CGraphics.FadeTo(EScreens.ScreenOptionsTheme);
}
Vocaluxe/Screens/CScreenOptionsLyrics.cs
+124
View File
@@ -0,0 +1,124 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Windows.Forms;
using Vocaluxe.Base;
using Vocaluxe.Menu;
namespace Vocaluxe.Screens
{
class CScreenOptionsLyrics : CMenu
{
// Version number for theme files. Increment it, if you've changed something on the theme files!
const int ScreenVersion = 1;
private const string SelectSlideLyricStyle = "SelectSlideLyricStyle";
private const string SelectSlideLyricsOnTop = "SelectSlideLyricsOnTop";
private const string ButtonExit = "ButtonExit";
public CScreenOptionsLyrics()
{
Init();
}
protected override void Init()
{
base.Init();
_ThemeName = "ScreenOptionsLyrics";
_ScreenVersion = ScreenVersion;
_ThemeButtons = new string[] { ButtonExit };
_ThemeSelectSlides = new string[] { SelectSlideLyricStyle, SelectSlideLyricsOnTop };
}
public override void LoadTheme()
{
base.LoadTheme();
SelectSlides[htSelectSlides(SelectSlideLyricStyle)].SetValues<ELyricStyle>((int)CConfig.LyricStyle);
SelectSlides[htSelectSlides(SelectSlideLyricsOnTop)].SetValues<EOffOn>((int)CConfig.LyricsOnTop);
}
public override bool HandleInput(KeyEvent KeyEvent)
{
base.HandleInput(KeyEvent);
if (KeyEvent.KeyPressed)
{
}
else
{
switch (KeyEvent.Key)
{
case Keys.Escape:
case Keys.Back:
SaveConfig();
CGraphics.FadeTo(EScreens.ScreenOptions);
break;
case Keys.S:
CGraphics.FadeTo(EScreens.ScreenSong);
break;
case Keys.Enter:
if (Buttons[htButtons(ButtonExit)].Selected)
{
SaveConfig();
CGraphics.FadeTo(EScreens.ScreenOptions);
}
break;
case Keys.Left:
SaveConfig();
break;
case Keys.Right:
SaveConfig();
break;
}
}
return true;
}
public override bool HandleMouse(MouseEvent MouseEvent)
{
base.HandleMouse(MouseEvent);
if (MouseEvent.RB)
{
SaveConfig();
CGraphics.FadeTo(EScreens.ScreenOptions);
}
if (MouseEvent.LB && IsMouseOver(MouseEvent))
{
SaveConfig();
if (Buttons[htButtons(ButtonExit)].Selected)
{
CGraphics.FadeTo(EScreens.ScreenOptions);
}
}
return true;
}
public override bool UpdateGame()
{
return true;
}
public override bool Draw()
{
base.Draw();
return true;
}
private void SaveConfig()
{
CConfig.LyricsOnTop = (EOffOn)SelectSlides[htSelectSlides(SelectSlideLyricsOnTop)].Selection;
CConfig.LyricStyle = (ELyricStyle)SelectSlides[htSelectSlides(SelectSlideLyricStyle)].Selection;
CConfig.SaveConfig();
}
}
}
Vocaluxe/Screens/CScreenOptionsRecord.cs
+2 -1
View File
@@ -373,7 +373,7 @@ namespace Vocaluxe.Screens
public override void OnShowFinish()
{
base.OnShowFinish();
CBackgroundMusic.Pause();
CBackgroundMusic.Disabled = true;
}
public override bool Draw()
@@ -422,6 +422,7 @@ namespace Vocaluxe.Screens
CSound.RecordStop();
_DelayTest = null;
CBackgroundMusic.Disabled = false;
}
private void OnDeviceEvent()
Vocaluxe/Vocaluxe.csproj
+1
View File
@@ -198,6 +198,7 @@
<Compile Include="Screens\CScreenNames.cs" />
<Compile Include="Screens\CScreenOptions.cs" />
<Compile Include="Screens\CScreenOptionsGame.cs" />
<Compile Include="Screens\CScreenOptionsLyrics.cs" />
<Compile Include="Screens\CScreenProfiles.cs" />
<Compile Include="Screens\CScreenScore.cs" />
<Compile Include="Screens\CScreenSing.cs" />