Added start-button to song-screen in party-mode.
This commit is contained in:
1 parent
5292c2f47b
commit
bcf5fb17bd
2 files changed
+75
-1
No files matched your search
@@ -963,6 +963,63 @@
|
|||||||
<!-- <Space>: Reflection Space of selected button-->
|
<!-- <Space>: Reflection Space of selected button-->
|
||||||
<!-- <Height>: Reflection Height of selected button-->
|
<!-- <Height>: Reflection Height of selected button-->
|
||||||
</ButtonJoker6>
|
</ButtonJoker6>
|
||||||
|
<ButtonStart>
|
||||||
|
<!--<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>
|
||||||
|
<Y>500</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 horizontal: Left, Center, Right-->
|
||||||
|
<Align>Center</Align>
|
||||||
|
<!--<HAlign>: Text align vertical (on downsizing): Top, Center, Bottom-->
|
||||||
|
<HAlign>Center</HAlign>
|
||||||
|
<!--<Style>: Text style: Normal, Italic, Bold, BoldItalic-->
|
||||||
|
<Style>Bold</Style>
|
||||||
|
<!--<Font>: Text font name-->
|
||||||
|
<Font>Outline</Font>
|
||||||
|
<!--<Text>: Nothing or translation tag-->
|
||||||
|
<Text>TR_BUTTON_START</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>
|
||||||
|
</ButtonStart>
|
||||||
<SelectSlideOptionsMode>
|
<SelectSlideOptionsMode>
|
||||||
<!--<Skin>: Texture name-->
|
<!--<Skin>: Texture name-->
|
||||||
<Skin>Button</Skin>
|
<Skin>Button</Skin>
|
||||||
|
|||||||
@@ -42,6 +42,7 @@ namespace Vocaluxe.Screens
|
|||||||
private const string ButtonOptionsSingAll = "ButtonOptionsSingAll";
|
private const string ButtonOptionsSingAll = "ButtonOptionsSingAll";
|
||||||
private const string ButtonOptionsSingAllVisible = "ButtonOptionsSingAllVisible";
|
private const string ButtonOptionsSingAllVisible = "ButtonOptionsSingAllVisible";
|
||||||
private const string ButtonOptionsOpenPlaylist = "ButtonOptionsOpenPlaylist";
|
private const string ButtonOptionsOpenPlaylist = "ButtonOptionsOpenPlaylist";
|
||||||
|
private const string ButtonStart = "ButtonStart";
|
||||||
|
|
||||||
private const string SelectSlideOptionsMode = "SelectSlideOptionsMode";
|
private const string SelectSlideOptionsMode = "SelectSlideOptionsMode";
|
||||||
private const string SelectSlideOptionsPlaylistAdd = "SelectSlideOptionsPlaylistAdd";
|
private const string SelectSlideOptionsPlaylistAdd = "SelectSlideOptionsPlaylistAdd";
|
||||||
@@ -90,6 +91,7 @@ namespace Vocaluxe.Screens
|
|||||||
list.Add(ButtonOptionsSingAllVisible);
|
list.Add(ButtonOptionsSingAllVisible);
|
||||||
list.Add(ButtonOptionsOpenPlaylist);
|
list.Add(ButtonOptionsOpenPlaylist);
|
||||||
list.Add(ButtonOpenOptions);
|
list.Add(ButtonOpenOptions);
|
||||||
|
list.Add(ButtonStart);
|
||||||
|
|
||||||
_ThemeName = "ScreenSong";
|
_ThemeName = "ScreenSong";
|
||||||
_ScreenVersion = ScreenVersion;
|
_ScreenVersion = ScreenVersion;
|
||||||
@@ -192,6 +194,10 @@ namespace Vocaluxe.Screens
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (Buttons[htButtons(ButtonStart)].Selected)
|
||||||
|
{
|
||||||
|
HandlePartySongSelection(SongMenus[htSongMenus(SongMenu)].GetSelectedSong());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (CSongs.NumVisibleSongs > 0)
|
if (CSongs.NumVisibleSongs > 0)
|
||||||
{
|
{
|
||||||
@@ -200,6 +206,7 @@ namespace Vocaluxe.Screens
|
|||||||
if (!_sso.Selection.PartyMode)
|
if (!_sso.Selection.PartyMode)
|
||||||
ToggleSongOptions(ESongOptionsView.Song);
|
ToggleSongOptions(ESongOptionsView.Song);
|
||||||
else
|
else
|
||||||
|
//Is this still needed?
|
||||||
HandlePartySongSelection(SongMenus[htSongMenus(SongMenu)].GetSelectedSong());
|
HandlePartySongSelection(SongMenus[htSongMenus(SongMenu)].GetSelectedSong());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -532,6 +539,12 @@ namespace Vocaluxe.Screens
|
|||||||
|
|
||||||
if (_sso.Selection.RandomOnly && _sso.Selection.NumJokers != null)
|
if (_sso.Selection.RandomOnly && _sso.Selection.NumJokers != null)
|
||||||
{
|
{
|
||||||
|
if (Buttons[htButtons(ButtonOptionsOpenPlaylist)].Selected)
|
||||||
|
{
|
||||||
|
HandlePartySongSelection(SongMenus[htSongMenus(SongMenu)].GetSelectedSong());
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
for (int i = 0; i < ButtonsJoker.Count; i++)
|
for (int i = 0; i < ButtonsJoker.Count; i++)
|
||||||
{
|
{
|
||||||
if (i < _sso.Selection.NumJokers.Length)
|
if (i < _sso.Selection.NumJokers.Length)
|
||||||
@@ -553,6 +566,7 @@ namespace Vocaluxe.Screens
|
|||||||
if (!_sso.Selection.PartyMode)
|
if (!_sso.Selection.PartyMode)
|
||||||
ToggleSongOptions(ESongOptionsView.Song);
|
ToggleSongOptions(ESongOptionsView.Song);
|
||||||
else
|
else
|
||||||
|
//Is this still needed?
|
||||||
HandlePartySongSelection(SongMenus[htSongMenus(SongMenu)].GetSelectedSong());
|
HandlePartySongSelection(SongMenus[htSongMenus(SongMenu)].GetSelectedSong());
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -660,6 +674,7 @@ namespace Vocaluxe.Screens
|
|||||||
|
|
||||||
if (_sso.Selection.RandomOnly && _sso.Selection.NumJokers != null)
|
if (_sso.Selection.RandomOnly && _sso.Selection.NumJokers != null)
|
||||||
{
|
{
|
||||||
|
Buttons[htButtons(ButtonStart)].Visible = true;
|
||||||
SongMenus[htSongMenus(SongMenu)].SetSmallView(true);
|
SongMenus[htSongMenus(SongMenu)].SetSmallView(true);
|
||||||
for (int i = 0; i < ButtonsJoker.Count; i++)
|
for (int i = 0; i < ButtonsJoker.Count; i++)
|
||||||
{
|
{
|
||||||
@@ -675,7 +690,9 @@ namespace Vocaluxe.Screens
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{ if(SongMenus[htSongMenus(SongMenu)].IsSmallView())
|
{
|
||||||
|
Buttons[htButtons(ButtonStart)].Visible = true;
|
||||||
|
if(SongMenus[htSongMenus(SongMenu)].IsSmallView())
|
||||||
SongMenus[htSongMenus(SongMenu)].SetSmallView(false);
|
SongMenus[htSongMenus(SongMenu)].SetSmallView(false);
|
||||||
for (int i = 0; i < ButtonsJoker.Count; i++)
|
for (int i = 0; i < ButtonsJoker.Count; i++)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in new issue
Block a user