Changed namespaces of partyModes

PartyModes/PartyModeChallenge/ChallengeRounds.cs

@@ -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,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

@@ -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,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,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,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,8 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-
-namespace Vocaluxe.PartyModes
+namespace Vocaluxe.PartyModes.ChallengeMedley
 {
     public class ChallengeRounds
     {

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();

PartyModes/PartyModeChallengeMedley/PartyModeChallengeMedley.csproj

@@ -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/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()
         {
         }
 

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();

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()
         {
         }
 

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
     {

PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.csproj

@@ -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,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,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,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
     {