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

Changed namespaces of partyModes

Browse Source
This commit is contained in:
Flamefire committed 2013-03-22 19:46:03 +01:00
1 parent baaa26883a
commit 74c0275c3f
24 files changed
+54 -71
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Output/PartyModes/ChallengeMedley.xml
+4 -4
View File
@@ -6,14 +6,14 @@
<Author>brunzel</Author>
<Description>TR_PARTYMODE_DESCRIPTION</Description>
<Folder>ChallengeMedley</Folder>
<PartyModeFile>PartyModeChallenge</PartyModeFile>
<PartyModeFile>PartyModeChallengeMedley</PartyModeFile>
<PartyModeVersionMajor>0</PartyModeVersionMajor>
<PartyModeVersionMinor>1</PartyModeVersionMinor>
<TargetAudience>TR_PARTYMODE_AUDIENCE</TargetAudience>
</Info>
<PartyScreens>
<ScreenFile>PartyScreenChallengeMain</ScreenFile>
<ScreenFile>PartyScreenChallengeConfig</ScreenFile>
<ScreenFile>PartyScreenChallengeNames</ScreenFile>
<ScreenFile>PartyScreenChallengeMedleyMain</ScreenFile>
<ScreenFile>PartyScreenChallengeMedleyConfig</ScreenFile>
<ScreenFile>PartyScreenChallengeMedleyNames</ScreenFile>
</PartyScreens>
</root>
Output/PartyModes/ChallengeMedley/Screens/PartyScreenChallengeConfig.xml → Output/PartyModes/ChallengeMedley/Screens/PartyScreenChallengeMedleyConfig.xml
+2 -2
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<PartyScreenChallengeConfig>
<PartyScreenChallengeMedleyConfig>
<ScreenVersion>1</ScreenVersion>
<Background1>
<!--<Type>: Background type: None, Color, Texture, Video-->
@@ -454,5 +454,5 @@
<!--<NumVisible>: Number of visible elements in the slide-->
<NumVisible>10</NumVisible>
</SelectSlideNumRounds>
</PartyScreenChallengeConfig>
</PartyScreenChallengeMedleyConfig>
</root>
Output/PartyModes/ChallengeMedley/Screens/PartyScreenChallengeMain.xml → Output/PartyModes/ChallengeMedley/Screens/PartyScreenChallengeMedleyMain.xml
+2 -2
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<PartyScreenChallengeMain>
<PartyScreenChallengeMedleyMain>
<ScreenVersion>1</ScreenVersion>
<Background1>
<!--<Type>: Background type: None, Color, Texture, Video-->
@@ -981,5 +981,5 @@
<!-- <Space>: Reflection Space of selected button-->
<!-- <Height>: Reflection Height of selected button-->
</ButtonRoundsScrollDown>
</PartyScreenChallengeMain>
</PartyScreenChallengeMedleyMain>
</root>
Output/PartyModes/ChallengeMedley/Screens/PartyScreenChallengeNames.xml → Output/PartyModes/ChallengeMedley/Screens/PartyScreenChallengeMedleyNames.xml
+2 -2
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<PartyScreenChallengeNames>
<PartyScreenChallengeMedleyNames>
<ScreenVersion>1</ScreenVersion>
<Background1>
<!--<Type>: Background type: None, Color, Texture, Video-->
@@ -270,5 +270,5 @@
<!-- <Space>: Reflection Space of selected button-->
<!-- <Height>: Reflection Height of selected button-->
</ButtonPlayerChoose>
</PartyScreenChallengeNames>
</PartyScreenChallengeMedleyNames>
</root>
PartyModes/PartyModeChallenge/ChallengeRounds.cs
+1 -2
View File
@@ -1,8 +1,7 @@
using System;
using System.Collections.Generic;
namespace Vocaluxe.PartyModes
namespace Vocaluxe.PartyModes.Challenge
{
public class ChallengeRounds
{
PartyModes/PartyModeChallenge/PartyModeChallenge.cs
+1 -2
View File
@@ -1,10 +1,9 @@
using System;
using System.Collections.Generic;
using Vocaluxe.Menu;
[assembly: System.Runtime.InteropServices.ComVisible(false)]
namespace Vocaluxe.PartyModes
namespace Vocaluxe.PartyModes.Challenge
{
#region Communication
#region ToScreen
PartyModes/PartyModeChallenge/PartyModeChallenge.csproj
+1 -1
View File
@@ -8,7 +8,7 @@
<ProjectGuid>{5A4053F1-5AD5-441F-B254-D97A088127B6}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>PartyModeChallenge</RootNamespace>
<RootNamespace>Vocaluxe.PartyModes.Challenge</RootNamespace>
<AssemblyName>PartyModeChallenge</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<TargetFrameworkProfile>
PartyModes/PartyModeChallenge/PartyScreenChallengeConfig.cs
+1 -2
View File
@@ -1,9 +1,8 @@
using System;
using System.Windows.Forms;
using Vocaluxe.Menu;
namespace Vocaluxe.PartyModes
namespace Vocaluxe.PartyModes.Challenge
{
public class PartyScreenChallengeConfig : CMenuParty
{
PartyModes/PartyModeChallenge/PartyScreenChallengeMain.cs
+1 -2
View File
@@ -1,10 +1,9 @@
using System;
using System.Collections.Generic;
using System.Windows.Forms;
using Vocaluxe.Menu;
namespace Vocaluxe.PartyModes
namespace Vocaluxe.PartyModes.Challenge
{
struct TableRow
{
PartyModes/PartyModeChallenge/PartyScreenChallengeNames.cs
+1 -2
View File
@@ -1,10 +1,9 @@
using System;
using System.Collections.Generic;
using System.Windows.Forms;
using Vocaluxe.Menu;
namespace Vocaluxe.PartyModes
namespace Vocaluxe.PartyModes.Challenge
{
public class PartyScreenChallengeNames : CMenuParty
{
PartyModes/PartyModeChallengeMedley/ChallengeRounds.cs
+1 -2
View File
@@ -1,8 +1,7 @@
using System;
using System.Collections.Generic;
namespace Vocaluxe.PartyModes
namespace Vocaluxe.PartyModes.ChallengeMedley
{
public class ChallengeRounds
{
PartyModes/PartyModeChallengeMedley/PartyModeChallenge.cs → PartyModes/PartyModeChallengeMedley/PartyModeChallengeMedley.cs
+10 -11
View File
@@ -1,11 +1,10 @@
using System;
using System.Collections.Generic;
using Vocaluxe.Menu;
using Vocaluxe.Menu.SongMenu;
[assembly: System.Runtime.InteropServices.ComVisible(false)]
namespace Vocaluxe.PartyModes
namespace Vocaluxe.PartyModes.ChallengeMedley
{
#region Communication
#region ToScreen
@@ -96,7 +95,7 @@ namespace Vocaluxe.PartyModes
#endregion FromScreen
#endregion Communication
public sealed class PartyModeChallenge : CPartyMode
public sealed class PartyModeChallengeMedley : CPartyMode
{
private const int MaxPlayer = 12;
private const int MinPlayer = 1;
@@ -145,7 +144,7 @@ namespace Vocaluxe.PartyModes
private Data GameData;
private EStage _Stage;
public PartyModeChallenge()
public PartyModeChallengeMedley()
{
_ScreenSongOptions.Selection.RandomOnly = false;
_ScreenSongOptions.Selection.PartyMode = true;
@@ -199,7 +198,7 @@ namespace Vocaluxe.PartyModes
DataFromScreen data = new DataFromScreen();
switch (ScreenName)
{
case "PartyScreenChallengeConfig":
case "PartyScreenChallengeMedleyConfig":
try
{
@@ -217,7 +216,7 @@ namespace Vocaluxe.PartyModes
}
break;
case "PartyScreenChallengeNames":
case "PartyScreenChallengeMedleyNames":
try
{
data = (DataFromScreen)Data;
@@ -237,7 +236,7 @@ namespace Vocaluxe.PartyModes
}
break;
case "PartyScreenChallengeMain":
case "PartyScreenChallengeMedleyMain":
try
{
data = (DataFromScreen)Data;
@@ -281,7 +280,7 @@ namespace Vocaluxe.PartyModes
switch (_Stage)
{
case EStage.NotStarted:
_Screens.TryGetValue("PartyScreenChallengeConfig", out Screen);
_Screens.TryGetValue("PartyScreenChallengeMedleyConfig", out Screen);
if (_Screens != null)
{
ToScreenConfig.NumPlayer = GameData.NumPlayer;
@@ -291,7 +290,7 @@ namespace Vocaluxe.PartyModes
}
break;
case EStage.Config:
_Screens.TryGetValue("PartyScreenChallengeNames", out Screen);
_Screens.TryGetValue("PartyScreenChallengeMedleyNames", out Screen);
if (_Screens != null)
{
ToScreenNames.NumPlayer = GameData.NumPlayer;
@@ -300,7 +299,7 @@ namespace Vocaluxe.PartyModes
}
break;
case EStage.Names:
_Screens.TryGetValue("PartyScreenChallengeMain", out Screen);
_Screens.TryGetValue("PartyScreenChallengeMedleyMain", out Screen);
if (_Screens != null)
{
CBase.Songs.ResetPartySongSung();
@@ -322,7 +321,7 @@ namespace Vocaluxe.PartyModes
//nothing to do
break;
case EStage.Singing:
_Screens.TryGetValue("PartyScreenChallengeMain", out Screen);
_Screens.TryGetValue("PartyScreenChallengeMedleyMain", out Screen);
if (_Screens != null)
{
UpdateScores();
PartyModes/PartyModeChallengeMedley/PartyModeChallengeMedley.csproj
+6 -6
View File
@@ -8,8 +8,8 @@
<ProjectGuid>{6F3E1874-F28A-40E9-AFBD-31934D593678}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>PartyModeChallenge</RootNamespace>
<AssemblyName>PartyModeChallenge</AssemblyName>
<RootNamespace>Vocaluxe.PartyModes.ChallengeMedley</RootNamespace>
<AssemblyName>PartyModeChallengeMedley</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
@@ -112,16 +112,16 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Compile>
<Compile Include="GlobalSuppressions.cs" />
<Compile Include="PartyModeChallenge.cs">
<Compile Include="PartyModeChallengeMedley.cs">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Compile>
<Compile Include="PartyScreenChallengeConfig.cs">
<Compile Include="PartyScreenChallengeMedleyConfig.cs">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Compile>
<Compile Include="PartyScreenChallengeMain.cs">
<Compile Include="PartyScreenChallengeMedleyMain.cs">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Compile>
<Compile Include="PartyScreenChallengeNames.cs">
<Compile Include="PartyScreenChallengeMedleyNames.cs">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Compile>
</ItemGroup>
PartyModes/PartyModeChallengeMedley/PartyScreenChallengeConfig.cs → PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyConfig.cs
+3 -4
View File
@@ -1,11 +1,10 @@
using System;
using System.Windows.Forms;
using Vocaluxe.Menu;
namespace Vocaluxe.PartyModes
namespace Vocaluxe.PartyModes.ChallengeMedley
{
public class PartyScreenChallengeConfig : CMenuParty
public class PartyScreenChallengeMedleyConfig : CMenuParty
{
// Version number for theme files. Increment it, if you've changed something on the theme files!
protected override int _ScreenVersion { get { return 1; } }
@@ -22,7 +21,7 @@ namespace Vocaluxe.PartyModes
DataFromScreen Data;
public PartyScreenChallengeConfig()
public PartyScreenChallengeMedleyConfig()
{
}
PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMain.cs → PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyMain.cs
+3 -4
View File
@@ -1,10 +1,9 @@
using System;
using System.Collections.Generic;
using System.Windows.Forms;
using Vocaluxe.Menu;
namespace Vocaluxe.PartyModes
namespace Vocaluxe.PartyModes.ChallengeMedley
{
struct TableRow
{
@@ -24,7 +23,7 @@ namespace Vocaluxe.PartyModes
}
public class PartyScreenChallengeMain : CMenuParty
public class PartyScreenChallengeMedleyMain : CMenuParty
{
// Version number for theme files. Increment it, if you've changed something on the theme files!
protected override int _ScreenVersion { get { return 1; } }
@@ -74,7 +73,7 @@ namespace Vocaluxe.PartyModes
private int NumPlayerVisible = 10;
private int NumRoundsVisible = 3;
public PartyScreenChallengeMain()
public PartyScreenChallengeMedleyMain()
{
Data = new DataFromScreen();
Data.ScreenMain = new FromScreenMain();
PartyModes/PartyModeChallengeMedley/PartyScreenChallengeNames.cs → PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyNames.cs
+3 -4
View File
@@ -1,12 +1,11 @@
using System;
using System.Collections.Generic;
using System.Windows.Forms;
using Vocaluxe.Menu;
namespace Vocaluxe.PartyModes
namespace Vocaluxe.PartyModes.ChallengeMedley
{
public class PartyScreenChallengeNames : CMenuParty
public class PartyScreenChallengeMedleyNames : CMenuParty
{
// Version number for theme files. Increment it, if you've changed something on the theme files!
protected override int _ScreenVersion { get { return 1; } }
@@ -52,7 +51,7 @@ namespace Vocaluxe.PartyModes
public int ProfileID;
}
public PartyScreenChallengeNames()
public PartyScreenChallengeMedleyNames()
{
}
PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.cs
+1 -2
View File
@@ -1,10 +1,9 @@
using System;
using System.Collections.Generic;
using Vocaluxe.Menu;
[assembly: System.Runtime.InteropServices.ComVisible(false)]
namespace Vocaluxe.PartyModes
namespace Vocaluxe.PartyModes.TicTacToe
{
public enum ESongSource
{
PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.csproj
+1 -1
View File
@@ -8,7 +8,7 @@
<ProjectGuid>{6F3E1874-F28A-40E9-AFBD-31934D593679}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>PartyModeTicTacToe</RootNamespace>
<RootNamespace>Vocaluxe.PartyModes.TicTacToe</RootNamespace>
<AssemblyName>PartyModeTicTacToe</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<TargetFrameworkProfile>
PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeConfig.cs
+1 -2
View File
@@ -1,9 +1,8 @@
using System;
using System.Windows.Forms;
using Vocaluxe.Menu;
namespace Vocaluxe.PartyModes
namespace Vocaluxe.PartyModes.TicTacToe
{
public class PartyScreenTicTacToeConfig : CMenuParty
{
PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeMain.cs
+1 -2
View File
@@ -1,10 +1,9 @@
using System;
using System.Collections.Generic;
using System.Windows.Forms;
using Vocaluxe.Menu;
namespace Vocaluxe.PartyModes
namespace Vocaluxe.PartyModes.TicTacToe
{
public class Field
{
PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeNames.cs
+1 -2
View File
@@ -1,10 +1,9 @@
using System;
using System.Collections.Generic;
using System.Windows.Forms;
using Vocaluxe.Menu;
namespace Vocaluxe.PartyModes
namespace Vocaluxe.PartyModes.TicTacToe
{
public class PartyScreenTicTacToeNames : CMenuParty
{
Re#Settings.DotSettings
+2 -1
View File
@@ -31,4 +31,5 @@
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="_" Suffix="" Style="AaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PublicFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=27c8359b_002D97bf_002D4e1d_002Db126_002D4f613028bcc5/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Private, Protected, ProtectedInternal, Internal, Public" Description="Enums"&gt;&lt;ElementKinds&gt;&lt;Kind Name="ENUM" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="E" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=8cff90ce_002Def0d_002D436d_002Db8f2_002D5b5bdb923d3b/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Private, Protected, ProtectedInternal, Internal, Public" Description="Classes"&gt;&lt;ElementKinds&gt;&lt;Kind Name="CLASS" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="C" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String></wpf:ResourceDictionary>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=8cff90ce_002Def0d_002D436d_002Db8f2_002D5b5bdb923d3b/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Private, Protected, ProtectedInternal, Internal, Public" Description="Classes"&gt;&lt;ElementKinds&gt;&lt;Kind Name="CLASS" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="C" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=da335a8d_002D4b6e_002D4df6_002D8434_002D29ffe5e2547b/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Private, Protected, ProtectedInternal, Internal, Public" Description="Structs"&gt;&lt;ElementKinds&gt;&lt;Kind Name="STRUCT" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="S" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String></wpf:ResourceDictionary>
Vocaluxe/Base/CParty.cs
+4 -8
View File
@@ -271,7 +271,7 @@ namespace Vocaluxe.Base
return pm;
}
object Instance = Output.CreateInstance("Vocaluxe.PartyModes." + pm.PartyModeFile);
object Instance = Output.CreateInstance("Vocaluxe.PartyModes." + pm.Folder + "." + pm.PartyModeFile);
if (Instance == null)
{
CLog.LogError("Error creating Instance of PartyMode file: " + file);
@@ -305,11 +305,7 @@ namespace Vocaluxe.Base
foreach (string screenfile in pm.ScreenFiles)
{
string XmlPath = Path.Combine(Path.Combine(CSettings.sFolderPartyModes, pm.Folder), CSettings.sFolderPartyModeScreens);
CMenuParty Screen = GetPartyScreenInstance(
Output,
screenfile,
Path.Combine(Path.Combine(CSettings.sFolderPartyModes, pm.Folder), CSettings.sFolderPartyModeScreens)
);
CMenuParty Screen = GetPartyScreenInstance(Output, screenfile, pm.Folder);
if (Screen != null)
{
@@ -369,12 +365,12 @@ namespace Vocaluxe.Base
}
}
private static CMenuParty GetPartyScreenInstance(Assembly Assembly, string ScreenName, string XmlPath)
private static CMenuParty GetPartyScreenInstance(Assembly Assembly, string ScreenName, string partyModeName)
{
if (Assembly == null)
return null;
object Instance = Assembly.CreateInstance("Vocaluxe.PartyModes." + ScreenName);
object Instance = Assembly.CreateInstance("Vocaluxe.PartyModes." + partyModeName + "." + ScreenName);
if (Instance == null)
{
CLog.LogError("Error creating Instance of PartyScreen: " + ScreenName);
Vocaluxe/Base/CTheme.cs
+1 -1
View File
@@ -434,7 +434,7 @@ namespace Vocaluxe.Base
else
msg += "the file is for newer program versions! ";
msg += "Current ThemeSystemVersion is " + ThemeSystemVersion.ToString();
msg += "Current ThemeSystemVersion is " + ThemeSystemVersion.ToString()+ " but found " + version;
CLog.LogError(msg);
}
return true;