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

Revert "Added message for no-mics-error on party-screen."

Browse Source 
This reverts commit 3884632772.
This commit is contained in:
Flamefire committed 2013-04-30 19:42:37 +02:00
1 parent 0187dd5638
commit 331fbb1526
2 files changed
+13 -38
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Output/Themes/Ambient/Screens/ScreenParty.xml
+1 -31
View File
@@ -471,36 +471,6 @@
<!-- <Space>: Reflection Space--> <!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height--> <!-- <Height>: Reflection Height-->
</TextError> </TextError>
<TextErrorMics>
<!--<X>, <Y>: Text position-->
<X>850</X>
<Y>560</Y>
<!--<Z>: Text position-->
<Z>0,00</Z>
<!--<H>: Text height-->
<H>32</H>
<!--<MaxW>: Maximum text width (if exists)-->
<MaxW>600</MaxW>
<!--<Color>: Text color from ColorScheme (high priority)-->
<!--or <R>, <G>, <B>, <A> (lower priority)-->
<Color>TextWarningColor</Color>
<!--<SColor>: Selected Text color from ColorScheme (high priority)-->
<!--or <SR>, <SG>, <SB>, <SA> (lower priority)-->
<SColor>TextSColor</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_SCREENPARTY_ERROR_MICS</Text>
<!--<Reflection> If exists:-->
<!-- <Space>: Reflection Space-->
<!-- <Height>: Reflection Height-->
</TextErrorMics>
<ButtonStart> <ButtonStart>
<!--<Skin>: Texture name--> <!--<Skin>: Texture name-->
<Skin>Button</Skin> <Skin>Button</Skin>
@@ -683,4 +653,4 @@
<NumVisible>1</NumVisible> <NumVisible>1</NumVisible>
</SelectSlideModes> </SelectSlideModes>
</ScreenParty> </ScreenParty>
</root> </root>
Vocaluxe/Screens/CScreenParty.cs
+12 -7
View File
@@ -39,7 +39,6 @@ namespace Vocaluxe.Screens
private const string _TextAuthor = "TextAuthor"; private const string _TextAuthor = "TextAuthor";
private const string _TextVersion = "TextVersion"; private const string _TextVersion = "TextVersion";
private const string _TextError = "TextError"; private const string _TextError = "TextError";
private const string _TextErrorMics = "TextErrorMics";
private const string _ButtonStart = "ButtonStart"; private const string _ButtonStart = "ButtonStart";
private const string _ButtonExit = "ButtonExit"; private const string _ButtonExit = "ButtonExit";
private const string _SelectSlideModes = "SelectSlideModes"; private const string _SelectSlideModes = "SelectSlideModes";
@@ -50,7 +49,7 @@ namespace Vocaluxe.Screens
{ {
base.Init(); base.Init();
_ThemeTexts = new string[] {_TextDescription, _TextTargetAudience, _TextNumTeams, _TextNumPlayers, _TextAuthor, _TextVersion, _TextError, _TextErrorMics}; _ThemeTexts = new string[] {_TextDescription, _TextTargetAudience, _TextNumTeams, _TextNumPlayers, _TextAuthor, _TextVersion, _TextError};
_ThemeButtons = new string[] {_ButtonStart, _ButtonExit}; _ThemeButtons = new string[] {_ButtonStart, _ButtonExit};
_ThemeSelectSlides = new string[] {_SelectSlideModes}; _ThemeSelectSlides = new string[] {_SelectSlideModes};
} }
@@ -121,8 +120,6 @@ namespace Vocaluxe.Screens
_SelectSlides[_SelectSlideModes].Selection = 0; _SelectSlides[_SelectSlideModes].Selection = 0;
_UpdateSelection(); _UpdateSelection();
_Texts[_TextErrorMics].Visible = CConfig.GetMaxNumMics() == 0;
_SetInteractionToSelectSlide(_SelectSlides[_SelectSlideModes]); _SetInteractionToSelectSlide(_SelectSlides[_SelectSlideModes]);
} }
@@ -177,8 +174,16 @@ namespace Vocaluxe.Screens
_Texts[_TextVersion].Text = _PartyModeInfos[index].VersionMajor + "." + _PartyModeInfos[index].VersionMinor; _Texts[_TextVersion].Text = _PartyModeInfos[index].VersionMajor + "." + _PartyModeInfos[index].VersionMinor;
_Texts[_TextVersion].TranslationID = _PartyModeInfos[index].PartyModeID; _Texts[_TextVersion].TranslationID = _PartyModeInfos[index].PartyModeID;
_Buttons[_ButtonStart].Visible = _PartyModeInfos[index].Playable && CConfig.GetMaxNumMics() > 0; if (!_PartyModeInfos[index].Playable)
_Texts[_TextError].Visible = !_PartyModeInfos[index].Playable; {
_Buttons[_ButtonStart].Visible = false;
_Texts[_TextError].Visible = true;
}
else
{
_Buttons[_ButtonStart].Visible = true;
_Texts[_TextError].Visible = false;
}
} }
private void _StartPartyMode() private void _StartPartyMode()
@@ -191,7 +196,7 @@ namespace Vocaluxe.Screens
return; return;
if (CConfig.GetMaxNumMics() == 0) if (CConfig.GetMaxNumMics() == 0)
return; return; //TODO: Add message!
CParty.SetPartyMode(_PartyModeInfos[index].PartyModeID); CParty.SetPartyMode(_PartyModeInfos[index].PartyModeID);
CGraphics.FadeTo(EScreens.ScreenPartyDummy); CGraphics.FadeTo(EScreens.ScreenPartyDummy);