diff --git a/Output/PartyModes/ChallengeMedley.xml b/Output/PartyModes/ChallengeMedley.xml index 618d3000..7e1d6605 100644 --- a/Output/PartyModes/ChallengeMedley.xml +++ b/Output/PartyModes/ChallengeMedley.xml @@ -6,14 +6,14 @@ brunzel TR_PARTYMODE_DESCRIPTION ChallengeMedley - PartyModeChallenge + PartyModeChallengeMedley 0 1 TR_PARTYMODE_AUDIENCE - PartyScreenChallengeMain - PartyScreenChallengeConfig - PartyScreenChallengeNames + PartyScreenChallengeMedleyMain + PartyScreenChallengeMedleyConfig + PartyScreenChallengeMedleyNames \ No newline at end of file diff --git a/Output/PartyModes/ChallengeMedley/Screens/PartyScreenChallengeConfig.xml b/Output/PartyModes/ChallengeMedley/Screens/PartyScreenChallengeMedleyConfig.xml similarity index 99% rename from Output/PartyModes/ChallengeMedley/Screens/PartyScreenChallengeConfig.xml rename to Output/PartyModes/ChallengeMedley/Screens/PartyScreenChallengeMedleyConfig.xml index 6581aa77..cda12131 100644 --- a/Output/PartyModes/ChallengeMedley/Screens/PartyScreenChallengeConfig.xml +++ b/Output/PartyModes/ChallengeMedley/Screens/PartyScreenChallengeMedleyConfig.xml @@ -1,6 +1,6 @@ - + 1 @@ -454,5 +454,5 @@ 10 - + diff --git a/Output/PartyModes/ChallengeMedley/Screens/PartyScreenChallengeMain.xml b/Output/PartyModes/ChallengeMedley/Screens/PartyScreenChallengeMedleyMain.xml similarity index 99% rename from Output/PartyModes/ChallengeMedley/Screens/PartyScreenChallengeMain.xml rename to Output/PartyModes/ChallengeMedley/Screens/PartyScreenChallengeMedleyMain.xml index 34733ff1..c5f7bc22 100644 --- a/Output/PartyModes/ChallengeMedley/Screens/PartyScreenChallengeMain.xml +++ b/Output/PartyModes/ChallengeMedley/Screens/PartyScreenChallengeMedleyMain.xml @@ -1,6 +1,6 @@ - + 1 @@ -981,5 +981,5 @@ - + diff --git a/Output/PartyModes/ChallengeMedley/Screens/PartyScreenChallengeNames.xml b/Output/PartyModes/ChallengeMedley/Screens/PartyScreenChallengeMedleyNames.xml similarity index 99% rename from Output/PartyModes/ChallengeMedley/Screens/PartyScreenChallengeNames.xml rename to Output/PartyModes/ChallengeMedley/Screens/PartyScreenChallengeMedleyNames.xml index 9d033c03..284b495e 100644 --- a/Output/PartyModes/ChallengeMedley/Screens/PartyScreenChallengeNames.xml +++ b/Output/PartyModes/ChallengeMedley/Screens/PartyScreenChallengeMedleyNames.xml @@ -1,6 +1,6 @@ - + 1 @@ -270,5 +270,5 @@ - + diff --git a/PartyModes/PartyModeChallenge/ChallengeRounds.cs b/PartyModes/PartyModeChallenge/ChallengeRounds.cs index 19f573f1..49172aa4 100644 --- a/PartyModes/PartyModeChallenge/ChallengeRounds.cs +++ b/PartyModes/PartyModeChallenge/ChallengeRounds.cs @@ -1,8 +1,7 @@ using System; using System.Collections.Generic; - -namespace Vocaluxe.PartyModes +namespace Vocaluxe.PartyModes.Challenge { public class ChallengeRounds { diff --git a/PartyModes/PartyModeChallenge/PartyModeChallenge.cs b/PartyModes/PartyModeChallenge/PartyModeChallenge.cs index b7613c46..ee2adfae 100644 --- a/PartyModes/PartyModeChallenge/PartyModeChallenge.cs +++ b/PartyModes/PartyModeChallenge/PartyModeChallenge.cs @@ -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 diff --git a/PartyModes/PartyModeChallenge/PartyModeChallenge.csproj b/PartyModes/PartyModeChallenge/PartyModeChallenge.csproj index 3ce1fe54..a0e7a08e 100644 --- a/PartyModes/PartyModeChallenge/PartyModeChallenge.csproj +++ b/PartyModes/PartyModeChallenge/PartyModeChallenge.csproj @@ -8,7 +8,7 @@ {5A4053F1-5AD5-441F-B254-D97A088127B6} Library Properties - PartyModeChallenge + Vocaluxe.PartyModes.Challenge PartyModeChallenge v2.0 diff --git a/PartyModes/PartyModeChallenge/PartyScreenChallengeConfig.cs b/PartyModes/PartyModeChallenge/PartyScreenChallengeConfig.cs index 10e09627..49e6d3ab 100644 --- a/PartyModes/PartyModeChallenge/PartyScreenChallengeConfig.cs +++ b/PartyModes/PartyModeChallenge/PartyScreenChallengeConfig.cs @@ -1,9 +1,8 @@ using System; using System.Windows.Forms; - using Vocaluxe.Menu; -namespace Vocaluxe.PartyModes +namespace Vocaluxe.PartyModes.Challenge { public class PartyScreenChallengeConfig : CMenuParty { diff --git a/PartyModes/PartyModeChallenge/PartyScreenChallengeMain.cs b/PartyModes/PartyModeChallenge/PartyScreenChallengeMain.cs index 2ed24061..5d86270d 100644 --- a/PartyModes/PartyModeChallenge/PartyScreenChallengeMain.cs +++ b/PartyModes/PartyModeChallenge/PartyScreenChallengeMain.cs @@ -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 { diff --git a/PartyModes/PartyModeChallenge/PartyScreenChallengeNames.cs b/PartyModes/PartyModeChallenge/PartyScreenChallengeNames.cs index e7f4d7c0..61b147c7 100644 --- a/PartyModes/PartyModeChallenge/PartyScreenChallengeNames.cs +++ b/PartyModes/PartyModeChallenge/PartyScreenChallengeNames.cs @@ -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 { diff --git a/PartyModes/PartyModeChallengeMedley/ChallengeRounds.cs b/PartyModes/PartyModeChallengeMedley/ChallengeRounds.cs index 19f573f1..28d8a65f 100644 --- a/PartyModes/PartyModeChallengeMedley/ChallengeRounds.cs +++ b/PartyModes/PartyModeChallengeMedley/ChallengeRounds.cs @@ -1,8 +1,7 @@ using System; using System.Collections.Generic; - -namespace Vocaluxe.PartyModes +namespace Vocaluxe.PartyModes.ChallengeMedley { public class ChallengeRounds { diff --git a/PartyModes/PartyModeChallengeMedley/PartyModeChallenge.cs b/PartyModes/PartyModeChallengeMedley/PartyModeChallengeMedley.cs similarity index 97% rename from PartyModes/PartyModeChallengeMedley/PartyModeChallenge.cs rename to PartyModes/PartyModeChallengeMedley/PartyModeChallengeMedley.cs index dfd8fb76..611b80a1 100644 --- a/PartyModes/PartyModeChallengeMedley/PartyModeChallenge.cs +++ b/PartyModes/PartyModeChallengeMedley/PartyModeChallengeMedley.cs @@ -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(); diff --git a/PartyModes/PartyModeChallengeMedley/PartyModeChallengeMedley.csproj b/PartyModes/PartyModeChallengeMedley/PartyModeChallengeMedley.csproj index 3429cca0..810ad85c 100644 --- a/PartyModes/PartyModeChallengeMedley/PartyModeChallengeMedley.csproj +++ b/PartyModes/PartyModeChallengeMedley/PartyModeChallengeMedley.csproj @@ -8,8 +8,8 @@ {6F3E1874-F28A-40E9-AFBD-31934D593678} Library Properties - PartyModeChallenge - PartyModeChallenge + Vocaluxe.PartyModes.ChallengeMedley + PartyModeChallengeMedley v2.0 @@ -112,16 +112,16 @@ Always - + Always - + Always - + Always - + Always diff --git a/PartyModes/PartyModeChallengeMedley/PartyScreenChallengeConfig.cs b/PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyConfig.cs similarity index 97% rename from PartyModes/PartyModeChallengeMedley/PartyScreenChallengeConfig.cs rename to PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyConfig.cs index 10e09627..98978e7e 100644 --- a/PartyModes/PartyModeChallengeMedley/PartyScreenChallengeConfig.cs +++ b/PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyConfig.cs @@ -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() { } diff --git a/PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMain.cs b/PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyMain.cs similarity index 99% rename from PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMain.cs rename to PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyMain.cs index 2ed24061..b5b93d9b 100644 --- a/PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMain.cs +++ b/PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyMain.cs @@ -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(); diff --git a/PartyModes/PartyModeChallengeMedley/PartyScreenChallengeNames.cs b/PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyNames.cs similarity index 99% rename from PartyModes/PartyModeChallengeMedley/PartyScreenChallengeNames.cs rename to PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyNames.cs index e7f4d7c0..f2d2c9c6 100644 --- a/PartyModes/PartyModeChallengeMedley/PartyScreenChallengeNames.cs +++ b/PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyNames.cs @@ -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() { } diff --git a/PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.cs b/PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.cs index 3cf22337..c4668b2b 100644 --- a/PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.cs +++ b/PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.cs @@ -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 { diff --git a/PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.csproj b/PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.csproj index b608c2a0..28e9d2b1 100644 --- a/PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.csproj +++ b/PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.csproj @@ -8,7 +8,7 @@ {6F3E1874-F28A-40E9-AFBD-31934D593679} Library Properties - PartyModeTicTacToe + Vocaluxe.PartyModes.TicTacToe PartyModeTicTacToe v2.0 diff --git a/PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeConfig.cs b/PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeConfig.cs index baa4dc2e..5a9b31e4 100644 --- a/PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeConfig.cs +++ b/PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeConfig.cs @@ -1,9 +1,8 @@ using System; using System.Windows.Forms; - using Vocaluxe.Menu; -namespace Vocaluxe.PartyModes +namespace Vocaluxe.PartyModes.TicTacToe { public class PartyScreenTicTacToeConfig : CMenuParty { diff --git a/PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeMain.cs b/PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeMain.cs index 4c46db1a..eff495aa 100644 --- a/PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeMain.cs +++ b/PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeMain.cs @@ -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 { diff --git a/PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeNames.cs b/PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeNames.cs index badf5354..5a3c622b 100644 --- a/PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeNames.cs +++ b/PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeNames.cs @@ -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 { diff --git a/Re#Settings.DotSettings b/Re#Settings.DotSettings index dd4c0847..b599db9d 100644 --- a/Re#Settings.DotSettings +++ b/Re#Settings.DotSettings @@ -31,4 +31,5 @@ <Policy Inspect="True" Prefix="_" Suffix="" Style="AaBb" /> <Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /> <Policy><Descriptor Staticness="Static, Instance" AccessRightKinds="Private, Protected, ProtectedInternal, Internal, Public" Description="Enums"><ElementKinds><Kind Name="ENUM" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="E" Suffix="" Style="AaBb" /></Policy> - <Policy><Descriptor Staticness="Static, Instance" AccessRightKinds="Private, Protected, ProtectedInternal, Internal, Public" Description="Classes"><ElementKinds><Kind Name="CLASS" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="C" Suffix="" Style="AaBb" /></Policy> \ No newline at end of file + <Policy><Descriptor Staticness="Static, Instance" AccessRightKinds="Private, Protected, ProtectedInternal, Internal, Public" Description="Classes"><ElementKinds><Kind Name="CLASS" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="C" Suffix="" Style="AaBb" /></Policy> + <Policy><Descriptor Staticness="Static, Instance" AccessRightKinds="Private, Protected, ProtectedInternal, Internal, Public" Description="Structs"><ElementKinds><Kind Name="STRUCT" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="S" Suffix="" Style="AaBb" /></Policy> \ No newline at end of file diff --git a/Vocaluxe/Base/CParty.cs b/Vocaluxe/Base/CParty.cs index ea8dd07f..60b2ff64 100644 --- a/Vocaluxe/Base/CParty.cs +++ b/Vocaluxe/Base/CParty.cs @@ -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); diff --git a/Vocaluxe/Base/CTheme.cs b/Vocaluxe/Base/CTheme.cs index 7f9e53c3..08d9c6f1 100644 --- a/Vocaluxe/Base/CTheme.cs +++ b/Vocaluxe/Base/CTheme.cs @@ -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;