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

Add small text line with key shortcuts to Song Screen, allow some key shortcuts while search bar is active

Browse Source 
Add small text line with key shortcuts to Song Screen, allow some key shortcuts while search bar is active
This commit is contained in:
Stefan authored and GitHub committed 2020-01-12 15:07:04 +01:00
2 parents 13ad614bb1 a60247cc42
commit 1ea867712b
5 files changed
+90 -20
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Output/Languages/English.xml
+3
View File
@@ -152,6 +152,9 @@
<string name="TR_SCREENSONG_NUMSONGS">(%v songs)</string>
<string name="TR_SCREENSONG_NUMSONG">(%v song)</string>
<string name="TR_SCREENSONG_ARTIST_TITLE">%a - %t</string>
<string name="TR_SCREENSONG_HELPMESSAGE">A-Z = Jump to the letter • F3 = Search • CTRL+R = Random selection • CTRL+S = Start medley • CTRL+A = Start all random • CTRL+V = Start visible random • Space = Open song options • ESC = Back to main menu</string>
<string name="TR_SCREENSONG_HELPMESSAGESEARCH">A-Z = Search artist and title, prefixes for the search → a: = artist • t: = title • c: = creator • e: = edition • g: = genre • y: = year (e.g. 1999 or 1980-1989) • l: = language • al: = album • fi: = file name • fo: = folder name</string>
<string name="TR_SCREENSONG_HELPMESSAGEPARTY">1-6 = Press your team number to use a random song joker</string>
<string name="TR_SCREENSING_PAUSE">Pause</string>
<string name="TR_SCREENSING_BUTTON_CANCEL">Stop singing</string>
<string name="TR_SCREENSING_BUTTON_CONTINUE">Continue</string>
Output/Languages/German.xml
+3
View File
@@ -147,6 +147,9 @@
<string name="TR_SCREENSONG_NUMSONGS">(%v Lieder)</string>
<string name="TR_SCREENSONG_NUMSONG">(%v Lied)</string>
<string name="TR_SCREENSONG_ARTIST_TITLE">%a -%t</string>
<string name="TR_SCREENSONG_HELPMESSAGE">A-Z = Zum Buchstaben springen • F3 = Suchen • STRG+R = Zufällige Auswahl • STRG+S = Starte Medley • STRG+A = Alle zufällig starten • STRG+V = Sichtbare zufällig starten • Leertaste = Lied-Optionen öffnen • ESC = Zurück zum Hauptmenü</string>
<string name="TR_SCREENSONG_HELPMESSAGESEARCH">A-Z = Interpreten und Titel durchsuchen, Präfixe für die Suche → a: = Interpret • t: = Titel • c: = Ersteller • e: = Edition • g: = Genre • y: = Jahr (z.B. 1999 oder 1980-1989) • l: = Sprache • al: = Album • fi: = Dateiname • fo: = Ordnername</string>
<string name="TR_SCREENSONG_HELPMESSAGEPARTY">1-6 = Drücke die Teamnummer um einen Zufallssong Joker zu verwenden</string>
<string name="TR_SCREENSING_PAUSE">Pause</string>
<string name="TR_SCREENSING_BUTTON_CANCEL">Lied beenden</string>
<string name="TR_SCREENSING_BUTTON_CONTINUE">Fortfahren</string>
Output/Themes/Changelog/Changelog_ScreenSong.txt
+10 -1
View File
@@ -1,5 +1,14 @@
ScreenSong
++++++++++
Version 7:
Add:
<TextHelpBar>
<TextHelpBarSearch>
<TextHelpBarParty>
Shows key shortcut and search usage as small text line at the bottom of the screen.
++++++++++
Version 6:
@@ -43,4 +52,4 @@ to SongMenu
Add:
<StaticMedleyCalcIcon> and <StaticMedleyTagIcon>
to SongMenu.SongMenuTileBoard
++++++++++
++++++++++
Output/Themes/Genius/Screens/ScreenSong.xml
+43 -1
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>6</ScreenVersion>
<ScreenVersion>7</ScreenVersion>
</Informations>
<Backgrounds>
<Background Name="Background1">
@@ -238,6 +238,48 @@
<Font>Outline</Font>
<Text>TR_SCREENSONG_SONGOPTIONS</Text>
</Text>
<Text Name="TextHelpBar">
<X>40</X>
<Y>700</Y>
<Z>0</Z>
<H>16</H>
<MaxW>1200</MaxW>
<Color Name="TextColor" />
<SelColor Name="TextSelColor" />
<Align>Left</Align>
<ResizeAlign>Bottom</ResizeAlign>
<Style>Normal</Style>
<Font>Outline</Font>
<Text>TR_SCREENSONG_HELPMESSAGE</Text>
</Text>
<Text Name="TextHelpBarSearch">
<X>40</X>
<Y>700</Y>
<Z>0</Z>
<H>16</H>
<MaxW>1200</MaxW>
<Color Name="TextColor" />
<SelColor Name="TextSelColor" />
<Align>Left</Align>
<ResizeAlign>Bottom</ResizeAlign>
<Style>Normal</Style>
<Font>Outline</Font>
<Text>TR_SCREENSONG_HELPMESSAGESEARCH</Text>
</Text>
<Text Name="TextHelpBarParty">
<X>40</X>
<Y>700</Y>
<Z>0</Z>
<H>16</H>
<MaxW>1200</MaxW>
<Color Name="TextColor" />
<SelColor Name="TextSelColor" />
<Align>Left</Align>
<ResizeAlign>Bottom</ResizeAlign>
<Style>Normal</Style>
<Font>Outline</Font>
<Text>TR_SCREENSONG_HELPMESSAGEPARTY</Text>
</Text>
</Texts>
<Buttons>
<Button Name="ButtonJoker1">
Vocaluxe/Screens/CScreenSong.cs
+31 -18
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
@@ -42,13 +42,16 @@ 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 6; }
get { return 7; }
}
private const string _TextCategory = "TextCategory";
private const string _TextSelection = "TextSelection";
private const string _TextSearchBarTitle = "TextSearchBarTitle";
private const string _TextSearchBar = "TextSearchBar";
private const string _TextHelpBar = "TextHelpBar";
private const string _TextHelpBarSearch = "TextHelpBarSearch";
private const string _TextHelpBarParty = "TextHelpBarParty";
private const string _TextOptionsTitle = "TextOptionsTitle";
private const string _ButtonOpenOptions = "ButtonOpenOptions";
@@ -134,6 +137,9 @@ namespace Vocaluxe.Screens
tlist.Add(_TextSelection);
tlist.Add(_TextSearchBarTitle);
tlist.Add(_TextSearchBar);
tlist.Add(_TextHelpBar);
tlist.Add(_TextHelpBarSearch);
tlist.Add(_TextHelpBarParty);
tlist.Add(_TextOptionsTitle);
_ThemeStatics = new string[] {_StaticSearchBar, _StaticOptionsBG};
@@ -279,6 +285,21 @@ namespace Vocaluxe.Screens
else if (!_Sso.Selection.PartyMode)
_SearchActive = true;
break;
case Keys.V:
if (keyEvent.Mod == EModifier.Ctrl && !_Sso.Selection.PartyMode)
_StartRandomVisibleSongs();
break;
case Keys.R:
if (keyEvent.Mod == EModifier.Ctrl && !_Sso.Selection.RandomOnly)
_SelectNextRandom(-1);
break;
case Keys.S:
if (keyEvent.Mod == EModifier.Ctrl && CSongs.NumSongsVisible > 0 && !_Sso.Selection.PartyMode)
_StartMedleySong(_SongMenu.GetPreviewSongNr());
break;
}
if (!_SearchActive)
{
@@ -293,23 +314,9 @@ namespace Vocaluxe.Screens
if (keyEvent.Mod == EModifier.Ctrl && !_Sso.Selection.PartyMode)
_StartRandomAllSongs();
break;
case Keys.V:
if (keyEvent.Mod == EModifier.Ctrl && !_Sso.Selection.PartyMode)
_StartRandomVisibleSongs();
break;
case Keys.R:
if (keyEvent.Mod == EModifier.Ctrl && !_Sso.Selection.RandomOnly)
_SelectNextRandom(-1);
break;
case Keys.S:
if (keyEvent.Mod == EModifier.Ctrl && CSongs.NumSongsVisible > 0 && !_Sso.Selection.PartyMode)
_StartMedleySong(_SongMenu.GetPreviewSongNr());
break;
case Keys.F:
if (keyEvent.Mod == EModifier.Ctrl)
if (keyEvent.Mod == EModifier.Ctrl && !_Sso.Selection.PartyMode)
_SearchActive = true;
break;
@@ -727,12 +734,18 @@ namespace Vocaluxe.Screens
_Texts[_TextSearchBar].Visible = true;
_Texts[_TextSearchBarTitle].Visible = true;
_Texts[_TextHelpBar].Visible = false;
_Texts[_TextHelpBarSearch].Visible = true;
_Texts[_TextHelpBarParty].Visible = false;
_Statics[_StaticSearchBar].Visible = true;
}
else
{
_Texts[_TextSearchBar].Visible = false;
_Texts[_TextSearchBarTitle].Visible = false;
_Texts[_TextHelpBar].Visible = !_Sso.Selection.PartyMode;
_Texts[_TextHelpBarSearch].Visible = false;
_Texts[_TextHelpBarParty].Visible = _Sso.Selection.PartyMode;
_Statics[_StaticSearchBar].Visible = false;
}
@@ -1395,4 +1408,4 @@ namespace Vocaluxe.Screens
}
#endregion Playlist Actions
}
}
}