Merge branch 'challenge' of github.com:Vocaluxe/Vocaluxe into challenge
This commit is contained in:
commit
a2c9b0af07
11 files changed
+501
No files matched your search
@@ -0,0 +1,45 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Text;
|
||||||
|
|
||||||
|
using Vocaluxe.Menu;
|
||||||
|
|
||||||
|
namespace Vocaluxe.PartyModes
|
||||||
|
{
|
||||||
|
public class PartyModeChallenge : CPartyMode
|
||||||
|
{
|
||||||
|
public PartyModeChallenge()
|
||||||
|
{
|
||||||
|
_ScreenSongOptions.Selection.RandomOnly = false;
|
||||||
|
_ScreenSongOptions.Selection.PartyMode = false;
|
||||||
|
_ScreenSongOptions.Selection.CategoryChangeAllowed = true;
|
||||||
|
_ScreenSongOptions.Selection.NumJokers = null;
|
||||||
|
|
||||||
|
_ScreenSongOptions.Sorting.SearchString = String.Empty;
|
||||||
|
_ScreenSongOptions.Sorting.SearchStringVisible = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override CMenuParty GetNextPartyScreen()
|
||||||
|
{
|
||||||
|
CMenuParty Screen = null;
|
||||||
|
_Screens.TryGetValue("PartyScreenChallengeConfig", out Screen);
|
||||||
|
return Screen;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override ScreenSongOptions GetScreenSongOptions()
|
||||||
|
{
|
||||||
|
_ScreenSongOptions.Sorting.SongSorting = _Base.Config.GetSongSorting();
|
||||||
|
_ScreenSongOptions.Sorting.Tabs = _Base.Config.GetTabs();
|
||||||
|
_ScreenSongOptions.Sorting.IgnoreArticles = _Base.Config.GetIgnoreArticles();
|
||||||
|
|
||||||
|
return _ScreenSongOptions;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void SetSearchString(string SearchString, bool Visible)
|
||||||
|
{
|
||||||
|
_ScreenSongOptions.Sorting.SearchString = SearchString;
|
||||||
|
_ScreenSongOptions.Sorting.SearchStringVisible = Visible;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,145 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<PropertyGroup>
|
||||||
|
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||||
|
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
|
||||||
|
<ProductVersion>8.0.30703</ProductVersion>
|
||||||
|
<SchemaVersion>2.0</SchemaVersion>
|
||||||
|
<ProjectGuid>{6F3E1874-F28A-40E9-AFBD-31934D593679}</ProjectGuid>
|
||||||
|
<OutputType>Library</OutputType>
|
||||||
|
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||||
|
<RootNamespace>PartyModeChallenge</RootNamespace>
|
||||||
|
<AssemblyName>PartyModeChallenge</AssemblyName>
|
||||||
|
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
|
||||||
|
<TargetFrameworkProfile>
|
||||||
|
</TargetFrameworkProfile>
|
||||||
|
<FileAlignment>512</FileAlignment>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWin|x86' ">
|
||||||
|
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||||
|
<DebugSymbols>true</DebugSymbols>
|
||||||
|
<DebugType>full</DebugType>
|
||||||
|
<Optimize>false</Optimize>
|
||||||
|
<OutputPath>..\Output\PartyModes\Challenge\Code</OutputPath>
|
||||||
|
<DefineConstants>TRACE;DEBUG;WIN</DefineConstants>
|
||||||
|
<ErrorReport>prompt</ErrorReport>
|
||||||
|
<WarningLevel>4</WarningLevel>
|
||||||
|
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWin|x86' ">
|
||||||
|
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||||
|
<DebugType>none</DebugType>
|
||||||
|
<Optimize>true</Optimize>
|
||||||
|
<OutputPath>..\Output\PartyModes\Challenge\Code</OutputPath>
|
||||||
|
<ErrorReport>prompt</ErrorReport>
|
||||||
|
<WarningLevel>4</WarningLevel>
|
||||||
|
<UseVSHostingProcess>false</UseVSHostingProcess>
|
||||||
|
<DefineConstants>WIN</DefineConstants>
|
||||||
|
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWin|x64'">
|
||||||
|
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||||
|
<DebugSymbols>true</DebugSymbols>
|
||||||
|
<DebugType>full</DebugType>
|
||||||
|
<Optimize>false</Optimize>
|
||||||
|
<OutputPath>..\Output\PartyModes\Challenge\Code</OutputPath>
|
||||||
|
<DefineConstants>TRACE;DEBUG;WIN</DefineConstants>
|
||||||
|
<ErrorReport>prompt</ErrorReport>
|
||||||
|
<WarningLevel>4</WarningLevel>
|
||||||
|
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWin|x64'">
|
||||||
|
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||||
|
<DebugType>none</DebugType>
|
||||||
|
<Optimize>true</Optimize>
|
||||||
|
<OutputPath>..\Output\PartyModes\Challenge\Code</OutputPath>
|
||||||
|
<ErrorReport>prompt</ErrorReport>
|
||||||
|
<WarningLevel>4</WarningLevel>
|
||||||
|
<UseVSHostingProcess>false</UseVSHostingProcess>
|
||||||
|
<DefineConstants>WIN</DefineConstants>
|
||||||
|
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugLinux|x86' ">
|
||||||
|
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||||
|
<DebugSymbols>true</DebugSymbols>
|
||||||
|
<DebugType>full</DebugType>
|
||||||
|
<Optimize>false</Optimize>
|
||||||
|
<OutputPath>..\Output\PartyModes\Challenge\Code</OutputPath>
|
||||||
|
<DefineConstants>TRACE;DEBUG;LINUX</DefineConstants>
|
||||||
|
<ErrorReport>prompt</ErrorReport>
|
||||||
|
<WarningLevel>4</WarningLevel>
|
||||||
|
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseLinux|x86' ">
|
||||||
|
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||||
|
<DebugType>none</DebugType>
|
||||||
|
<Optimize>true</Optimize>
|
||||||
|
<OutputPath>..\Output\PartyModes\Challenge\Code</OutputPath>
|
||||||
|
<ErrorReport>prompt</ErrorReport>
|
||||||
|
<WarningLevel>4</WarningLevel>
|
||||||
|
<UseVSHostingProcess>false</UseVSHostingProcess>
|
||||||
|
<DefineConstants>LINUX</DefineConstants>
|
||||||
|
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugLinux|x64'">
|
||||||
|
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||||
|
<DebugSymbols>true</DebugSymbols>
|
||||||
|
<DebugType>full</DebugType>
|
||||||
|
<Optimize>false</Optimize>
|
||||||
|
<OutputPath>..\Output\PartyModes\Challenge\Code</OutputPath>
|
||||||
|
<DefineConstants>TRACE;DEBUG;LINUX</DefineConstants>
|
||||||
|
<ErrorReport>prompt</ErrorReport>
|
||||||
|
<WarningLevel>4</WarningLevel>
|
||||||
|
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseLinux|x64'">
|
||||||
|
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||||
|
<DebugType>none</DebugType>
|
||||||
|
<Optimize>true</Optimize>
|
||||||
|
<OutputPath>..\Output\PartyModes\Challenge\Code</OutputPath>
|
||||||
|
<ErrorReport>prompt</ErrorReport>
|
||||||
|
<WarningLevel>4</WarningLevel>
|
||||||
|
<UseVSHostingProcess>false</UseVSHostingProcess>
|
||||||
|
<DefineConstants>LINUX</DefineConstants>
|
||||||
|
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup>
|
||||||
|
<StartupObject />
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Include="PartyModeChallenge.cs">
|
||||||
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
|
</Compile>
|
||||||
|
<Compile Include="PartyScreenChallengeConfig.cs">
|
||||||
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
|
</Compile>
|
||||||
|
<Compile Include="PartyScreenChallengeMain.cs">
|
||||||
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
|
</Compile>
|
||||||
|
<Compile Include="PartyScreenChallengeNames.cs">
|
||||||
|
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||||
|
</Compile>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\VocaluxeLib\VocaluxeLib.csproj">
|
||||||
|
<Project>{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}</Project>
|
||||||
|
<Name>VocaluxeLib</Name>
|
||||||
|
<Private>False</Private>
|
||||||
|
</ProjectReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Reference Include="System" />
|
||||||
|
<Reference Include="System.Data" />
|
||||||
|
<Reference Include="System.Drawing" />
|
||||||
|
<Reference Include="System.Windows.Forms" />
|
||||||
|
<Reference Include="System.XML" />
|
||||||
|
</ItemGroup>
|
||||||
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
|
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||||
|
Other similar extension points exist, see Microsoft.Common.targets.
|
||||||
|
<Target Name="BeforeBuild">
|
||||||
|
</Target>
|
||||||
|
<Target Name="AfterBuild">
|
||||||
|
</Target>
|
||||||
|
-->
|
||||||
|
</Project>
|
||||||
@@ -0,0 +1,95 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Text;
|
||||||
|
using System.Windows.Forms;
|
||||||
|
|
||||||
|
using Vocaluxe.Menu;
|
||||||
|
|
||||||
|
namespace Vocaluxe.PartyModes
|
||||||
|
{
|
||||||
|
public class PartyScreenChallengeConfig : CMenuParty
|
||||||
|
{
|
||||||
|
// Version number for theme files. Increment it, if you've changed something on the theme files!
|
||||||
|
const int ScreenVersion = 1;
|
||||||
|
|
||||||
|
const string ButtonNext = "ButtonNext";
|
||||||
|
const string ButtonBack = "ButtonBack";
|
||||||
|
|
||||||
|
public PartyScreenChallengeConfig()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void Init()
|
||||||
|
{
|
||||||
|
base.Init();
|
||||||
|
|
||||||
|
_ThemeName = "PartyScreenChallengeConfig";
|
||||||
|
_ThemeButtons = new string[] { ButtonNext, ButtonBack };
|
||||||
|
_ScreenVersion = ScreenVersion;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void LoadTheme(string XmlPath)
|
||||||
|
{
|
||||||
|
base.LoadTheme(XmlPath);
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool HandleInput(KeyEvent KeyEvent)
|
||||||
|
{
|
||||||
|
base.HandleInput(KeyEvent);
|
||||||
|
|
||||||
|
if (KeyEvent.KeyPressed)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
switch (KeyEvent.Key)
|
||||||
|
{
|
||||||
|
case Keys.Back:
|
||||||
|
case Keys.Escape:
|
||||||
|
FadeTo(EScreens.ScreenParty);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool HandleMouse(MouseEvent MouseEvent)
|
||||||
|
{
|
||||||
|
base.HandleMouse(MouseEvent);
|
||||||
|
|
||||||
|
if (MouseEvent.LB && IsMouseOver(MouseEvent))
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
if (MouseEvent.RB)
|
||||||
|
{
|
||||||
|
FadeTo(EScreens.ScreenParty);
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void OnShow()
|
||||||
|
{
|
||||||
|
base.OnShow();
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool UpdateGame()
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool Draw()
|
||||||
|
{
|
||||||
|
base.Draw();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void OnClose()
|
||||||
|
{
|
||||||
|
base.OnClose();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,91 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Text;
|
||||||
|
using System.Windows.Forms;
|
||||||
|
|
||||||
|
using Vocaluxe.Menu;
|
||||||
|
|
||||||
|
namespace Vocaluxe.PartyModes
|
||||||
|
{
|
||||||
|
public class PartyScreenChallengeMain : CMenuParty
|
||||||
|
{
|
||||||
|
// Version number for theme files. Increment it, if you've changed something on the theme files!
|
||||||
|
const int ScreenVersion = 1;
|
||||||
|
|
||||||
|
public PartyScreenChallengeMain()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void Init()
|
||||||
|
{
|
||||||
|
base.Init();
|
||||||
|
|
||||||
|
_ThemeName = "PartyScreenChallengeMain";
|
||||||
|
_ScreenVersion = ScreenVersion;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void LoadTheme(string XmlPath)
|
||||||
|
{
|
||||||
|
base.LoadTheme(XmlPath);
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool HandleInput(KeyEvent KeyEvent)
|
||||||
|
{
|
||||||
|
base.HandleInput(KeyEvent);
|
||||||
|
|
||||||
|
if (KeyEvent.KeyPressed)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
switch (KeyEvent.Key)
|
||||||
|
{
|
||||||
|
case Keys.Back:
|
||||||
|
case Keys.Escape:
|
||||||
|
FadeTo(EScreens.ScreenParty);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool HandleMouse(MouseEvent MouseEvent)
|
||||||
|
{
|
||||||
|
base.HandleMouse(MouseEvent);
|
||||||
|
|
||||||
|
if (MouseEvent.LB && IsMouseOver(MouseEvent))
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
if (MouseEvent.RB)
|
||||||
|
{
|
||||||
|
FadeTo(EScreens.ScreenParty);
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void OnShow()
|
||||||
|
{
|
||||||
|
base.OnShow();
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool UpdateGame()
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool Draw()
|
||||||
|
{
|
||||||
|
base.Draw();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void OnClose()
|
||||||
|
{
|
||||||
|
base.OnClose();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,91 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Text;
|
||||||
|
using System.Windows.Forms;
|
||||||
|
|
||||||
|
using Vocaluxe.Menu;
|
||||||
|
|
||||||
|
namespace Vocaluxe.PartyModes
|
||||||
|
{
|
||||||
|
public class PartyScreenChallengeNames : CMenuParty
|
||||||
|
{
|
||||||
|
// Version number for theme files. Increment it, if you've changed something on the theme files!
|
||||||
|
const int ScreenVersion = 1;
|
||||||
|
|
||||||
|
public PartyScreenChallengeNames()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void Init()
|
||||||
|
{
|
||||||
|
base.Init();
|
||||||
|
|
||||||
|
_ThemeName = "PartyScreenChallengeNames";
|
||||||
|
_ScreenVersion = ScreenVersion;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void LoadTheme(string XmlPath)
|
||||||
|
{
|
||||||
|
base.LoadTheme(XmlPath);
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool HandleInput(KeyEvent KeyEvent)
|
||||||
|
{
|
||||||
|
base.HandleInput(KeyEvent);
|
||||||
|
|
||||||
|
if (KeyEvent.KeyPressed)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
switch (KeyEvent.Key)
|
||||||
|
{
|
||||||
|
case Keys.Back:
|
||||||
|
case Keys.Escape:
|
||||||
|
FadeTo(EScreens.ScreenParty);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool HandleMouse(MouseEvent MouseEvent)
|
||||||
|
{
|
||||||
|
base.HandleMouse(MouseEvent);
|
||||||
|
|
||||||
|
if (MouseEvent.LB && IsMouseOver(MouseEvent))
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
if (MouseEvent.RB)
|
||||||
|
{
|
||||||
|
FadeTo(EScreens.ScreenParty);
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void OnShow()
|
||||||
|
{
|
||||||
|
base.OnShow();
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool UpdateGame()
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool Draw()
|
||||||
|
{
|
||||||
|
base.Draw();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void OnClose()
|
||||||
|
{
|
||||||
|
base.OnClose();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -3,11 +3,14 @@ Microsoft Visual Studio Solution File, Format Version 11.00
|
|||||||
# Visual C# Express 2010
|
# Visual C# Express 2010
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vocaluxe", "Vocaluxe\Vocaluxe.csproj", "{2A1E0F2D-5392-4BB7-B0A1-A9DFA13E79FF}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vocaluxe", "Vocaluxe\Vocaluxe.csproj", "{2A1E0F2D-5392-4BB7-B0A1-A9DFA13E79FF}"
|
||||||
ProjectSection(ProjectDependencies) = postProject
|
ProjectSection(ProjectDependencies) = postProject
|
||||||
|
{6F3E1874-F28A-40E9-AFBD-31934D593679} = {6F3E1874-F28A-40E9-AFBD-31934D593679}
|
||||||
{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC} = {D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}
|
{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC} = {D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}
|
||||||
EndProjectSection
|
EndProjectSection
|
||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VocaluxeLib", "VocaluxeLib\VocaluxeLib.csproj", "{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VocaluxeLib", "VocaluxeLib\VocaluxeLib.csproj", "{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}"
|
||||||
EndProject
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PartyModeChallenge", "PartyModeChallenge\PartyModeChallenge.csproj", "{6F3E1874-F28A-40E9-AFBD-31934D593679}"
|
||||||
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
DebugLinux|x64 = DebugLinux|x64
|
DebugLinux|x64 = DebugLinux|x64
|
||||||
@@ -46,6 +49,14 @@ Global
|
|||||||
{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.ReleaseLinux|x86.ActiveCfg = ReleaseLinux|x86
|
{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.ReleaseLinux|x86.ActiveCfg = ReleaseLinux|x86
|
||||||
{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.ReleaseWin|x64.ActiveCfg = ReleaseWin|x64
|
{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.ReleaseWin|x64.ActiveCfg = ReleaseWin|x64
|
||||||
{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.ReleaseWin|x86.ActiveCfg = ReleaseWin|x86
|
{D2B6DDEF-E0E1-4DDF-A73A-E6ACEF5C95EC}.ReleaseWin|x86.ActiveCfg = ReleaseWin|x86
|
||||||
|
{6F3E1874-F28A-40E9-AFBD-31934D593679}.DebugLinux|x64.ActiveCfg = DebugLinux|x64
|
||||||
|
{6F3E1874-F28A-40E9-AFBD-31934D593679}.DebugLinux|x86.ActiveCfg = DebugLinux|x86
|
||||||
|
{6F3E1874-F28A-40E9-AFBD-31934D593679}.DebugWin|x64.ActiveCfg = DebugWin|x64
|
||||||
|
{6F3E1874-F28A-40E9-AFBD-31934D593679}.DebugWin|x86.ActiveCfg = DebugWin|x86
|
||||||
|
{6F3E1874-F28A-40E9-AFBD-31934D593679}.ReleaseLinux|x64.ActiveCfg = ReleaseLinux|x64
|
||||||
|
{6F3E1874-F28A-40E9-AFBD-31934D593679}.ReleaseLinux|x86.ActiveCfg = ReleaseLinux|x86
|
||||||
|
{6F3E1874-F28A-40E9-AFBD-31934D593679}.ReleaseWin|x64.ActiveCfg = ReleaseWin|x64
|
||||||
|
{6F3E1874-F28A-40E9-AFBD-31934D593679}.ReleaseWin|x86.ActiveCfg = ReleaseWin|x86
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
|
|||||||
@@ -279,7 +279,10 @@ namespace Vocaluxe.Base
|
|||||||
pm.PartyModeID);
|
pm.PartyModeID);
|
||||||
|
|
||||||
if (Screen != null)
|
if (Screen != null)
|
||||||
|
{
|
||||||
|
Screen.AssignPartyMode(pm.PartyMode);
|
||||||
pm.PartyMode.AddScreen(Screen, screenfile);
|
pm.PartyMode.AddScreen(Screen, screenfile);
|
||||||
|
}
|
||||||
else
|
else
|
||||||
return pm;
|
return pm;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,12 +2,17 @@
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
|
|
||||||
|
using Vocaluxe.PartyModes;
|
||||||
|
|
||||||
namespace Vocaluxe.Menu
|
namespace Vocaluxe.Menu
|
||||||
{
|
{
|
||||||
public abstract class CMenuParty : CMenu
|
public abstract class CMenuParty : CMenu
|
||||||
{
|
{
|
||||||
|
protected IPartyMode _PartyMode;
|
||||||
|
|
||||||
public CMenuParty()
|
public CMenuParty()
|
||||||
{
|
{
|
||||||
|
_PartyMode = new CPartyModeNone();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void SetPartyModeID(int PartyModeID)
|
public void SetPartyModeID(int PartyModeID)
|
||||||
@@ -20,6 +25,11 @@ namespace Vocaluxe.Menu
|
|||||||
return _PartyModeID;
|
return _PartyModeID;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void AssignPartyMode(IPartyMode PartyMode)
|
||||||
|
{
|
||||||
|
_PartyMode = PartyMode;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
public sealed override void LoadTheme()
|
public sealed override void LoadTheme()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ using System.Windows.Forms;
|
|||||||
|
|
||||||
using Vocaluxe.Menu.SingNotes;
|
using Vocaluxe.Menu.SingNotes;
|
||||||
using Vocaluxe.Menu.SongMenu;
|
using Vocaluxe.Menu.SongMenu;
|
||||||
|
using Vocaluxe.PartyModes;
|
||||||
|
|
||||||
namespace Vocaluxe.Menu
|
namespace Vocaluxe.Menu
|
||||||
{
|
{
|
||||||
@@ -47,6 +48,8 @@ namespace Vocaluxe.Menu
|
|||||||
{
|
{
|
||||||
void SetPartyModeID(int PartyModeID);
|
void SetPartyModeID(int PartyModeID);
|
||||||
int GetPartyModeID();
|
int GetPartyModeID();
|
||||||
|
|
||||||
|
void AssignPartyMode(IPartyMode PartyMode);
|
||||||
}
|
}
|
||||||
|
|
||||||
public interface IConfig
|
public interface IConfig
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ namespace Vocaluxe.PartyModes
|
|||||||
protected ScreenSongOptions _ScreenSongOptions;
|
protected ScreenSongOptions _ScreenSongOptions;
|
||||||
protected Dictionary<string, CMenuParty> _Screens;
|
protected Dictionary<string, CMenuParty> _Screens;
|
||||||
protected string _Folder;
|
protected string _Folder;
|
||||||
|
protected Delegate _Callback;
|
||||||
|
|
||||||
public CPartyMode()
|
public CPartyMode()
|
||||||
{
|
{
|
||||||
@@ -38,6 +39,11 @@ namespace Vocaluxe.PartyModes
|
|||||||
_Screens.Add(ScreenName, Screen);
|
_Screens.Add(ScreenName, Screen);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void SetPartyModeCallback(Delegate Callback)
|
||||||
|
{
|
||||||
|
_Callback = Callback;
|
||||||
|
}
|
||||||
|
|
||||||
public virtual CMenuParty GetNextPartyScreen()
|
public virtual CMenuParty GetNextPartyScreen()
|
||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
|
|||||||
@@ -54,6 +54,7 @@ namespace Vocaluxe.PartyModes
|
|||||||
bool Init(string Folder);
|
bool Init(string Folder);
|
||||||
void Initialize(Basic Base);
|
void Initialize(Basic Base);
|
||||||
void AddScreen(CMenuParty Screen, string ScreenName);
|
void AddScreen(CMenuParty Screen, string ScreenName);
|
||||||
|
void SetPartyModeCallback(Delegate Callback);
|
||||||
|
|
||||||
CMenuParty GetNextPartyScreen();
|
CMenuParty GetNextPartyScreen();
|
||||||
EScreens GetStartScreen();
|
EScreens GetStartScreen();
|
||||||
|
|||||||
Reference in new issue
Block a user