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

Make lyric styles translatable

Browse Source
This commit is contained in:
Jiiniasu committed 2016-03-26 20:16:22 +01:00
1 parent 96a196aa07
commit 1826959cb9
4 files changed
+16 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Output/Languages/English.xml
+4
View File
@@ -80,6 +80,10 @@
<string name="TR_CONFIG_FADEPLAYERINFO_ALL">All</string> <string name="TR_CONFIG_FADEPLAYERINFO_ALL">All</string>
<string name="TR_CONFIG_FADEPLAYERINFO_INFO">Only names and avatars</string> <string name="TR_CONFIG_FADEPLAYERINFO_INFO">Only names and avatars</string>
<string name="TR_CONFIG_FADEPLAYERINFO_OFF">Nothing</string> <string name="TR_CONFIG_FADEPLAYERINFO_OFF">Nothing</string>
<string name="TR_CONFIG_LYRICSTYLE_FILL">Fill</string>
<string name="TR_CONFIG_LYRICSTYLE_JUMP">Jump</string>
<string name="TR_CONFIG_LYRICSTYLE_SLIDE">Slide</string>
<string name="TR_CONFIG_LYRICSTYLE_ZOOM">Zoom</string>
<string name="TR_CONFIG_LYRICSPOSITION_BOTTOM">Bottom</string> <string name="TR_CONFIG_LYRICSPOSITION_BOTTOM">Bottom</string>
<string name="TR_CONFIG_LYRICSPOSITION_TOP">Top</string> <string name="TR_CONFIG_LYRICSPOSITION_TOP">Top</string>
<string name="TR_CONFIG_LYRICSPOSITION_BOTH">Top and bottom</string> <string name="TR_CONFIG_LYRICSPOSITION_BOTH">Top and bottom</string>
Vocaluxe/Base/CConfig.cs
+1 -1
View File
@@ -104,7 +104,7 @@ namespace Vocaluxe.Base
[DefaultValue(EPlayerInfo.TR_CONFIG_PLAYERINFO_BOTH)] public EPlayerInfo PlayerInfo; [DefaultValue(EPlayerInfo.TR_CONFIG_PLAYERINFO_BOTH)] public EPlayerInfo PlayerInfo;
[DefaultValue(EFadePlayerInfo.TR_CONFIG_FADEPLAYERINFO_OFF)] public EFadePlayerInfo FadePlayerInfo; [DefaultValue(EFadePlayerInfo.TR_CONFIG_FADEPLAYERINFO_OFF)] public EFadePlayerInfo FadePlayerInfo;
[DefaultValue(ECoverLoading.TR_CONFIG_COVERLOADING_DYNAMIC)] public ECoverLoading CoverLoading; [DefaultValue(ECoverLoading.TR_CONFIG_COVERLOADING_DYNAMIC)] public ECoverLoading CoverLoading;
[DefaultValue(ELyricStyle.Slide)] public ELyricStyle LyricStyle; [DefaultValue(ELyricStyle.TR_CONFIG_LYRICSTYLE_SLIDE)] public ELyricStyle LyricStyle;
} }
public struct SConfigSound public struct SConfigSound
VocaluxeLib/Enums.cs
+4 -4
View File
@@ -321,10 +321,10 @@ namespace VocaluxeLib
public enum ELyricStyle public enum ELyricStyle
{ {
Fill, TR_CONFIG_LYRICSTYLE_FILL,
Jump, TR_CONFIG_LYRICSTYLE_JUMP,
Slide, TR_CONFIG_LYRICSTYLE_SLIDE,
Zoom TR_CONFIG_LYRICSTYLE_ZOOM
} }
#endregion Config #endregion Config
VocaluxeLib/Menu/CLyric.cs
+7 -7
View File
@@ -88,7 +88,7 @@ namespace VocaluxeLib.Menu
_Line = new CSongLine(); _Line = new CSongLine();
_Text = new CText(_PartyModeID); _Text = new CText(_PartyModeID);
LyricStyle = ELyricStyle.Fill; LyricStyle = ELyricStyle.TR_CONFIG_LYRICSTYLE_FILL;
} }
public CLyric(SThemeLyrics theme, int partyModeID) public CLyric(SThemeLyrics theme, int partyModeID)
@@ -100,7 +100,7 @@ namespace VocaluxeLib.Menu
_Text = new CText(_PartyModeID); _Text = new CText(_PartyModeID);
_Width = 1f; _Width = 1f;
LyricStyle = ELyricStyle.Fill; LyricStyle = ELyricStyle.TR_CONFIG_LYRICSTYLE_FILL;
ThemeLoaded = true; ThemeLoaded = true;
} }
@@ -185,14 +185,14 @@ namespace VocaluxeLib.Menu
{ {
switch (LyricStyle) switch (LyricStyle)
{ {
case ELyricStyle.Fill: case ELyricStyle.TR_CONFIG_LYRICSTYLE_FILL:
_DrawFill(); _DrawFill();
break; break;
case ELyricStyle.Slide: case ELyricStyle.TR_CONFIG_LYRICSTYLE_SLIDE:
_DrawSlide(); _DrawSlide();
break; break;
case ELyricStyle.Zoom: case ELyricStyle.TR_CONFIG_LYRICSTYLE_ZOOM:
case ELyricStyle.Jump: case ELyricStyle.TR_CONFIG_LYRICSTYLE_JUMP:
_DrawZoomOrJump(); _DrawZoomOrJump();
break; break;
default: default:
@@ -368,7 +368,7 @@ namespace VocaluxeLib.Menu
return; return;
_SetText(highlightNote); _SetText(highlightNote);
_Text.X = hX; _Text.X = hX;
if (LyricStyle == ELyricStyle.Jump) if (LyricStyle == ELyricStyle.TR_CONFIG_LYRICSTYLE_JUMP)
_DrawJumpingNode(highlightNote); _DrawJumpingNode(highlightNote);
else else
_DrawZoomedNote(highlightNote, hEndBeat); _DrawZoomedNote(highlightNote, hEndBeat);