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

Instrumental & Vocals Icons (#833)

Browse Source 
* Add Instrumental & Vocals Icon

* Add Instrumental & Vocals Icon

* Add Instrumental & Vocals Icon

* Add Instrumental & Vocals Icon

* Add Instrumental & Vocals Icon

* Add Instrumental & Vocals Icon

* Add Instrumental & Vocals Icon

* Add Instrumental & Vocals Icon

* Add Instrumental & Vocals Icon

* Add Instrumental & Vocals Icon

* Add Instrumental & Vocals Icons

* Screen Version 14

* Screen Version 14

* Add Instrumental & Vocals Icon

* Add Instrumental & Vocals Icon

* Add Instrumental & Vocals Icon

* Add Instrumental & Vocals Icon

* Add Instrumental & Vocals Icon
This commit is contained in:
Edi316 authored and GitHub committed 2026-01-26 14:53:59 +01:00
1 parent 4c984d9f7c
commit 12d06d8111
14 files changed
+105 -16
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Output/Themes/Changelog/Changelog_ScreenSong.txt
+5
View File
@@ -1,5 +1,10 @@
ScreenSong
++++++++++
Version 14:
Add InstrumentalIcon
Add VocalsIcon
++++++++++
Version 13:
Output/Themes/Vocaluxe 2024/01_Standard.xml
+2
View File
@@ -362,6 +362,8 @@
<VideoIcon>VideoIcon.png</VideoIcon>
<MedleyCalcIcon>MedleyCalcIcon.png</MedleyCalcIcon>
<MedleyTagIcon>MedleyTagIcon.png</MedleyTagIcon>
<InstrumentalIcon>InstrumentalIcon.png</InstrumentalIcon>
<VocalsIcon>VocalsIcon.png</VocalsIcon>
<PlayerSelector>PlayerSelector.png</PlayerSelector>
<PreviousIcon>PreviousIcon.png</PreviousIcon>
<NextIcon>NextIcon.png</NextIcon>
Output/Themes/Vocaluxe 2024/02.xml
+2
View File
@@ -362,6 +362,8 @@
<VideoIcon>VideoIcon.png</VideoIcon>
<MedleyCalcIcon>MedleyCalcIcon.png</MedleyCalcIcon>
<MedleyTagIcon>MedleyTagIcon.png</MedleyTagIcon>
<InstrumentalIcon>InstrumentalIcon.png</InstrumentalIcon>
<VocalsIcon>VocalsIcon.png</VocalsIcon>
<PlayerSelector>PlayerSelector.png</PlayerSelector>
<PreviousIcon>PreviousIcon.png</PreviousIcon>
<NextIcon>NextIcon.png</NextIcon>
Output/Themes/Vocaluxe 2024/03.xml
+2
View File
@@ -362,6 +362,8 @@
<VideoIcon>VideoIcon.png</VideoIcon>
<MedleyCalcIcon>MedleyCalcIcon.png</MedleyCalcIcon>
<MedleyTagIcon>MedleyTagIcon.png</MedleyTagIcon>
<InstrumentalIcon>InstrumentalIcon.png</InstrumentalIcon>
<VocalsIcon>VocalsIcon.png</VocalsIcon>
<PlayerSelector>PlayerSelector.png</PlayerSelector>
<PreviousIcon>PreviousIcon.png</PreviousIcon>
<NextIcon>NextIcon.png</NextIcon>
Output/Themes/Vocaluxe 2024/04.xml
+2
View File
@@ -362,6 +362,8 @@
<VideoIcon>VideoIcon.png</VideoIcon>
<MedleyCalcIcon>MedleyCalcIcon.png</MedleyCalcIcon>
<MedleyTagIcon>MedleyTagIcon.png</MedleyTagIcon>
<InstrumentalIcon>InstrumentalIcon.png</InstrumentalIcon>
<VocalsIcon>VocalsIcon.png</VocalsIcon>
<PlayerSelector>PlayerSelector.png</PlayerSelector>
<PreviousIcon>PreviousIcon.png</PreviousIcon>
<NextIcon>NextIcon.png</NextIcon>
Output/Themes/Vocaluxe 2024/05.xml
+2
View File
@@ -362,6 +362,8 @@
<VideoIcon>VideoIcon.png</VideoIcon>
<MedleyCalcIcon>MedleyCalcIcon.png</MedleyCalcIcon>
<MedleyTagIcon>MedleyTagIcon.png</MedleyTagIcon>
<InstrumentalIcon>InstrumentalIcon.png</InstrumentalIcon>
<VocalsIcon>VocalsIcon.png</VocalsIcon>
<PlayerSelector>PlayerSelector.png</PlayerSelector>
<PreviousIcon>PreviousIcon.png</PreviousIcon>
<NextIcon>NextIcon.png</NextIcon>
Output/Themes/Vocaluxe 2024/06.xml
+2
View File
@@ -362,6 +362,8 @@
<VideoIcon>VideoIcon.png</VideoIcon>
<MedleyCalcIcon>MedleyCalcIcon.png</MedleyCalcIcon>
<MedleyTagIcon>MedleyTagIcon.png</MedleyTagIcon>
<InstrumentalIcon>InstrumentalIcon.png</InstrumentalIcon>
<VocalsIcon>VocalsIcon.png</VocalsIcon>
<PlayerSelector>PlayerSelector.png</PlayerSelector>
<PreviousIcon>PreviousIcon.png</PreviousIcon>
<NextIcon>NextIcon.png</NextIcon>
Output/Themes/Vocaluxe 2024/InstrumentalIcon.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.1 KiB

Output/Themes/Vocaluxe 2024/Screens/ScreenSong.xml
+58 -12
View File
@@ -2,7 +2,7 @@
<Screen xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Informations>
<ScreenName>ScreenSong</ScreenName>
<ScreenVersion>13</ScreenVersion>
<ScreenVersion>14</ScreenVersion>
</Informations>
<Backgrounds>
<Background Name="Background1">
@@ -906,6 +906,8 @@
<VideoIcon>VideoIcon</VideoIcon>
<MedleyCalcIcon>MedleyCalcIcon</MedleyCalcIcon>
<MedleyTagIcon>MedleyTagIcon</MedleyTagIcon>
<InstrumentalIcon>InstumentalIcon</InstrumentalIcon>
<VocalsIcon>VocalsIcon</VocalsIcon>
<Color>
<R>1</R>
<G>1</G>
@@ -1015,7 +1017,7 @@
<Skin>DuetIcon</Skin>
<Color Name="StaticColor" />
<Rect>
<X>240</X>
<X>170</X>
<Y>795</Y>
<W>60</W>
<H>60</H>
@@ -1026,7 +1028,7 @@
<Skin>RapIcon</Skin>
<Color Name="StaticColor" />
<Rect>
<X>360</X>
<X>260</X>
<Y>795</Y>
<W>60</W>
<H>60</H>
@@ -1037,7 +1039,7 @@
<Skin>VideoIcon</Skin>
<Color Name="StaticColor" />
<Rect>
<X>120</X>
<X>80</X>
<Y>795</Y>
<W>60</W>
<H>60</H>
@@ -1048,7 +1050,7 @@
<Skin>MedleyCalcIcon</Skin>
<Color Name="StaticColor" />
<Rect>
<X>480</X>
<X>350</X>
<Y>795</Y>
<W>60</W>
<H>60</H>
@@ -1059,13 +1061,35 @@
<Skin>MedleyTagIcon</Skin>
<Color Name="StaticColor" />
<Rect>
<X>480</X>
<X>350</X>
<Y>795</Y>
<W>60</W>
<H>60</H>
<Z>-1</Z>
</Rect>
</StaticMedleyTagIcon>
</StaticMedleyTagIcon>
<StaticInstrumentalIcon Name="StaticInstrumentalIcon">
<Skin>InstrumentalIcon</Skin>
<Color Name="StaticColor" />
<Rect>
<X>440</X>
<Y>795</Y>
<W>60</W>
<H>60</H>
<Z>-1</Z>
</Rect>
</StaticInstrumentalIcon>
<StaticVocalsIcon Name="StaticVocalsIcon">
<Skin>VocalsIcon</Skin>
<Color Name="StaticColor" />
<Rect>
<X>530</X>
<Y>795</Y>
<W>60</W>
<H>60</H>
<Z>-1</Z>
</Rect>
</StaticVocalsIcon>
</SongMenuTileBoard>
<SongMenuList>
<ListLength>15</ListLength>
@@ -1167,7 +1191,7 @@
<Skin>DuetIcon</Skin>
<Color Name="StaticColor" />
<Rect>
<X>240</X>
<X>170</X>
<Y>795</Y>
<W>60</W>
<H>60</H>
@@ -1178,7 +1202,7 @@
<Skin>RapIcon</Skin>
<Color Name="StaticColor" />
<Rect>
<X>360</X>
<X>260</X>
<Y>795</Y>
<W>60</W>
<H>60</H>
@@ -1189,7 +1213,7 @@
<Skin>VideoIcon</Skin>
<Color Name="TextColor" />
<Rect>
<X>120</X>
<X>80</X>
<Y>795</Y>
<W>60</W>
<H>60</H>
@@ -1200,7 +1224,7 @@
<Skin>MedleyCalcIcon</Skin>
<Color Name="TextColor" />
<Rect>
<X>480</X>
<X>350</X>
<Y>795</Y>
<W>60</W>
<H>60</H>
@@ -1211,13 +1235,35 @@
<Skin>MedleyTagIcon</Skin>
<Color Name="StaticColor" />
<Rect>
<X>480</X>
<X>350</X>
<Y>795</Y>
<W>60</W>
<H>60</H>
<Z>-1</Z>
</Rect>
</StaticMedleyTagIcon>
<StaticInstrumentalIcon Name="StaticInstrumentalIcon">
<Skin>InstrumentalIcon</Skin>
<Color Name="StaticColor" />
<Rect>
<X>440</X>
<Y>795</Y>
<W>60</W>
<H>60</H>
<Z>-1</Z>
</Rect>
</StaticInstrumentalIcon>
<StaticVocalsIcon Name="StaticVocalsIcon">
<Skin>VocalsIcon</Skin>
<Color Name="StaticColor" />
<Rect>
<X>530</X>
<Y>795</Y>
<W>60</W>
<H>60</H>
<Z>-1</Z>
</Rect>
</StaticVocalsIcon>
</SongMenuList>
</SongMenu>
</SongMenus>
Output/Themes/Vocaluxe 2024/VocalsIcon.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.5 KiB

Vocaluxe/Screens/CScreenSong.cs
+1 -1
View File
@@ -43,7 +43,7 @@ namespace Vocaluxe.Screens
// Version number for theme files. Increment it, if you've changed something on the theme files!
protected override int _ScreenVersion
{
get { return 13; }
get { return 14; }
}
private const string _TextCategory = "TextCategory";
VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs
+7 -1
View File
@@ -1,4 +1,4 @@
#region license
#region license
// This file is part of Vocaluxe.
//
// Vocaluxe is free software: you can redistribute it and/or modify
@@ -34,6 +34,8 @@ namespace VocaluxeLib.Menu.SongMenu
public string VideoIcon;
public string MedleyCalcIcon;
public string MedleyTagIcon;
public string InstrumentalIcon;
public string VocalsIcon;
public SThemeColor Color;
//public SThemeSongMenuBook songMenuBook;
@@ -70,6 +72,8 @@ namespace VocaluxeLib.Menu.SongMenu
public SThemeStatic StaticTextBG;
public SThemeStatic StaticDuetIcon;
public SThemeStatic StaticRapIcon;
public SThemeStatic StaticInstrumentalIcon;
public SThemeStatic StaticVocalsIcon;
public SThemeStatic StaticVideoIcon;
public SThemeStatic StaticMedleyCalcIcon;
public SThemeStatic StaticMedleyTagIcon;
@@ -120,6 +124,8 @@ namespace VocaluxeLib.Menu.SongMenu
public SThemeStatic StaticTextBG;
public SThemeStatic StaticDuetIcon;
public SThemeStatic StaticRapIcon;
public SThemeStatic StaticInstrumentalIcon;
public SThemeStatic StaticVocalsIcon;
public SThemeStatic StaticVideoIcon;
public SThemeStatic StaticMedleyCalcIcon;
public SThemeStatic StaticMedleyTagIcon;
VocaluxeLib/Menu/SongMenu/CSongMenuList.cs
+11 -1
View File
@@ -37,6 +37,8 @@ namespace VocaluxeLib.Menu.SongMenu
private readonly CStatic _VideoIcon;
private readonly CStatic _MedleyCalcIcon;
private readonly CStatic _MedleyTagIcon;
private readonly CStatic _InstrumentalIcon;
private readonly CStatic _VocalsIcon;
private CTextureRef _CoverBigBGTexture;
private CTextureRef _CoverBGTexture;
@@ -128,7 +130,9 @@ namespace VocaluxeLib.Menu.SongMenu
_VideoIcon = new CStatic(_Theme.SongMenuList.StaticVideoIcon, _PartyModeID);
_MedleyCalcIcon = new CStatic(_Theme.SongMenuList.StaticMedleyCalcIcon, _PartyModeID);
_MedleyTagIcon = new CStatic(_Theme.SongMenuList.StaticMedleyTagIcon, _PartyModeID);
_SubElements.AddRange(new IMenuElement[] {_Artist, _Title, _SongLength, _SongYear, _DuetIcon, _RapIcon, _VideoIcon, _MedleyCalcIcon, _MedleyTagIcon});
_InstrumentalIcon = new CStatic(_Theme.SongMenuList.StaticInstrumentalIcon, _PartyModeID);
_VocalsIcon = new CStatic(_Theme.SongMenuList.StaticVocalsIcon, _PartyModeID);
_SubElements.AddRange(new IMenuElement[] {_Artist, _Title, _SongLength, _SongYear, _DuetIcon, _RapIcon, _VideoIcon, _MedleyCalcIcon, _MedleyTagIcon, _InstrumentalIcon, _VocalsIcon});
}
private void _ReadSubTheme()
@@ -142,6 +146,8 @@ namespace VocaluxeLib.Menu.SongMenu
_Theme.SongMenuList.StaticRapIcon = (SThemeStatic)_RapIcon.GetTheme();
_Theme.SongMenuList.StaticMedleyCalcIcon = (SThemeStatic)_MedleyCalcIcon.GetTheme();
_Theme.SongMenuList.StaticMedleyTagIcon = (SThemeStatic)_MedleyTagIcon.GetTheme();
_Theme.SongMenuList.StaticInstrumentalIcon = (SThemeStatic)_InstrumentalIcon.GetTheme();
_Theme.SongMenuList.StaticVocalsIcon = (SThemeStatic)_VocalsIcon.GetTheme();
_Theme.SongMenuList.StaticTextBG = (SThemeStatic)_TextBG.GetTheme();
_Theme.SongMenuList.StaticVideoIcon = (SThemeStatic)_VideoIcon.GetTheme();
}
@@ -229,6 +235,8 @@ namespace VocaluxeLib.Menu.SongMenu
_VideoIcon.Visible = false;
_MedleyCalcIcon.Visible = false;
_MedleyTagIcon.Visible = false;
_InstrumentalIcon.Visible = false;
_VocalsIcon.Visible = false;
_Length = -1f;
//Check if nothing is selected (for preview)
@@ -259,6 +267,8 @@ namespace VocaluxeLib.Menu.SongMenu
_VideoIcon.Visible = song.VideoFileName != "";
_MedleyCalcIcon.Visible = song.Medley.Source == EDataSource.Calculated;
_MedleyTagIcon.Visible = song.Medley.Source == EDataSource.Tag;
_InstrumentalIcon.Visible = song.HasInstrumental();
_VocalsIcon.Visible = song.HasVocals();
_UpdateLength(song);
}
VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs
+11 -1
View File
@@ -36,6 +36,8 @@ namespace VocaluxeLib.Menu.SongMenu
private CStatic _VideoIcon;
private CStatic _MedleyCalcIcon;
private CStatic _MedleyTagIcon;
private CStatic _InstrumentalIcon;
private CStatic _VocalsIcon;
private CTextureRef _CoverBigBGTexture;
private CTextureRef _CoverBGTexture;
@@ -123,7 +125,9 @@ namespace VocaluxeLib.Menu.SongMenu
_VideoIcon = new CStatic(_Theme.SongMenuTileBoard.StaticVideoIcon, _PartyModeID);
_MedleyCalcIcon = new CStatic(_Theme.SongMenuTileBoard.StaticMedleyCalcIcon, _PartyModeID);
_MedleyTagIcon = new CStatic(_Theme.SongMenuTileBoard.StaticMedleyTagIcon, _PartyModeID);
_SubElements.AddRange(new IMenuElement[] {_Artist, _Title, _SongLength, _SongYear, _DuetIcon, _RapIcon, _VideoIcon, _MedleyCalcIcon, _MedleyTagIcon});
_InstrumentalIcon = new CStatic(_Theme.SongMenuTileBoard.StaticInstrumentalIcon, _PartyModeID);
_VocalsIcon = new CStatic(_Theme.SongMenuTileBoard.StaticVocalsIcon, _PartyModeID);
_SubElements.AddRange(new IMenuElement[] {_Artist, _Title, _SongLength, _SongYear, _DuetIcon, _RapIcon, _VideoIcon, _MedleyCalcIcon, _MedleyTagIcon, _InstrumentalIcon, _VocalsIcon});
}
private void _UpdateTileSelection()
@@ -148,6 +152,8 @@ namespace VocaluxeLib.Menu.SongMenu
_Theme.SongMenuTileBoard.StaticMedleyTagIcon = (SThemeStatic)_MedleyTagIcon.GetTheme();
_Theme.SongMenuTileBoard.StaticTextBG = (SThemeStatic)_TextBG.GetTheme();
_Theme.SongMenuTileBoard.StaticVideoIcon = (SThemeStatic)_VideoIcon.GetTheme();
_Theme.SongMenuTileBoard.StaticInstrumentalIcon = (SThemeStatic)_InstrumentalIcon.GetTheme();
_Theme.SongMenuTileBoard.StaticVocalsIcon = (SThemeStatic)_VocalsIcon.GetTheme();
}
public override object GetTheme()
@@ -220,6 +226,8 @@ namespace VocaluxeLib.Menu.SongMenu
_VideoIcon.Visible = false;
_MedleyCalcIcon.Visible = false;
_MedleyTagIcon.Visible = false;
_InstrumentalIcon.Visible = false;
_VocalsIcon.Visible = false;
_Length = -1f;
//Check if nothing is selected (for preview)
@@ -250,6 +258,8 @@ namespace VocaluxeLib.Menu.SongMenu
_VideoIcon.Visible = song.VideoFileName != "";
_MedleyCalcIcon.Visible = song.Medley.Source == EDataSource.Calculated;
_MedleyTagIcon.Visible = song.Medley.Source == EDataSource.Tag;
_InstrumentalIcon.Visible = song.HasInstrumental();
_VocalsIcon.Visible = song.HasVocals();
_UpdateLength(song);
}