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

Merge branch 'develop' into develop

Browse Source
This commit is contained in:
Florian Küpper authored and GitHub committed 2017-11-29 08:05:38 +01:00
2 parents 7e67fbb7d3 29acb6dd4c
commit 89b9e9c307
43 files changed
+1455 -1213
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Output/Languages/English.xml
+2
View File
@@ -156,6 +156,8 @@
<string name="TR_SCREENSING_BUTTON_CANCEL">Stop singing</string>
<string name="TR_SCREENSING_BUTTON_CONTINUE">Continue</string>
<string name="TR_SCREENSING_BUTTON_SKIP">Skip this song</string>
<string name="TR_SCREENSING_BUTTON_RESTART_ROUND">Restart round</string>
<string name="TR_SCREENSING_BUTTON_RESTART_GAME">Restart game</string>
<string name="TR_SCREENSCORE_SCORES">Scores</string>
<string name="TR_SCREENSCORE_RATING">Rating</string>
<string name="TR_SCREENSCORE_POINTS">Points</string>
Output/Profiles/guest1.xml
+1
View File
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<ID>600352d6-d975-4945-9758-e6b379972a12</ID>
<PlayerName>Guest 1</PlayerName>
<Difficulty>TR_CONFIG_EASY</Difficulty>
<UserRole>TR_USERROLE_GUEST</UserRole>
Output/Profiles/guest2.xml
+1
View File
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<ID>abeb987f-bf44-4d6d-b922-e5deb608a1ab</ID>
<PlayerName>Guest 2</PlayerName>
<Difficulty>TR_CONFIG_EASY</Difficulty>
<UserRole>TR_USERROLE_GUEST</UserRole>
Output/Profiles/guest3.xml
+1
View File
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<ID>fd433fc4-60c0-4521-87ef-53aa7d252337</ID>
<PlayerName>Guest 3</PlayerName>
<Difficulty>TR_CONFIG_EASY</Difficulty>
<UserRole>TR_USERROLE_GUEST</UserRole>
Output/Themes/Changelog/Changelog_ScreenSing.txt
+3 -1
View File
@@ -4,7 +4,9 @@ ScreenSing
Version 9
Add:
<StaticRatingBar$P$N$>
<ProgressBarRatingP$N$>
<ButtonRestartRound>
<ButtonRestartGame>
+++++++++
Version 8
Output/Themes/Genius/01_Standard.xml
+7 -1
View File
@@ -296,6 +296,12 @@
<B>0.027</B>
<A>1.000</A>
</RatingPerfect>
<TextPauseColor>
<R>1.000</R>
<G>1.000</G>
<B>1.000</B>
<A>0.900</A>
</TextPauseColor>
</Colors>
<Skins>
<BG_Default>BG_Default.png</BG_Default>
@@ -329,7 +335,7 @@
<Score>Score.png</Score>
<Star>Star.png</Star>
<SongMenu>SongMenu.png</SongMenu>
<PauseBG>Pause.png</PauseBG>
<PauseBG>PauseBG.png</PauseBG>
<EnergyBeam>EnergyBeam.png</EnergyBeam>
<SearchBar>SearchBar.png</SearchBar>
<PlaylistBG>PlaylistBG.png</PlaylistBG>
Output/Themes/Genius/02_Ice_Blue.xml
+7 -1
View File
@@ -296,6 +296,12 @@
<B>0.027</B>
<A>1.000</A>
</RatingPerfect>
<TextPauseColor>
<R>1.000</R>
<G>1.000</G>
<B>1.000</B>
<A>0.900</A>
</TextPauseColor>
</Colors>
<Skins>
<BG_Default>BG_Default.png</BG_Default>
@@ -329,7 +335,7 @@
<Score>Score.png</Score>
<Star>Star.png</Star>
<SongMenu>SongMenu.png</SongMenu>
<PauseBG>Pause.png</PauseBG>
<PauseBG>PauseBG.png</PauseBG>
<EnergyBeam>EnergyBeam.png</EnergyBeam>
<SearchBar>SearchBar.png</SearchBar>
<PlaylistBG>PlaylistBG.png</PlaylistBG>
Output/Themes/Genius/03_Crimson_Red.xml
+7 -1
View File
@@ -296,6 +296,12 @@
<B>0.027</B>
<A>1.000</A>
</RatingPerfect>
<TextPauseColor>
<R>1.000</R>
<G>1.000</G>
<B>1.000</B>
<A>0.900</A>
</TextPauseColor>
</Colors>
<Skins>
<BG_Default>BG_Default.png</BG_Default>
@@ -329,7 +335,7 @@
<Score>Score.png</Score>
<Star>Star.png</Star>
<SongMenu>SongMenu.png</SongMenu>
<PauseBG>Pause.png</PauseBG>
<PauseBG>PauseBG.png</PauseBG>
<EnergyBeam>EnergyBeam.png</EnergyBeam>
<SearchBar>SearchBar.png</SearchBar>
<PlaylistBG>PlaylistBG.png</PlaylistBG>
Output/Themes/Genius/Pause.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 114 KiB

Output/Themes/Genius/PauseBG.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB

Output/Themes/Genius/Screens/ScreenSing.xml
+79 -9
View File
@@ -657,11 +657,11 @@
<Text /></Text>
<Text Name="TextPause">
<X>640</X>
<Y>350</Y>
<Y>450</Y>
<Z>-2.11</Z>
<H>40</H>
<H>100</H>
<MaxW>0</MaxW>
<Color Name="TextColor" />
<Color Name="TextPauseColor" />
<SelColor Name="TextSelColor" />
<Align>Center</Align>
<ResizeAlign>Center</ResizeAlign>
@@ -1302,8 +1302,8 @@
<Skin>Button</Skin>
<SkinSelected>Button</SkinSelected>
<Rect>
<X>775</X>
<Y>450</Y>
<X>985</X>
<Y>600</Y>
<W>150</W>
<H>50</H>
<Z>-2.11</Z>
@@ -1337,8 +1337,8 @@
<Skin>Button</Skin>
<SkinSelected>Button</SkinSelected>
<Rect>
<X>355</X>
<Y>450</Y>
<X>145</X>
<Y>600</Y>
<W>150</W>
<H>50</H>
<Z>-2.11</Z>
@@ -1372,8 +1372,8 @@
<Skin>Button</Skin>
<SkinSelected>Button</SkinSelected>
<Rect>
<X>565</X>
<Y>450</Y>
<X>355</X>
<Y>600</Y>
<W>150</W>
<H>50</H>
<Z>-2.11</Z>
@@ -1403,6 +1403,76 @@
<Space>10</Space>
</SelReflection>
</Button>
<Button Name="ButtonRestartRound">
<Skin>Button</Skin>
<SkinSelected>Button</SkinSelected>
<Rect>
<X>775</X>
<Y>600</Y>
<W>150</W>
<H>50</H>
<Z>-2.11</Z>
</Rect>
<Color Name="ButtonColor" />
<SelColor Name="ButtonSelColor" />
<Text Name="Text">
<X>75</X>
<Y>12</Y>
<Z>0</Z>
<H>27</H>
<MaxW>142</MaxW>
<Color Name="ButtonTextColor" />
<SelColor Name="ButtonTextSelColor" />
<Align>Center</Align>
<ResizeAlign>Center</ResizeAlign>
<Style>Bold</Style>
<Font>Outline</Font>
<Text>TR_SCREENSING_BUTTON_RESTART_ROUND</Text>
</Text>
<Reflection>
<Height>26</Height>
<Space>10</Space>
</Reflection>
<SelReflection>
<Height>26</Height>
<Space>10</Space>
</SelReflection>
</Button>
<Button Name="ButtonRestartGame">
<Skin>Button</Skin>
<SkinSelected>Button</SkinSelected>
<Rect>
<X>565</X>
<Y>600</Y>
<W>150</W>
<H>50</H>
<Z>-2.11</Z>
</Rect>
<Color Name="ButtonColor" />
<SelColor Name="ButtonSelColor" />
<Text Name="Text">
<X>75</X>
<Y>12</Y>
<Z>0</Z>
<H>27</H>
<MaxW>142</MaxW>
<Color Name="ButtonTextColor" />
<SelColor Name="ButtonTextSelColor" />
<Align>Center</Align>
<ResizeAlign>Center</ResizeAlign>
<Style>Bold</Style>
<Font>Outline</Font>
<Text>TR_SCREENSING_BUTTON_RESTART_GAME</Text>
</Text>
<Reflection>
<Height>26</Height>
<Space>10</Space>
</Reflection>
<SelReflection>
<Height>26</Height>
<Space>10</Space>
</SelReflection>
</Button>
</Buttons>
<SongMenus />
<Lyrics>
PartyModes/PartyModeChallenge/CPartyModeChallenge.cs
+5 -5
View File
@@ -30,7 +30,7 @@ namespace VocaluxeLib.PartyModes.Challenge
public class CResultTableRow : IComparable
{
public int Position;
public int PlayerID;
public Guid PlayerID;
public int NumPlayed;
public int NumWon;
public int NumSingPoints;
@@ -121,7 +121,7 @@ namespace VocaluxeLib.PartyModes.Challenge
public int NumJokers;
public bool RefillJokers;
public int[] Jokers;
public List<int> ProfileIDs;
public List<Guid> ProfileIDs;
public ESongSource SongSource;
public ESongSorting Sorting;
@@ -143,7 +143,7 @@ namespace VocaluxeLib.PartyModes.Challenge
private struct SStats
{
public int ProfileID;
public Guid ProfileID;
public int SingPoints;
public int GamePoints;
public int Won;
@@ -173,7 +173,7 @@ namespace VocaluxeLib.PartyModes.Challenge
NumJokers = 5,
RefillJokers = true,
CurrentRoundNr = 1,
ProfileIDs = new List<int>(),
ProfileIDs = new List<Guid>(),
Sorting = CBase.Config.GetSongSorting(),
SongSource = ESongSource.TR_SONGSOURCE_ALLSONGS,
PlaylistID = 0,
@@ -479,7 +479,7 @@ namespace VocaluxeLib.PartyModes.Challenge
if (c != null)
players[i].ProfileID = GameData.ProfileIDs[c.Players[i]];
else
players[i].ProfileID = -1;
players[i].ProfileID = Guid.Empty;
}
#endregion PlayerNames
PartyModes/PartyModeChallenge/CPartyScreenChallengeMain.cs
+1 -1
View File
@@ -341,7 +341,7 @@ namespace VocaluxeLib.PartyModes.Challenge
_Texts[_TextNextPlayerMessage].Visible = true;
for (int i = 0; i < _PartyMode.GameData.NumPlayerAtOnce; i++)
{
int id = _PartyMode.GameData.ProfileIDs[_PartyMode.GameData.Rounds[_PartyMode.GameData.CurrentRoundNr - 1].Players[i]];
Guid id = _PartyMode.GameData.ProfileIDs[_PartyMode.GameData.Rounds[_PartyMode.GameData.CurrentRoundNr - 1].Players[i]];
_NextPlayerStatics[i].Texture = CBase.Profiles.GetAvatar(id);
_NextPlayerTexts[i].Text = CBase.Profiles.GetPlayerName(id);
_NextPlayerTexts[i].Color = CBase.Themes.GetPlayerColor(i + 1);
PartyModes/PartyModeChallenge/CPartyScreenChallengeNames.cs
+2 -1
View File
@@ -15,6 +15,7 @@
// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
#endregion
using System;
using System.Collections.Generic;
using VocaluxeLib.Menu;
@@ -47,7 +48,7 @@ namespace VocaluxeLib.PartyModes.Challenge
while (_PartyMode.GameData.ProfileIDs.Count > _NumPlayer)
_PartyMode.GameData.ProfileIDs.RemoveAt(_PartyMode.GameData.ProfileIDs.Count - 1);
List<int>[] ids = new List<int>[] {_PartyMode.GameData.ProfileIDs};
List<Guid>[] ids = new List<Guid>[] {_PartyMode.GameData.ProfileIDs};
SetPartyModeProfiles(ids);
}
PartyModes/PartyModeChallenge/PartyModeChallenge.csproj
+9 -3
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">DebugWin</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,8 +10,9 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>VocaluxeLib.PartyModes.Challenge</RootNamespace>
<AssemblyName>Challenge</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWin|AnyCPU'">
@@ -25,6 +26,7 @@
<WarningLevel>4</WarningLevel>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<CodeAnalysisRuleSet>..\..\CheckingRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWin|AnyCPU'">
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -36,6 +38,7 @@
<UseVSHostingProcess>false</UseVSHostingProcess>
<DefineConstants>WIN</DefineConstants>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugLinux|AnyCPU'">
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -47,6 +50,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseLinux|AnyCPU'">
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -58,6 +62,7 @@
<UseVSHostingProcess>false</UseVSHostingProcess>
<DefineConstants>LINUX</DefineConstants>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'InstallerWin|AnyCPU'">
<OutputPath>bin</OutputPath>
@@ -68,6 +73,7 @@
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Compile Include="CChallengeRounds.cs" />
PartyModes/PartyModeTicTacToe/CPartyModeTicTacToe.cs
+5 -5
View File
@@ -104,8 +104,8 @@ namespace VocaluxeLib.PartyModes.TicTacToe
public int NumPlayerTeam2;
public int NumFields;
public int Team;
public List<int> ProfileIDsTeam1;
public List<int> ProfileIDsTeam2;
public List<Guid> ProfileIDsTeam1;
public List<Guid> ProfileIDsTeam2;
public List<int> PlayerTeam1;
public List<int> PlayerTeam2;
@@ -148,8 +148,8 @@ namespace VocaluxeLib.PartyModes.TicTacToe
NumPlayerTeam1 = 2,
NumPlayerTeam2 = 2,
NumFields = 9,
ProfileIDsTeam1 = new List<int>(),
ProfileIDsTeam2 = new List<int>(),
ProfileIDsTeam1 = new List<Guid>(),
ProfileIDsTeam2 = new List<Guid>(),
PlayerTeam1 = new List<int>(),
PlayerTeam2 = new List<int>(),
CurrentRoundNr = 0,
@@ -491,7 +491,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
for (int i = 0; i < 2; i++)
{
//default values
players[i].ProfileID = -1;
players[i].ProfileID = Guid.Empty;
}
//try to fill with the right data
PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeNames.cs
+2 -1
View File
@@ -15,6 +15,7 @@
// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
#endregion
using System;
using System.Collections.Generic;
using VocaluxeLib.Menu;
@@ -49,7 +50,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
SetPartyModeData(2, _PartyMode.GameData.NumPlayerTeam1 + _PartyMode.GameData.NumPlayerTeam2,
new int[] {_PartyMode.GameData.NumPlayerTeam1, _PartyMode.GameData.NumPlayerTeam2});
List<int>[] ids = new List<int>[] {_PartyMode.GameData.ProfileIDsTeam1, _PartyMode.GameData.ProfileIDsTeam2};
List<Guid>[] ids = new List<Guid>[] {_PartyMode.GameData.ProfileIDsTeam1, _PartyMode.GameData.ProfileIDsTeam2};
SetPartyModeProfiles(ids);
}
PartyModes/PartyModeTicTacToe/PartyModeTicTacToe.csproj
+9 -3
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">DebugWin</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,8 +10,9 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>VocaluxeLib.PartyModes.TicTacToe</RootNamespace>
<AssemblyName>TicTacToe</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWin|AnyCPU'">
@@ -25,6 +26,7 @@
<WarningLevel>4</WarningLevel>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<CodeAnalysisRuleSet>..\..\CheckingRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWin|AnyCPU'">
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -36,6 +38,7 @@
<UseVSHostingProcess>false</UseVSHostingProcess>
<DefineConstants>WIN</DefineConstants>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugLinux|AnyCPU'">
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -47,6 +50,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseLinux|AnyCPU'">
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -58,6 +62,7 @@
<UseVSHostingProcess>false</UseVSHostingProcess>
<DefineConstants>LINUX</DefineConstants>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'InstallerWin|AnyCPU'">
<OutputPath>bin</OutputPath>
@@ -68,6 +73,7 @@
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Compile Include="CPartyScreenTicTacToeSongs.cs" />
Vocaluxe/Base/CConfig.cs
+1 -1
View File
@@ -837,7 +837,7 @@ namespace Vocaluxe.Base
for (int j = 0; j < CSettings.MaxNumPlayer; j++)
{
CGame.Players[j].ProfileID = -1;
CGame.Players[j].ProfileID = Guid.Empty;
if (string.IsNullOrEmpty(Config.Game.Players[j]))
continue;
Vocaluxe/Base/CMain.cs
+10 -5
View File
@@ -656,17 +656,22 @@ namespace Vocaluxe.Base
return CProfiles.GetProfiles();
}
public EGameDifficulty GetDifficulty(int profileID)
public int GetNum()
{
return CProfiles.NumProfiles;
}
public EGameDifficulty GetDifficulty(Guid profileID)
{
return CProfiles.GetDifficulty(profileID);
}
public string GetPlayerName(int profileID, int playerNum = 0)
public string GetPlayerName(Guid profileID, int playerNum = 0)
{
return CProfiles.GetPlayerName(profileID, playerNum);
}
public CTextureRef GetAvatar(int profileID)
public CTextureRef GetAvatar(Guid profileID)
{
return CProfiles.GetAvatarTextureFromProfile(profileID);
}
@@ -676,12 +681,12 @@ namespace Vocaluxe.Base
return CProfiles.GetAvatarByFilename(fileName);
}
public bool IsProfileIDValid(int profileID)
public bool IsProfileIDValid(Guid profileID)
{
return CProfiles.IsProfileIDValid(profileID);
}
public bool IsGuest(int profileID)
public bool IsGuest(Guid profileID)
{
return CProfiles.IsGuestProfile(profileID);
}
Vocaluxe/Base/CProfiles.cs
+36 -44
View File
@@ -45,13 +45,12 @@ namespace Vocaluxe.Base
public CProfile Profile;
public CAvatar Avatar;
public EAction Action;
public int ProfileID;
public Guid ProfileID;
}
#endregion enums and structs
#region private vars
private static Dictionary<int, CProfile> _Profiles;
private static Queue<int> _ProfileIDs;
private static Dictionary<Guid, CProfile> _Profiles;
private static Dictionary<int, CAvatar> _Avatars;
private static Queue<int> _AvatarIDs;
@@ -84,10 +83,7 @@ namespace Vocaluxe.Base
for (int i = 0; i < 1000; i++)
_AvatarIDs.Enqueue(i);
_Profiles = new Dictionary<int, CProfile>();
_ProfileIDs = new Queue<int>(100);
for (int i = 0; i < 100; i++)
_ProfileIDs.Enqueue(i);
_Profiles = new Dictionary<Guid, CProfile>();
LoadProfiles();
}
@@ -117,7 +113,7 @@ namespace Vocaluxe.Base
if (newProf == null)
break;
newProf.ID = _ProfileIDs.Dequeue();
newProf.ID = Guid.NewGuid();
if (newProf.Avatar == null)
newProf.Avatar = _Avatars.Values.First();
else if (newProf.Avatar.ID < 0)
@@ -256,7 +252,7 @@ namespace Vocaluxe.Base
}
}
public static void DeleteProfile(int profileID)
public static void DeleteProfile(Guid profileID)
{
if (!IsProfileIDValid(profileID))
return;
@@ -305,7 +301,7 @@ namespace Vocaluxe.Base
return list.ToArray();
}
public static CProfile GetProfile(int profileID)
public static CProfile GetProfile(Guid profileID)
{
if (!IsProfileIDValid(profileID))
return null;
@@ -324,7 +320,7 @@ namespace Vocaluxe.Base
return result;
}
public static int NewProfile(string fileName = "")
public static Guid NewProfile(string fileName = "")
{
var profile = new CProfile
{
@@ -332,9 +328,9 @@ namespace Vocaluxe.Base
};
if (File.Exists(profile.FilePath))
return -1;
return Guid.Empty;
profile.ID = _ProfileIDs.Dequeue();
profile.ID = Guid.NewGuid();
_Profiles.Add(profile.ID, profile);
_ProfilesChanged = true;
return profile.ID;
@@ -354,11 +350,11 @@ namespace Vocaluxe.Base
public static void SaveProfiles()
{
foreach (int id in _Profiles.Keys)
foreach (Guid id in _Profiles.Keys)
_Profiles[id].SaveProfile();
}
public static bool IsProfileIDValid(int profileID)
public static bool IsProfileIDValid(Guid profileID)
{
return _Profiles.ContainsKey(profileID);
}
@@ -370,7 +366,7 @@ namespace Vocaluxe.Base
#endregion public methods
#region profile properties
public static string GetPlayerName(int profileID, int playerNum = 0)
public static string GetPlayerName(Guid profileID, int playerNum = 0)
{
if (IsProfileIDValid(profileID))
return _Profiles[profileID].PlayerName;
@@ -381,7 +377,7 @@ namespace Vocaluxe.Base
return playerName;
}
public static void SetPlayerName(int profileID, string playerName)
public static void SetPlayerName(Guid profileID, string playerName)
{
if (!IsProfileIDValid(profileID))
return;
@@ -389,7 +385,7 @@ namespace Vocaluxe.Base
_Profiles[profileID].PlayerName = playerName;
}
public static string GetProfileFileName(int profileID)
public static string GetProfileFileName(Guid profileID)
{
if (!IsProfileIDValid(profileID))
return String.Empty;
@@ -397,7 +393,7 @@ namespace Vocaluxe.Base
return Path.GetFileName(_Profiles[profileID].FilePath);
}
public static string AddGetPlayerName(int profileID, char chr)
public static string AddGetPlayerName(Guid profileID, char chr)
{
if (!IsProfileIDValid(profileID))
return String.Empty;
@@ -406,7 +402,7 @@ namespace Vocaluxe.Base
return _Profiles[profileID].PlayerName;
}
public static string GetDeleteCharInPlayerName(int profileID)
public static string GetDeleteCharInPlayerName(Guid profileID)
{
if (!IsProfileIDValid(profileID))
return String.Empty;
@@ -418,12 +414,12 @@ namespace Vocaluxe.Base
return profile.PlayerName;
}
public static EGameDifficulty GetDifficulty(int profileID)
public static EGameDifficulty GetDifficulty(Guid profileID)
{
return IsProfileIDValid(profileID) ? _Profiles[profileID].Difficulty : EGameDifficulty.TR_CONFIG_NORMAL;
}
public static void SetDifficulty(int profileID, EGameDifficulty difficulty)
public static void SetDifficulty(Guid profileID, EGameDifficulty difficulty)
{
if (!IsProfileIDValid(profileID))
return;
@@ -431,12 +427,12 @@ namespace Vocaluxe.Base
_Profiles[profileID].Difficulty = difficulty;
}
public static EUserRole GetUserRoleProfile(int profileID)
public static EUserRole GetUserRoleProfile(Guid profileID)
{
return IsProfileIDValid(profileID) ? _Profiles[profileID].UserRole : EUserRole.TR_USERROLE_GUEST;
}
public static void SetUserRoleProfile(int profileID, EUserRole option)
public static void SetUserRoleProfile(Guid profileID, EUserRole option)
{
if (!IsProfileIDValid(profileID))
return;
@@ -446,12 +442,12 @@ namespace Vocaluxe.Base
_Profiles[profileID].UserRole = (_Profiles[profileID].UserRole & ~mask) | option;
}
public static EOffOn GetActive(int profileID)
public static EOffOn GetActive(Guid profileID)
{
return IsProfileIDValid(profileID) ? _Profiles[profileID].Active : EOffOn.TR_CONFIG_OFF;
}
public static void SetActive(int profileID, EOffOn option)
public static void SetActive(Guid profileID, EOffOn option)
{
if (!IsProfileIDValid(profileID))
return;
@@ -459,7 +455,7 @@ namespace Vocaluxe.Base
_Profiles[profileID].Active = option;
}
public static bool IsGuestProfile(int profileID)
public static bool IsGuestProfile(Guid profileID)
{
if (!IsProfileIDValid(profileID))
return true; // this will prevent from saving dummy profiles to highscore db
@@ -467,14 +463,14 @@ namespace Vocaluxe.Base
return _Profiles[profileID].UserRole <= EUserRole.TR_USERROLE_GUEST;
}
public static bool IsActive(int profileID)
public static bool IsActive(Guid profileID)
{
if (!IsProfileIDValid(profileID))
return false;
return _Profiles[profileID].Active == EOffOn.TR_CONFIG_ON;
}
public static void SetAvatar(int profileID, int avatarID)
public static void SetAvatar(Guid profileID, int avatarID)
{
if (!IsProfileIDValid(profileID) || !IsAvatarIDValid(avatarID))
return;
@@ -482,7 +478,7 @@ namespace Vocaluxe.Base
_Profiles[profileID].Avatar = _Avatars[avatarID];
}
public static int GetAvatarID(int profileID)
public static int GetAvatarID(Guid profileID)
{
if (!IsProfileIDValid(profileID) || _Profiles[profileID].Avatar == null)
return -1;
@@ -490,7 +486,7 @@ namespace Vocaluxe.Base
return _Profiles[profileID].Avatar.ID;
}
public static CAvatar GetAvatar(int profileID)
public static CAvatar GetAvatar(Guid profileID)
{
if (!IsProfileIDValid(profileID))
return null;
@@ -498,7 +494,8 @@ namespace Vocaluxe.Base
return _Profiles[profileID].Avatar;
}
public static int GetProfileID(int num)
//TODO: Remove this?
public static Guid GetProfileID(Guid num)
{
return _Profiles[num].ID;
}
@@ -513,7 +510,7 @@ namespace Vocaluxe.Base
return _Avatars[avatarID].Texture;
}
public static CTextureRef GetAvatarTextureFromProfile(int profileID)
public static CTextureRef GetAvatarTextureFromProfile(Guid profileID)
{
if (!IsProfileIDValid(profileID) || _Profiles[profileID].Avatar == null)
return null;
@@ -530,9 +527,9 @@ namespace Vocaluxe.Base
var knownFiles = new List<string>();
if (_Profiles.Count > 0)
{
var ids = new int[_Profiles.Keys.Count];
var ids = new Guid[_Profiles.Keys.Count];
_Profiles.Keys.CopyTo(ids, 0);
foreach (int id in ids)
foreach (Guid id in ids)
{
if (_Profiles[id].LoadProfile())
knownFiles.Add(Path.GetFileName(_Profiles[id].FilePath));
@@ -554,10 +551,7 @@ namespace Vocaluxe.Base
var profile = new CProfile();
if (profile.LoadProfile(file))
{
profile.ID = _ProfileIDs.Dequeue();
_Profiles.Add(profile.ID, profile);
}
}
_ProfilesChanged = true;
}
@@ -597,7 +591,7 @@ namespace Vocaluxe.Base
_ProfilesChanged = true;
}
private static void _DeleteProfile(int profileID)
private static void _DeleteProfile(Guid profileID)
{
if (!IsProfileIDValid(profileID))
return;
@@ -625,10 +619,8 @@ namespace Vocaluxe.Base
//Check if profile is selected in game
for (int i = 0; i < CGame.Players.Length; i++)
{
if (CGame.Players[i].ProfileID > profileID)
CGame.Players[i].ProfileID--;
else if (CGame.Players[i].ProfileID == profileID)
CGame.Players[i].ProfileID = -1;
if (CGame.Players[i].ProfileID == profileID)
CGame.Players[i].ProfileID = Guid.Empty;
}
}
catch (Exception)
@@ -638,7 +630,7 @@ namespace Vocaluxe.Base
_ProfilesChanged = true;
}
private static void _RemoveProfile(int profileID)
private static void _RemoveProfile(Guid profileID)
{
if (!IsProfileIDValid(profileID))
return;
Vocaluxe/Base/Server/CVocaluxeServer.cs
+8 -8
View File
@@ -388,7 +388,7 @@ namespace Vocaluxe.Base.Server
}
#region profile
public static SProfileData GetProfileData(int profileId, bool isReadonly)
public static SProfileData GetProfileData(Guid profileId, bool isReadonly)
{
CProfile profile = CProfiles.GetProfile(profileId);
if (profile == null)
@@ -807,7 +807,7 @@ namespace Vocaluxe.Base.Server
#endregion
#region user management
public static bool ValidatePassword(int profileId, string password)
public static bool ValidatePassword(Guid profileId, string password)
{
CProfile profile = CProfiles.GetProfile(profileId);
if (profile == null)
@@ -824,7 +824,7 @@ namespace Vocaluxe.Base.Server
return _Hash((new UTF8Encoding()).GetBytes(password), salt).SequenceEqual(profile.PasswordHash);
}
public static bool ValidatePassword(int profileId, byte[] hashedPassword)
public static bool ValidatePassword(Guid profileId, byte[] hashedPassword)
{
CProfile profile = CProfiles.GetProfile(profileId);
if (profile == null)
@@ -841,7 +841,7 @@ namespace Vocaluxe.Base.Server
return hashedPassword.SequenceEqual(profile.PasswordHash);
}
private static byte[] _GetPasswordSalt(int profileId)
private static byte[] _GetPasswordSalt(Guid profileId)
{
CProfile profile = CProfiles.GetProfile(profileId);
if (profile == null)
@@ -853,7 +853,7 @@ namespace Vocaluxe.Base.Server
return profile.PasswordSalt;
}
public static int GetUserRole(int profileId)
public static int GetUserRole(Guid profileId)
{
CProfile profile = CProfiles.GetProfile(profileId);
if (profile == null)
@@ -865,7 +865,7 @@ namespace Vocaluxe.Base.Server
return (int)(profile.UserRole);
}
public static void SetUserRole(int profileId, int userRole)
public static void SetUserRole(Guid profileId, int userRole)
{
CProfile profile = CProfiles.GetProfile(profileId);
if (profile == null)
@@ -884,9 +884,9 @@ namespace Vocaluxe.Base.Server
CProfiles.SaveProfiles();
}
public static int GetUserIdFromUsername(string username)
public static Guid GetUserIdFromUsername(string username)
{
IEnumerable<int> playerIds = (from p in CProfiles.GetProfiles()
IEnumerable<Guid> playerIds = (from p in CProfiles.GetProfiles()
where String.Equals(p.PlayerName, username, StringComparison.OrdinalIgnoreCase)
select p.ID);
try
Vocaluxe/Base/Server/CWebservice.cs
+10 -10
View File
@@ -61,7 +61,7 @@ namespace Vocaluxe.Base.Server
}
#region profile
public int GetOwnProfileId()
public Guid GetOwnProfileId()
{
Guid sessionKey = _GetSession();
if (sessionKey == Guid.Empty)
@@ -71,17 +71,17 @@ namespace Vocaluxe.Base.Server
WebOperationContext.Current.OutgoingResponse.StatusCode = HttpStatusCode.Forbidden;
WebOperationContext.Current.OutgoingResponse.StatusDescription = "No session";
}
return -1;
return Guid.Empty;
}
int profileId = CSessionControl.GetUserIdFromSession(sessionKey);
if (profileId < 0)
Guid profileId = CSessionControl.GetUserIdFromSession(sessionKey);
if (profileId == Guid.Empty)
{
if (WebOperationContext.Current != null)
{
WebOperationContext.Current.OutgoingResponse.StatusCode = HttpStatusCode.Forbidden;
WebOperationContext.Current.OutgoingResponse.StatusDescription = "No session";
}
return -1;
return Guid.Empty;
}
return profileId;
}
@@ -90,7 +90,7 @@ namespace Vocaluxe.Base.Server
{
Guid sessionKey = _GetSession();
if (profile.ProfileId != -1) //-1 is the id for a new profile
if (profile.ProfileId != Guid.Empty) //-1 is the id for a new profile
{
if (CSessionControl.GetUserIdFromSession(sessionKey) != profile.ProfileId
&& !(_CheckRight(EUserRights.EditAllProfiles)))
@@ -100,7 +100,7 @@ namespace Vocaluxe.Base.Server
CVocaluxeServer.DoTask(CVocaluxeServer.SendProfileData, profile);
}
public SProfileData GetProfile(int profileId)
public SProfileData GetProfile(Guid profileId)
{
Guid sessionKey = _GetSession();
if (CSessionControl.GetUserIdFromSession(sessionKey) == profileId || _CheckRight(EUserRights.ViewOtherProfiles))
@@ -146,7 +146,7 @@ namespace Vocaluxe.Base.Server
public void Logout()
{
Guid sessionKey = _GetSession();
CSessionControl.InvalidateSessions(sessionKey);
CSessionControl.InvalidateSessionByID(sessionKey);
}
public Stream Index()
@@ -501,12 +501,12 @@ namespace Vocaluxe.Base.Server
#endregion
#region user management
public int GetUserRole(int profileId)
public int GetUserRole(Guid profileId)
{
return CVocaluxeServer.DoTask(CVocaluxeServer.GetUserRole, profileId);
}
public void SetUserRole(int profileId, int userRole)
public void SetUserRole(Guid profileId, int userRole)
{
if (_CheckRight(EUserRights.EditAllProfiles))
CVocaluxeServer.DoTaskWithoutReturn(CVocaluxeServer.SetUserRole, profileId, userRole);
Vocaluxe/Base/Server/ICWebservice.cs
+4 -4
View File
@@ -39,7 +39,7 @@ namespace Vocaluxe.Base.Server
[OperationContract, WebInvoke(Method = "GET",
ResponseFormat = WebMessageFormat.Json,
UriTemplate = "/getOwnProfileId")]
int GetOwnProfileId();
Guid GetOwnProfileId();
[OperationContract, WebInvoke(Method = "POST",
ResponseFormat = WebMessageFormat.Json,
@@ -49,7 +49,7 @@ namespace Vocaluxe.Base.Server
[OperationContract, WebInvoke(Method = "GET",
ResponseFormat = WebMessageFormat.Json,
UriTemplate = "/getProfile?profileId={profileId}")]
SProfileData GetProfile(int profileId);
SProfileData GetProfile(Guid profileId);
[OperationContract, WebInvoke(Method = "GET",
ResponseFormat = WebMessageFormat.Json,
@@ -195,12 +195,12 @@ namespace Vocaluxe.Base.Server
[OperationContract, WebInvoke(Method = "GET",
ResponseFormat = WebMessageFormat.Json,
UriTemplate = "/getUserRole?profileId={profileId}")]
int GetUserRole(int profileId);
int GetUserRole(Guid profileId);
[OperationContract, WebInvoke(Method = "GET",
ResponseFormat = WebMessageFormat.Json,
UriTemplate = "/setUserRole?profileId={profileId}&userRole={userRole}")]
void SetUserRole(int profileId, int userRole);
void SetUserRole(Guid profileId, int userRole);
[OperationContract, WebInvoke(Method = "GET",
ResponseFormat = WebMessageFormat.Json,
Vocaluxe/Base/Server/Session.cs
+3 -3
View File
@@ -27,8 +27,8 @@ namespace Vocaluxe.Base.Server
get { return _ID; }
}
private readonly int _ProfileId;
public int ProfileId
private readonly Guid _ProfileId;
public Guid ProfileId
{
get { return _ProfileId; }
}
@@ -46,7 +46,7 @@ namespace Vocaluxe.Base.Server
internal set { _LastSeen = value; }
}
public CSession(Guid id, int profileId, EUserRoles roles)
public CSession(Guid id, Guid profileId, EUserRoles roles)
{
_ID = id;
_ProfileId = profileId;
Vocaluxe/Base/Server/SessionControl.cs
+8 -8
View File
@@ -44,7 +44,7 @@ namespace Vocaluxe.Base.Server
foreach (var sessionToRemove in sessionIdsToRemove)
{
InvalidateSessions(sessionToRemove);
InvalidateSessionByID(sessionToRemove);
}
}
@@ -54,7 +54,7 @@ namespace Vocaluxe.Base.Server
return Guid.Empty;
Guid newId = Guid.NewGuid();
int id = _GetProfileIdFormUsername(userName);
Guid id = _GetProfileIdFormUsername(userName);
EUserRoles roles = _GetUserRoles(id);
CSession session = new CSession(newId, id, roles);
//InvalidateSessions(id);
@@ -68,17 +68,17 @@ namespace Vocaluxe.Base.Server
return CVocaluxeServer.ValidatePassword(_GetProfileIdFormUsername(userName), password);
}
private static int _GetProfileIdFormUsername(string username)
private static Guid _GetProfileIdFormUsername(string username)
{
return CVocaluxeServer.GetUserIdFromUsername(username);
}
private static EUserRoles _GetUserRoles(int profileId)
private static EUserRoles _GetUserRoles(Guid profileId)
{
return (EUserRoles)CVocaluxeServer.GetUserRole(profileId);
}
internal static void InvalidateSessions(int profileId)
internal static void InvalidateSessionByProfile(Guid profileId)
{
foreach (KeyValuePair<Guid, CSession> s in (from kv in _ActiveSessions
where kv.Value.ProfileId == profileId
@@ -86,7 +86,7 @@ namespace Vocaluxe.Base.Server
_ActiveSessions.Remove(s.Key);
}
internal static void InvalidateSessions(Guid sessionId)
internal static void InvalidateSessionByID(Guid sessionId)
{
if (_ActiveSessions.ContainsKey(sessionId))
{
@@ -100,10 +100,10 @@ namespace Vocaluxe.Base.Server
.HasFlag(requestedRight)));
}
internal static int GetUserIdFromSession(Guid sessionId)
internal static Guid GetUserIdFromSession(Guid sessionId)
{
if (!_ActiveSessions.ContainsKey(sessionId))
return -1;
return Guid.Empty;
return _ActiveSessions[sessionId].ProfileId;
}
Vocaluxe/Base/Server/VocaluxeStructs.cs
+1 -1
View File
@@ -56,7 +56,7 @@ namespace Vocaluxe.Base.Server
[DataMember]
public int Difficulty;
[DataMember]
public int ProfileId;
public Guid ProfileId;
[DataMember]
public bool IsEditable;
[DataMember]
Vocaluxe/Screens/CScreenNames.cs
+22 -22
View File
@@ -61,7 +61,7 @@ namespace Vocaluxe.Screens
private bool _SelectingFast;
private int _SelectingSwitchNr = -1;
private int _SelectingFastPlayerNr;
private int _SelectedProfileID = -1;
private Guid _SelectedProfileID = Guid.Empty;
private bool _AvatarsChanged;
private bool _ProfilesChanged;
@@ -177,9 +177,9 @@ namespace Vocaluxe.Screens
{
case Keys.Enter:
//Check, if a player is selected
if (_NameSelections[_NameSelection].Selection > -1)
if (_NameSelections[_NameSelection].SelectedID != Guid.Empty)
{
_SelectedProfileID = _NameSelections[_NameSelection].Selection;
_SelectedProfileID = _NameSelections[_NameSelection].SelectedID;
if (!CProfiles.IsProfileIDValid(_SelectedProfileID))
return true;
@@ -359,7 +359,7 @@ namespace Vocaluxe.Screens
base.HandleMouse(mouseEvent);
//Check if LeftButton is hold and Select-Mode inactive
if (mouseEvent.LBH && _SelectedProfileID < 0 && !_SelectingFast)
if (mouseEvent.LBH && _SelectedProfileID == Guid.Empty && !_SelectingFast)
{
//Save mouse-coords
_OldMouseX = mouseEvent.X;
@@ -368,8 +368,8 @@ namespace Vocaluxe.Screens
if (_NameSelections[_NameSelection].IsOverTile(mouseEvent))
{
//Get player-number of tile
_SelectedProfileID = _NameSelections[_NameSelection].TilePlayerNr(mouseEvent);
if (_SelectedProfileID != -1)
_SelectedProfileID = _NameSelections[_NameSelection].TilePlayerID(mouseEvent);
if (_SelectedProfileID != Guid.Empty)
{
//Update of Drag/Drop-Texture
CStatic selectedPlayer = _NameSelections[_NameSelection].TilePlayerAvatar(mouseEvent);
@@ -402,7 +402,7 @@ namespace Vocaluxe.Screens
}
//Check if LeftButton is hold and Select-Mode active
if (mouseEvent.LBH && _SelectedProfileID >= 0 && !_SelectingFast)
if (mouseEvent.LBH && _SelectedProfileID != Guid.Empty && !_SelectingFast)
{
//Update coords for Drag/Drop-Texture
_ChooseAvatarStatic.X += mouseEvent.X - _OldMouseX;
@@ -411,7 +411,7 @@ namespace Vocaluxe.Screens
_OldMouseY = mouseEvent.Y;
}
// LeftButton isn't hold anymore, but Select-Mode is still active -> "Drop" of Avatar
else if (_SelectedProfileID >= 0 && !_SelectingFast)
else if (_SelectedProfileID != Guid.Empty && !_SelectingFast)
{
//Foreach Drop-Area
for (int i = 0; i < _StaticPlayer.Length; i++)
@@ -422,7 +422,7 @@ namespace Vocaluxe.Screens
//Check if Mouse is in area
if (CHelper.IsInBounds(_Statics[_StaticPlayer[i]].Rect, mouseEvent))
{
if (_SelectingSwitchNr > -1 && CGame.Players[i].ProfileID > -1)
if (_SelectingSwitchNr > -1 && CGame.Players[i].ProfileID != Guid.Empty)
_UpdateSelectedProfile(_SelectingSwitchNr, CGame.Players[i].ProfileID);
else if (_SelectingSwitchNr > -1)
_ResetPlayerSelection(_SelectingSwitchNr);
@@ -438,7 +438,7 @@ namespace Vocaluxe.Screens
_ResetPlayerSelection(_SelectingSwitchNr);
}
_SelectingSwitchNr = -1;
_SelectedProfileID = -1;
_SelectedProfileID = Guid.Empty;
//Reset variables
_ChooseAvatarStatic.Visible = false;
}
@@ -448,8 +448,8 @@ namespace Vocaluxe.Screens
if (_NameSelections[_NameSelection].IsOverTile(mouseEvent))
{
//Get player-number of tile
_SelectedProfileID = _NameSelections[_NameSelection].TilePlayerNr(mouseEvent);
if (_SelectedProfileID != -1)
_SelectedProfileID = _NameSelections[_NameSelection].TilePlayerID(mouseEvent);
if (_SelectedProfileID != Guid.Empty)
{
if (!CProfiles.IsProfileIDValid(_SelectedProfileID))
return true;
@@ -480,12 +480,12 @@ namespace Vocaluxe.Screens
if (mouseEvent.LD && _NameSelections[_NameSelection].IsOverTile(mouseEvent) && !_SelectingFast)
{
_SelectedProfileID = _NameSelections[_NameSelection].TilePlayerNr(mouseEvent);
if (_SelectedProfileID > -1)
_SelectedProfileID = _NameSelections[_NameSelection].TilePlayerID(mouseEvent);
if (_SelectedProfileID != Guid.Empty)
{
for (int i = 0; i < CGame.NumPlayers; i++)
{
if (CGame.Players[i].ProfileID == -1)
if (CGame.Players[i].ProfileID == Guid.Empty)
{
if (!CProfiles.IsProfileIDValid(_SelectedProfileID))
return true;
@@ -657,7 +657,7 @@ namespace Vocaluxe.Screens
_Statics["StaticPlayerAvatar" + i].Visible = true;
_Texts["TextPlayer" + i].Visible = true;
if (_Texts["TextPlayer" + i].Text == "")
_Texts["TextPlayer" + i].Text = CProfiles.GetPlayerName(-1, i);
_Texts["TextPlayer" + i].Text = CProfiles.GetPlayerName(Guid.Empty, i);
_Equalizers["EqualizerPlayer" + i].Visible = true;
if (CGame.GetNumSongs() == 1 && CGame.GetSong(0).IsDuet)
_SelectSlides["SelectSlideDuetPlayer" + i].Visible = true;
@@ -677,7 +677,7 @@ namespace Vocaluxe.Screens
_CheckPlayers();
}
private void _UpdateSelectedProfile(int playerNum, int profileId)
private void _UpdateSelectedProfile(int playerNum, Guid profileId)
{
_NameSelections[_NameSelection].RemoveUsedProfile(CGame.Players[playerNum].ProfileID);
_NameSelections[_NameSelection].UseProfile(profileId);
@@ -700,12 +700,12 @@ namespace Vocaluxe.Screens
for (int i = 0; i < CGame.NumPlayers; i++)
{
_NameSelections[_NameSelection].RemoveUsedProfile(CGame.Players[i].ProfileID);
CGame.Players[i].ProfileID = -1;
CGame.Players[i].ProfileID = Guid.Empty;
//Update config for default players.
CConfig.Config.Game.Players[i] = String.Empty;
//Update texture and name
_Statics[_StaticPlayerAvatar[i]].Texture = _OriginalPlayerAvatarTextures[i];
_Texts[_TextPlayer[i]].Text = CProfiles.GetPlayerName(-1, i + 1);
_Texts[_TextPlayer[i]].Text = CProfiles.GetPlayerName(Guid.Empty, i + 1);
}
_NameSelections[_NameSelection].UpdateList();
CConfig.SaveConfig();
@@ -714,13 +714,13 @@ namespace Vocaluxe.Screens
private void _ResetPlayerSelection(int playerNum)
{
_NameSelections[_NameSelection].RemoveUsedProfile(CGame.Players[playerNum].ProfileID);
CGame.Players[playerNum].ProfileID = -1;
CGame.Players[playerNum].ProfileID = Guid.Empty;
//Update config for default players.
CConfig.Config.Game.Players[playerNum] = String.Empty;
CConfig.SaveConfig();
//Update texture and name
_Statics[_StaticPlayerAvatar[playerNum]].Texture = _OriginalPlayerAvatarTextures[playerNum];
_Texts[_TextPlayer[playerNum]].Text = CProfiles.GetPlayerName(-1, playerNum + 1);
_Texts[_TextPlayer[playerNum]].Text = CProfiles.GetPlayerName(Guid.Empty, playerNum + 1);
//Update profile-warning
_CheckPlayers();
//Update Tiles-List
@@ -770,7 +770,7 @@ namespace Vocaluxe.Screens
var playerWithoutProfile = new List<int>();
for (int player = 0; player < CConfig.Config.Game.NumPlayers; player++)
{
if (CGame.Players[player].ProfileID < 0)
if (CGame.Players[player].ProfileID == Guid.Empty)
playerWithoutProfile.Add(player + 1);
}
Vocaluxe/Screens/CScreenProfiles.cs
+49 -29
View File
@@ -16,6 +16,7 @@
#endregion
using System;
using System.Linq;
using System.Collections.Generic;
using System.Drawing;
using System.Drawing.Imaging;
@@ -62,6 +63,8 @@ namespace Vocaluxe.Screens
private bool _ProfilesChanged;
private bool _AvatarsChanged;
private Dictionary<int, Guid> _SelectSlideGuids = new Dictionary<int, Guid>();
private EEditMode _EditMode;
private CTextureRef _WebcamTexture;
@@ -109,7 +112,7 @@ namespace Vocaluxe.Screens
break;
case EEditMode.PlayerName:
_SelectSlides[_SelectSlideProfiles].RenameValue(
CProfiles.AddGetPlayerName(_SelectSlides[_SelectSlideProfiles].SelectedTag, keyEvent.Unicode));
CProfiles.AddGetPlayerName(_GetIdFromTag(_SelectSlides[_SelectSlideProfiles].SelectedTag), keyEvent.Unicode));
_ProfilesChanged = true;
break;
}
@@ -155,7 +158,7 @@ namespace Vocaluxe.Screens
if (_EditMode == EEditMode.PlayerName)
{
_SelectSlides[_SelectSlideProfiles].RenameValue(
CProfiles.GetDeleteCharInPlayerName(_SelectSlides[_SelectSlideProfiles].SelectedTag));
CProfiles.GetDeleteCharInPlayerName(_GetIdFromTag(_SelectSlides[_SelectSlideProfiles].SelectedTag)));
_ProfilesChanged = true;
}
else
@@ -168,22 +171,22 @@ namespace Vocaluxe.Screens
}
if (_SelectSlides[_SelectSlideDifficulty].Selected)
{
CProfiles.SetDifficulty(_SelectSlides[_SelectSlideProfiles].SelectedTag,
CProfiles.SetDifficulty(_GetIdFromTag(_SelectSlides[_SelectSlideProfiles].SelectedTag),
(EGameDifficulty)_SelectSlides[_SelectSlideDifficulty].Selection);
}
else if (_SelectSlides[_SelectSlideAvatars].Selected)
{
CProfiles.SetAvatar(_SelectSlides[_SelectSlideProfiles].SelectedTag,
CProfiles.SetAvatar(_GetIdFromTag(_SelectSlides[_SelectSlideProfiles].SelectedTag),
_SelectSlides[_SelectSlideAvatars].SelectedTag);
}
else if (_SelectSlides[_SelectSlideUserRole].Selected)
{
CProfiles.SetUserRoleProfile(_SelectSlides[_SelectSlideProfiles].SelectedTag,
CProfiles.SetUserRoleProfile(_GetIdFromTag(_SelectSlides[_SelectSlideProfiles].SelectedTag),
(EUserRole)_SelectSlides[_SelectSlideUserRole].Selection);
}
else if (_SelectSlides[_SelectSlideActive].Selected)
{
CProfiles.SetActive(_SelectSlides[_SelectSlideProfiles].SelectedTag,
CProfiles.SetActive(_GetIdFromTag(_SelectSlides[_SelectSlideProfiles].SelectedTag),
(EOffOn)_SelectSlides[_SelectSlideActive].Selection);
}
}
@@ -215,24 +218,24 @@ namespace Vocaluxe.Screens
}
else if (_SelectSlides[_SelectSlideDifficulty].Selected)
{
CProfiles.SetDifficulty(_SelectSlides[_SelectSlideProfiles].SelectedTag,
CProfiles.SetDifficulty(_GetIdFromTag(_SelectSlides[_SelectSlideProfiles].SelectedTag),
(EGameDifficulty)_SelectSlides[_SelectSlideDifficulty].Selection);
}
else if (_SelectSlides[_SelectSlideAvatars].Selected)
{
CProfiles.SetAvatar(_SelectSlides[_SelectSlideProfiles].SelectedTag,
CProfiles.SetAvatar(_GetIdFromTag(_SelectSlides[_SelectSlideProfiles].SelectedTag),
_SelectSlides[_SelectSlideAvatars].SelectedTag);
if (CWebcam.IsDeviceAvailable() && _WebcamTexture != null)
_OnDiscardSnapshot();
}
else if (_SelectSlides[_SelectSlideUserRole].Selected)
{
CProfiles.SetUserRoleProfile(_SelectSlides[_SelectSlideProfiles].SelectedTag,
CProfiles.SetUserRoleProfile(_GetIdFromTag(_SelectSlides[_SelectSlideProfiles].SelectedTag),
(EUserRole)_SelectSlides[_SelectSlideUserRole].Selection);
}
else if (_SelectSlides[_SelectSlideActive].Selected)
{
CProfiles.SetActive(_SelectSlides[_SelectSlideProfiles].SelectedTag,
CProfiles.SetActive(_GetIdFromTag(_SelectSlides[_SelectSlideProfiles].SelectedTag),
(EOffOn)_SelectSlides[_SelectSlideActive].Selection);
}
else if (_Buttons[_ButtonWebcam].Selected)
@@ -260,15 +263,15 @@ namespace Vocaluxe.Screens
if (_SelectSlides[_SelectSlideProfiles].Selection > -1)
{
_Buttons[_ButtonPlayerName].Text.Text = CProfiles.GetPlayerName(_SelectSlides[_SelectSlideProfiles].SelectedTag);
_Buttons[_ButtonPlayerName].Text.Text = CProfiles.GetPlayerName(_GetIdFromTag(_SelectSlides[_SelectSlideProfiles].SelectedTag));
if (_EditMode == EEditMode.PlayerName)
_Buttons[_ButtonPlayerName].Text.Text += "|";
_SelectSlides[_SelectSlideDifficulty].Selection = (int)CProfiles.GetDifficulty(_SelectSlides[_SelectSlideProfiles].SelectedTag);
_SelectSlides[_SelectSlideUserRole].Selection = (int)CProfiles.GetUserRoleProfile(_SelectSlides[_SelectSlideProfiles].SelectedTag);
_SelectSlides[_SelectSlideActive].Selection = (int)CProfiles.GetActive(_SelectSlides[_SelectSlideProfiles].SelectedTag);
_SelectSlides[_SelectSlideDifficulty].Selection = (int)CProfiles.GetDifficulty(_GetIdFromTag(_SelectSlides[_SelectSlideProfiles].SelectedTag));
_SelectSlides[_SelectSlideUserRole].Selection = (int)CProfiles.GetUserRoleProfile(_GetIdFromTag(_SelectSlides[_SelectSlideProfiles].SelectedTag));
_SelectSlides[_SelectSlideActive].Selection = (int)CProfiles.GetActive(_GetIdFromTag(_SelectSlides[_SelectSlideProfiles].SelectedTag));
int avatarID = CProfiles.GetAvatarID(_SelectSlides[_SelectSlideProfiles].SelectedTag);
int avatarID = CProfiles.GetAvatarID(_GetIdFromTag(_SelectSlides[_SelectSlideProfiles].SelectedTag));
_SelectSlides[_SelectSlideAvatars].SelectedTag = avatarID;
if (_Snapshot == null)
{
@@ -363,7 +366,7 @@ namespace Vocaluxe.Screens
_Buttons[_ButtonWebcam].Visible = CWebcam.IsDeviceAvailable();
int id = CProfiles.NewAvatar(file);
CProfiles.SetAvatar(_SelectSlides[_SelectSlideProfiles].SelectedTag, id);
CProfiles.SetAvatar(_GetIdFromTag(_SelectSlides[_SelectSlideProfiles].SelectedTag), id);
_LoadAvatars(false);
_SelectElement(_Buttons[_ButtonSave]);
@@ -389,11 +392,13 @@ namespace Vocaluxe.Screens
private void _NewProfile()
{
_EditMode = EEditMode.None;
int id = CProfiles.NewProfile();
Guid id = CProfiles.NewProfile();
_LoadProfiles(false);
_SelectSlides[_SelectSlideProfiles].SelectedTag = id;
int num = CProfiles.NumProfiles;
_SelectSlides[_SelectSlideProfiles].SelectedTag = num;
_SelectSlideGuids.Add(num, id);
CProfiles.SetAvatar(_SelectSlides[_SelectSlideProfiles].SelectedTag, _SelectSlides[_SelectSlideAvatars].SelectedTag);
CProfiles.SetAvatar(id, _SelectSlides[_SelectSlideAvatars].SelectedTag);
_SelectElement(_Buttons[_ButtonPlayerName]);
_EditMode = EEditMode.PlayerName;
@@ -409,7 +414,8 @@ namespace Vocaluxe.Screens
{
_EditMode = EEditMode.None;
CProfiles.DeleteProfile(_SelectSlides[_SelectSlideProfiles].SelectedTag);
CProfiles.DeleteProfile(_GetIdFromTag(_SelectSlides[_SelectSlideProfiles].SelectedTag));
_SelectSlideGuids.Remove(_SelectSlides[_SelectSlideProfiles].SelectedTag);
int selection = _SelectSlides[_SelectSlideProfiles].Selection;
if (_SelectSlides[_SelectSlideProfiles].NumValues - 1 > selection)
@@ -422,23 +428,29 @@ namespace Vocaluxe.Screens
{
string name = String.Empty;
if (_EditMode == EEditMode.PlayerName)
name = CProfiles.GetPlayerName(_SelectSlides[_SelectSlideProfiles].SelectedTag);
name = CProfiles.GetPlayerName(_GetIdFromTag(_SelectSlides[_SelectSlideProfiles].SelectedTag));
int selectedProfileID = _SelectSlides[_SelectSlideProfiles].SelectedTag;
Guid selectedProfileID = _GetIdFromTag(_SelectSlides[_SelectSlideProfiles].SelectedTag);
_SelectSlides[_SelectSlideProfiles].Clear();
_SelectSlideGuids.Clear();
CProfile[] profiles = CProfiles.GetProfiles();
int i = 0;
foreach (CProfile profile in profiles)
_SelectSlides[_SelectSlideProfiles].AddValue(profile.PlayerName, null, profile.ID);
{
_SelectSlides[_SelectSlideProfiles].AddValue(profile.PlayerName, null, i);
_SelectSlideGuids.Add(i, profile.ID);
i++;
}
if (CProfiles.NumProfiles > 0 && CProfiles.NumAvatars > 0)
{
if (selectedProfileID != -1)
_SelectSlides[_SelectSlideProfiles].SelectedTag = selectedProfileID;
if (selectedProfileID != Guid.Empty)
_SelectSlides[_SelectSlideProfiles].SelectedTag = _SelectSlideGuids.FirstOrDefault(x => x.Value.Equals(selectedProfileID)).Key;
else
{
_SelectSlides[_SelectSlideProfiles].Selection = 0;
selectedProfileID = _SelectSlides[_SelectSlideProfiles].SelectedTag;
selectedProfileID = _GetIdFromTag(_SelectSlides[_SelectSlideProfiles].SelectedTag);
}
if (!keep)
@@ -450,7 +462,7 @@ namespace Vocaluxe.Screens
}
if (_EditMode == EEditMode.PlayerName)
CProfiles.SetPlayerName(_SelectSlides[_SelectSlideProfiles].SelectedTag, name);
CProfiles.SetPlayerName(_GetIdFromTag(_SelectSlides[_SelectSlideProfiles].SelectedTag), name);
}
_ProfilesChanged = false;
}
@@ -469,12 +481,20 @@ namespace Vocaluxe.Screens
if (keep)
{
_SelectSlides[_SelectSlideAvatars].SelectedTag = selectedAvatarID;
CProfiles.SetAvatar(_SelectSlides[_SelectSlideProfiles].SelectedTag, selectedAvatarID);
CProfiles.SetAvatar(_GetIdFromTag(_SelectSlides[_SelectSlideProfiles].SelectedTag), selectedAvatarID);
}
else
_SelectSlides[_SelectSlideAvatars].SelectedTag = CProfiles.GetAvatarID(_SelectSlides[_SelectSlideProfiles].SelectedTag);
_SelectSlides[_SelectSlideAvatars].SelectedTag = CProfiles.GetAvatarID(_GetIdFromTag(_SelectSlides[_SelectSlideProfiles].SelectedTag));
_AvatarsChanged = false;
}
private Guid _GetIdFromTag(int tag)
{
if (tag == -1 || !_SelectSlideGuids.ContainsKey(tag))
return Guid.Empty;
else
return _SelectSlideGuids[tag];
}
}
}
Vocaluxe/Screens/CScreenSing.cs
+997 -939
View File
File diff suppressed because it is too large. Load diff
Vocaluxe/Vocaluxe.csproj
+12 -2
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">DebugWin</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Vocaluxe</RootNamespace>
<AssemblyName>Vocaluxe</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<IsWebBootstrapper>false</IsWebBootstrapper>
<StartupObject>Vocaluxe.CMainProgram</StartupObject>
@@ -43,6 +43,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseWin|x86' ">
<PlatformTarget>x86</PlatformTarget>
@@ -54,6 +55,7 @@
<UseVSHostingProcess>false</UseVSHostingProcess>
<DefineConstants>WIN;ARCH_X86</DefineConstants>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWin|x64'">
<PlatformTarget>x64</PlatformTarget>
@@ -66,6 +68,7 @@
<WarningLevel>4</WarningLevel>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<CodeAnalysisRuleSet>..\CheckingRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWin|x64'">
<PlatformTarget>x64</PlatformTarget>
@@ -77,6 +80,7 @@
<UseVSHostingProcess>false</UseVSHostingProcess>
<DefineConstants>WIN;ARCH_X64</DefineConstants>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugLinux|x86' ">
<PlatformTarget>x86</PlatformTarget>
@@ -88,6 +92,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'ReleaseLinux|x86' ">
<PlatformTarget>x86</PlatformTarget>
@@ -99,6 +104,7 @@
<UseVSHostingProcess>false</UseVSHostingProcess>
<DefineConstants>LINUX;ARCH_X86</DefineConstants>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugLinux|x64'">
<PlatformTarget>x64</PlatformTarget>
@@ -110,6 +116,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseLinux|x64'">
<PlatformTarget>x64</PlatformTarget>
@@ -121,6 +128,7 @@
<UseVSHostingProcess>false</UseVSHostingProcess>
<DefineConstants>LINUX;ARCH_X64</DefineConstants>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'InstallerWin|x86'">
<PlatformTarget>x86</PlatformTarget>
@@ -132,6 +140,7 @@
<UseVSHostingProcess>false</UseVSHostingProcess>
<DefineConstants>WIN;ARCH_X86;INSTALLER</DefineConstants>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'InstallerWin|x64'">
<PlatformTarget>x64</PlatformTarget>
@@ -143,6 +152,7 @@
<UseVSHostingProcess>false</UseVSHostingProcess>
<DefineConstants>WIN;ARCH_X64;INSTALLER</DefineConstants>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Vocaluxe/app.config
+2 -2
View File
@@ -1,11 +1,11 @@
<?xml version="1.0"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/>
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<probing privatePath="libs\managed\;libs\unmanaged;libs\;.;libs\managed\x64\;libs\unmanaged\x64\;libs\x64\;.\x64\;libs\managed\x86\;libs\unmanaged\x86\;libs\x86\;.\x86\" />
<probing privatePath="libs\managed\;libs\unmanaged;libs\;.;libs\managed\x64\;libs\unmanaged\x64\;libs\x64\;.\x64\;libs\managed\x86\;libs\unmanaged\x86\;libs\x86\;.\x86\"/>
</assemblyBinding>
</runtime>
<!-- Enable for WCF tracing
VocaluxeLib/IBasic.cs
+6 -5
View File
@@ -219,12 +219,13 @@ namespace VocaluxeLib
public interface IProfiles
{
CProfile[] GetProfiles();
EGameDifficulty GetDifficulty(int profileID);
string GetPlayerName(int profileID, int playerNum = 0);
CTextureRef GetAvatar(int profileID);
int GetNum();
EGameDifficulty GetDifficulty(Guid profileID);
string GetPlayerName(Guid profileID, int playerNum = 0);
CTextureRef GetAvatar(Guid profileID);
CAvatar GetAvatarByFilename(string fileName);
bool IsProfileIDValid(int profileID);
bool IsGuest(int profileID);
bool IsProfileIDValid(Guid profileID);
bool IsGuest(Guid profileID);
void AddProfileChangedCallback(ProfileChangedCallback notification);
}
VocaluxeLib/Menu/CMenuPartyNameSelection.cs
+37 -30
View File
@@ -15,6 +15,7 @@
// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
#endregion
using System;
using System.Collections.Generic;
using System.Windows.Forms;
using VocaluxeLib.Draw;
@@ -53,7 +54,7 @@ namespace VocaluxeLib.Menu
private bool _SelectingKeyboardActive;
private bool _SelectingFast;
private int _SelectingFastPlayerNr;
private int _SelectedProfileID = -1;
private Guid _SelectedProfileID = Guid.Empty;
private CStatic _ChooseAvatarStatic;
private int _OldMouseX;
@@ -70,7 +71,7 @@ namespace VocaluxeLib.Menu
private const string _SelectSlidePlayer = "SelectSlidePlayer";
private const string _NameSelection = "NameSelection";
protected List<int>[] _TeamList;
protected List<Guid>[] _TeamList;
public override void Init()
{
@@ -98,13 +99,13 @@ namespace VocaluxeLib.Menu
_NumPlayer = numPlayer;
_NumPlayerTeams = numPlayerTeams;
_TeamList = new List<int>[_NumTeams > 0 ? _NumTeams : 1];
_TeamList = new List<Guid>[_NumTeams > 0 ? _NumTeams : 1];
if (_NumTeams != _NumPlayerTeams.Length)
_NumPlayerTeams = new int[_NumTeams];
for (int i = 0; i < _TeamList.Length; i++)
_TeamList[i] = new List<int>();
_TeamList[i] = new List<Guid>();
_UpdateSlides();
_LoadProfiles();
@@ -113,7 +114,7 @@ namespace VocaluxeLib.Menu
_UpdateNextButtonVisibility();
}
public void SetPartyModeProfiles(List<int>[] teamProfiles)
public void SetPartyModeProfiles(List<Guid>[] teamProfiles)
{
_TeamList = teamProfiles;
_UpdateSlides();
@@ -133,9 +134,9 @@ namespace VocaluxeLib.Menu
{
case Keys.Enter:
//Check, if a player is selected
if (_NameSelections[_NameSelection].Selection > -1)
if (_NameSelections[_NameSelection].SelectedID != Guid.Empty)
{
_SelectedProfileID = _NameSelections[_NameSelection].Selection;
_SelectedProfileID = _NameSelections[_NameSelection].SelectedID;
if (!CBase.Profiles.IsProfileIDValid(_SelectedProfileID))
return true;
@@ -371,7 +372,7 @@ namespace VocaluxeLib.Menu
base.HandleMouse(mouseEvent);
//Check if LeftButton is hold and Select-Mode inactive
if (mouseEvent.LBH && _SelectedProfileID < 0 && !_SelectingFast)
if (mouseEvent.LBH && _SelectedProfileID == Guid.Empty && !_SelectingFast)
{
//Save mouse-coords
_OldMouseX = mouseEvent.X;
@@ -380,8 +381,8 @@ namespace VocaluxeLib.Menu
if (_NameSelections[_NameSelection].IsOverTile(mouseEvent))
{
//Get player-number of tile
_SelectedProfileID = _NameSelections[_NameSelection].TilePlayerNr(mouseEvent);
if (_SelectedProfileID != -1)
_SelectedProfileID = _NameSelections[_NameSelection].TilePlayerID(mouseEvent);
if (_SelectedProfileID != Guid.Empty)
{
//Update of Drag/Drop-Texture
CStatic selectedPlayer = _NameSelections[_NameSelection].TilePlayerAvatar(mouseEvent);
@@ -394,7 +395,7 @@ namespace VocaluxeLib.Menu
}
}
//Check if LeftButton is hold and Select-Mode active
if (mouseEvent.LBH && _SelectedProfileID >= 0 && !_SelectingFast)
if (mouseEvent.LBH && _SelectedProfileID != Guid.Empty && !_SelectingFast)
{
//Update coords for Drag/Drop-Texture
_ChooseAvatarStatic.X += mouseEvent.X - _OldMouseX;
@@ -403,7 +404,7 @@ namespace VocaluxeLib.Menu
_OldMouseY = mouseEvent.Y;
}
// LeftButton isn't hold anymore, but Select-Mode is still active -> "Drop" of Avatar
else if (_SelectedProfileID >= 0 && !_SelectingFast)
else if (_SelectedProfileID != Guid.Empty && !_SelectingFast)
{
//Check if mouse is in drop-area
if (CHelper.IsInBounds(_SelectSlides[_SelectSlidePlayer].Rect, mouseEvent))
@@ -415,7 +416,7 @@ namespace VocaluxeLib.Menu
}
//Reset variables
_SelectedProfileID = -1;
_SelectedProfileID = Guid.Empty;
_ChooseAvatarStatic.Visible = false;
}
if (mouseEvent.LB && _SelectingFast)
@@ -423,8 +424,8 @@ namespace VocaluxeLib.Menu
if (_NameSelections[_NameSelection].IsOverTile(mouseEvent))
{
//Get player-number of tile
_SelectedProfileID = _NameSelections[_NameSelection].TilePlayerNr(mouseEvent);
if (_SelectedProfileID != -1)
_SelectedProfileID = _NameSelections[_NameSelection].TilePlayerID(mouseEvent);
if (_SelectedProfileID != Guid.Empty)
{
if (!CBase.Profiles.IsProfileIDValid(_SelectedProfileID))
return true;
@@ -473,8 +474,8 @@ namespace VocaluxeLib.Menu
if (mouseEvent.LD && _NameSelections[_NameSelection].IsOverTile(mouseEvent) && !_SelectingFast)
{
_SelectedProfileID = _NameSelections[_NameSelection].TilePlayerNr(mouseEvent);
if (_SelectedProfileID > -1)
_SelectedProfileID = _NameSelections[_NameSelection].TilePlayerID(mouseEvent);
if (_SelectedProfileID != Guid.Empty)
{
if (!CBase.Profiles.IsProfileIDValid(_SelectedProfileID))
return true;
@@ -491,7 +492,7 @@ namespace VocaluxeLib.Menu
if (_SelectSlides[_SelectSlidePlayer].Selected && _TeamList[_CurrentTeam].Count > _SelectSlides[_SelectSlidePlayer].Selection)
{
int currentSelection = _SelectSlides[_SelectSlidePlayer].Selection;
int id = _TeamList[_CurrentTeam][currentSelection];
Guid id = _TeamList[_CurrentTeam][currentSelection];
_RemovePlayer(_CurrentTeam, id);
_UpdatePlayerSlide();
exit = false;
@@ -575,9 +576,9 @@ namespace VocaluxeLib.Menu
{
_NumTeams++;
int[] numPlayerTeams = _NumPlayerTeams;
List<int>[] teamList = _TeamList;
List<Guid>[] teamList = _TeamList;
_NumPlayerTeams = new int[_NumTeams];
_TeamList = new List<int>[_NumTeams];
_TeamList = new List<Guid>[_NumTeams];
for (int i = 0; i < _NumPlayerTeams.Length; i++)
{
if (i < numPlayerTeams.Length)
@@ -588,7 +589,7 @@ namespace VocaluxeLib.Menu
else
{
_NumPlayerTeams[i] = _NumPlayer;
_TeamList[i] = new List<int>();
_TeamList[i] = new List<Guid>();
}
}
}
@@ -721,7 +722,7 @@ namespace VocaluxeLib.Menu
}
}
private void _AddPlayer(int team, int profileID)
private void _AddPlayer(int team, Guid profileID, bool updateElements=true)
{
if (_NumPlayerTeams[team] == _TeamList[team].Count && !_ChangePlayerNumDynamic)
return;
@@ -731,17 +732,20 @@ namespace VocaluxeLib.Menu
_NameSelections[_NameSelection].UseProfile(profileID);
_TeamList[team].Add(profileID);
_UpdatePlayerSlide();
_UpdateNextButtonVisibility();
if (updateElements)
{
_UpdatePlayerSlide();
_UpdateNextButtonVisibility();
}
}
private void _RemoveAllPlayer()
{
for (int t = 0; t < _TeamList.Length; t++)
{
List<int> ids = new List<int>();
List<Guid> ids = new List<Guid>();
ids.AddRange(_TeamList[t]);
foreach (int id in ids)
foreach (Guid id in ids)
_RemovePlayer(t, id);
}
}
@@ -750,7 +754,7 @@ namespace VocaluxeLib.Menu
{
if (_TeamList[team].Count > index)
{
int id = _TeamList[team][index];
Guid id = _TeamList[team][index];
_TeamList[team].RemoveAt(index);
_NameSelections[_NameSelection].RemoveUsedProfile(id);
}
@@ -758,7 +762,7 @@ namespace VocaluxeLib.Menu
_UpdateNextButtonVisibility();
}
private void _RemovePlayer(int team, int profileID)
private void _RemovePlayer(int team, Guid profileID)
{
_TeamList[team].Remove(profileID);
_NameSelections[_NameSelection].RemoveUsedProfile(profileID);
@@ -773,11 +777,14 @@ namespace VocaluxeLib.Menu
{
for (int p = 0; p < _NumPlayerTeams[t]; p++)
{
int profileID = _NameSelections[_NameSelection].GetRandomUnusedProfile();
if(profileID >= 0) //only add valid profiles
Guid profileID = _NameSelections[_NameSelection].GetRandomUnusedProfile();
if(profileID != Guid.Empty)
_AddPlayer(t, profileID);
}
}
_UpdatePlayerSlide();
_UpdateButtonVisibility();
}
private void _UpdateNextButtonVisibility()
VocaluxeLib/Menu/CNameSelection.cs
+72 -57
View File
@@ -15,6 +15,8 @@
// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
#endregion
using System;
using System.Linq;
using System.Collections.Generic;
using System.Windows.Forms;
using System.Xml.Serialization;
@@ -58,11 +60,11 @@ namespace VocaluxeLib.Menu
{
private class CTile
{
public int ProfileID;
public Guid ProfileID;
public readonly CStatic Avatar;
public readonly CText Name;
public CTile(CStatic av, CText tex, int pID)
public CTile(CStatic av, CText tex, Guid pID)
{
Avatar = av;
Name = tex;
@@ -94,12 +96,12 @@ namespace VocaluxeLib.Menu
public int Offset;
private int _ActualSelection = -1;
public int Selection = -1;
public Guid SelectedID = Guid.Empty;
private int _Player = -1;
private readonly List<int> _VisibleProfiles;
private readonly List<int> _UsedProfiles;
private readonly List<Guid> _VisibleProfiles;
private readonly List<Guid> _UsedProfiles;
private CStatic _PlayerSelector;
@@ -120,8 +122,8 @@ namespace VocaluxeLib.Menu
_Theme = new SThemeNameSelection {Tiles = new SThemeNameSelectionTiles {Name = new SThemeNameSelectionName()}};
_Tiles = new List<CTile>();
_VisibleProfiles = new List<int>();
_UsedProfiles = new List<int>();
_VisibleProfiles = new List<Guid>();
_UsedProfiles = new List<Guid>();
}
public CNameSelection(SThemeNameSelection theme, int partyModeID)
@@ -130,8 +132,8 @@ namespace VocaluxeLib.Menu
_Theme = theme;
_Tiles = new List<CTile>();
_VisibleProfiles = new List<int>();
_UsedProfiles = new List<int>();
_VisibleProfiles = new List<Guid>();
_UsedProfiles = new List<Guid>();
ThemeLoaded = true;
}
@@ -184,7 +186,7 @@ namespace VocaluxeLib.Menu
case Keys.Right:
if (_ActualSelection + 1 < _Tiles.Count)
{
if (_Tiles[_ActualSelection + 1].ProfileID != -1)
if (_Tiles[_ActualSelection + 1].ProfileID != Guid.Empty)
_ActualSelection++;
}
else
@@ -192,7 +194,7 @@ namespace VocaluxeLib.Menu
int offset = Offset;
UpdateList(Offset + 1);
if (offset != Offset)
_ActualSelection = 0;
_ActualSelection -= _Theme.Tiles.NumW - 1;
}
break;
@@ -202,7 +204,7 @@ namespace VocaluxeLib.Menu
else if (Offset > 0)
{
UpdateList(Offset - 1);
_ActualSelection = _Tiles.Count - 1;
_ActualSelection += _Theme.Tiles.NumW - 1;
}
break;
@@ -212,57 +214,49 @@ namespace VocaluxeLib.Menu
else if (Offset > 0)
{
UpdateList(Offset - 1);
_ActualSelection += _Tiles.Count - _Theme.Tiles.NumW;
}
break;
case Keys.Down:
if (_ActualSelection + _Theme.Tiles.NumW < _Tiles.Count)
{
if (_Tiles[_ActualSelection + _Theme.Tiles.NumW].ProfileID != -1)
if (_Tiles[_ActualSelection + _Theme.Tiles.NumW].ProfileID != Guid.Empty)
_ActualSelection += _Theme.Tiles.NumW;
}
else
{
int offset = Offset;
UpdateList(Offset + 1);
if (offset != Offset)
}
if (_Tiles[_ActualSelection].ProfileID == Guid.Empty)
{
_ActualSelection = _Tiles.Count - _Theme.Tiles.NumW;
while(_Tiles[_ActualSelection + 1].ProfileID != Guid.Empty)
{
_ActualSelection = _ActualSelection - _Tiles.Count + _Theme.Tiles.NumW;
if (_Tiles[_ActualSelection].ProfileID == -1)
{
for (int i = _Tiles.Count - 1; i >= 0; i--)
{
if (_Tiles[i].ProfileID != -1)
{
_ActualSelection = i;
break;
}
}
}
_ActualSelection++;
}
}
break;
}
if (Offset * _Tiles.Count + _ActualSelection < _VisibleProfiles.Count)
Selection = _VisibleProfiles[Offset * _Tiles.Count + _ActualSelection];
if (Offset * _Theme.Tiles.NumW + _ActualSelection < _VisibleProfiles.Count)
SelectedID = _VisibleProfiles.ElementAt(Offset * _Theme.Tiles.NumW + _ActualSelection);
else
Selection = -1;
SelectedID = Guid.Empty;
}
public void HandleMouse(SMouseEvent mevent)
{
for (int i = 0; i < _Tiles.Count; i++)
{
if (CHelper.IsInBounds(_Tiles[i].Avatar.Rect, mevent))
if (CHelper.IsInBounds(_Tiles[i].Avatar.Rect, mevent) && _Tiles[i].ProfileID != Guid.Empty)
{
_ActualSelection = i;
if (Offset * _Tiles.Count + _ActualSelection < _VisibleProfiles.Count)
Selection = _VisibleProfiles[Offset * _Tiles.Count + _ActualSelection];
if (Offset * _Theme.Tiles.NumW + _ActualSelection < _VisibleProfiles.Count)
SelectedID = _VisibleProfiles.ElementAt(Offset * _Theme.Tiles.NumW + _ActualSelection);
else
Selection = -1;
SelectedID = Guid.Empty;
}
}
}
@@ -270,7 +264,7 @@ namespace VocaluxeLib.Menu
public void FastSelection(bool active, int player)
{
//Overwrite player-selection; Same profile, but other player
if (active && Selection != -1)
if (active && SelectedID != Guid.Empty)
{
_Player = player;
_PlayerSelector.Color = CBase.Themes.GetPlayerColor(player);
@@ -278,7 +272,7 @@ namespace VocaluxeLib.Menu
//Normal activation
else if (active)
{
Selection = 0;
SelectedID = _VisibleProfiles.ElementAt(0);
_ActualSelection = 0;
_Player = player;
_PlayerSelector.Color = CBase.Themes.GetPlayerColor(player);
@@ -287,7 +281,7 @@ namespace VocaluxeLib.Menu
//Deactivate
else
{
Selection = -1;
SelectedID = Guid.Empty;
_ActualSelection = -1;
_Player = -1;
_PlayerSelector.Visible = false;
@@ -297,7 +291,7 @@ namespace VocaluxeLib.Menu
public void UpdateList()
{
_UpdateVisibleProfiles();
if (_Tiles.Count * (Offset + 1) - _VisibleProfiles.Count >= _Tiles.Count * Offset)
if (_Theme.Tiles.NumW * (Offset + 1) - _VisibleProfiles.Count >= _Theme.Tiles.NumW * Offset)
UpdateList(Offset - 1);
else
UpdateList(Offset);
@@ -305,24 +299,23 @@ namespace VocaluxeLib.Menu
public void UpdateList(int offset)
{
if (offset < 0)
offset = 0;
offset = offset.Clamp(0, _GetMaxOffset());
for (int i = 0; i < _Tiles.Count; i++)
{
if ((i + offset * _Tiles.Count) < _VisibleProfiles.Count)
if ((i + offset * _Theme.Tiles.NumW) < _VisibleProfiles.Count)
{
_Tiles[i].Avatar.Texture = CBase.Profiles.GetAvatar(_VisibleProfiles[i + offset * _Tiles.Count]);
_Tiles[i].Avatar.Texture = CBase.Profiles.GetAvatar(_VisibleProfiles[i + offset * _Theme.Tiles.NumW]);
_Tiles[i].Avatar.Color = new SColorF(1, 1, 1, 1);
_Tiles[i].Name.Text = CBase.Profiles.GetPlayerName(_VisibleProfiles[i + offset * _Tiles.Count]);
_Tiles[i].ProfileID = _VisibleProfiles[i + offset * _Tiles.Count];
_Tiles[i].Name.Text = CBase.Profiles.GetPlayerName(_VisibleProfiles[i + offset * _Theme.Tiles.NumW]);
_Tiles[i].ProfileID = _VisibleProfiles.ElementAt(i + offset * _Theme.Tiles.NumW);
}
else
{
_Tiles[i].Avatar.Texture = _TextureEmptyTile;
_Tiles[i].Avatar.Color = _ColorEmptyTile;
_Tiles[i].Name.Text = "";
_Tiles[i].ProfileID = -1;
_Tiles[i].ProfileID = Guid.Empty;
}
}
Offset = offset;
@@ -339,7 +332,7 @@ namespace VocaluxeLib.Menu
return isOver;
}
public int TilePlayerNr(SMouseEvent mevent)
public Guid TilePlayerID(SMouseEvent mevent)
{
foreach (CTile tile in _Tiles)
{
@@ -347,7 +340,7 @@ namespace VocaluxeLib.Menu
return tile.ProfileID;
}
return -1;
return Guid.Empty;
}
public CStatic TilePlayerAvatar(SMouseEvent mevent)
@@ -382,9 +375,9 @@ namespace VocaluxeLib.Menu
_PrepareTiles();
}
public void UseProfile(int id)
public void UseProfile(Guid id)
{
if (id > -1)
if (id != Guid.Empty)
{
if (!_UsedProfiles.Contains(id) && CBase.Profiles.IsProfileIDValid(id) && !CBase.Profiles.IsGuest(id))
{
@@ -394,22 +387,34 @@ namespace VocaluxeLib.Menu
}
}
public void RemoveUsedProfile(int id)
public void RemoveUsedProfile(Guid id)
{
if (id > -1)
if (id != Guid.Empty)
{
_UsedProfiles.Remove(id);
UpdateList();
}
}
public int GetRandomUnusedProfile()
public Guid GetRandomUnusedProfile()
{
if (_VisibleProfiles.Count == 0)
return -1;
Guid id = Guid.Empty;
int rand = CBase.Game.GetRandom(_VisibleProfiles.Count);
return _VisibleProfiles[rand];
if (_VisibleProfiles.Count == 0)
return id;
if (_VisibleProfiles.Count == _UsedProfiles.Count)
return id;
while (id == Guid.Empty)
{
int rand = CBase.Game.GetRandom(_VisibleProfiles.Count);
if (_UsedProfiles.Contains(_VisibleProfiles[rand]))
continue;
id = _VisibleProfiles.ElementAt(rand);
}
return id;
}
private void _PrepareTiles()
@@ -424,7 +429,7 @@ namespace VocaluxeLib.Menu
var tileStatic = new CStatic(_PartyModeID, _TextureEmptyTile, _ColorEmptyTile, rect) {Aspect = EAspect.Crop};
var tileText = new CText(rect.X + rect.W / 2, rect.Y + rect.H + _Theme.Tiles.Name.Space, rect.Z, _Theme.Tiles.Name.Height, rect.W, EAlignment.Center,
_Theme.Tiles.Name.Style, _Theme.Tiles.Name.Font, _ColorNameTile, "");
_Tiles.Add(new CTile(tileStatic, tileText, -1));
_Tiles.Add(new CTile(tileStatic, tileText, Guid.Empty));
}
}
_Rect.X = MaxRect.X;
@@ -452,6 +457,16 @@ namespace VocaluxeLib.Menu
}
}
private int _GetMaxOffset()
{
int maxOffset = (int)Math.Ceiling((decimal)(_VisibleProfiles.Count - _Tiles.Count) / _Theme.Tiles.NumW);
if (maxOffset < 0)
{
return 0;
}
return maxOffset;
}
public object GetTheme()
{
return _Theme;
VocaluxeLib/Profile/CProfile.cs
+11 -1
View File
@@ -42,7 +42,7 @@ namespace VocaluxeLib.Profile
#pragma warning restore 649
}
[XmlIgnore] public int ID;
[DefaultValue(null)] public Guid ID;
public string PlayerName;
[XmlIgnore] public string FilePath;
@@ -73,6 +73,7 @@ namespace VocaluxeLib.Profile
public CProfile()
{
ID = Guid.NewGuid();
PlayerName = String.Empty;
Difficulty = EGameDifficulty.TR_CONFIG_EASY;
UserRole = EUserRole.TR_USERROLE_NORMAL;
@@ -92,6 +93,12 @@ namespace VocaluxeLib.Profile
try
{
xml.Deserialize(FilePath, this);
//If ID couldn't be loaded, generate a new one and save it
if (ID == Guid.Empty)
{
ID = Guid.NewGuid();
SaveProfile();
}
}
catch (Exception e)
{
@@ -112,7 +119,10 @@ namespace VocaluxeLib.Profile
var old = xml.Deserialize<SOldXmlProfile>(FilePath);
string newXml = ser.Serialize(old.Info);
xml.DeserializeString(newXml, this);
if (ID == null)
ID = Guid.NewGuid();
ser.Serialize(FilePath, this);
}
catch (Exception e2)
{
VocaluxeLib/Structs.cs
+1 -1
View File
@@ -341,7 +341,7 @@ namespace VocaluxeLib
#region Game
public struct SPlayer
{
public int ProfileID;
public Guid ProfileID;
public double Points;
public double PointsLineBonus;
public double PointsGoldenNotes;
VocaluxeLib/VocaluxeLib.csproj
+9 -3
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">DebugWin</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,11 +10,12 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>VocaluxeLib</RootNamespace>
<AssemblyName>VocaluxeLib</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugWin|AnyCPU'">
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -27,6 +28,7 @@
<WarningLevel>4</WarningLevel>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<CodeAnalysisRuleSet>..\CheckingRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseWin|AnyCPU'">
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -38,6 +40,7 @@
<UseVSHostingProcess>false</UseVSHostingProcess>
<DefineConstants>WIN</DefineConstants>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DebugLinux|AnyCPU'">
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -49,6 +52,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseLinux|AnyCPU'">
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -60,6 +64,7 @@
<UseVSHostingProcess>false</UseVSHostingProcess>
<DefineConstants>LINUX</DefineConstants>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'InstallerWin|AnyCPU'">
<OutputPath>..\Output\libs\managed</OutputPath>
@@ -70,6 +75,7 @@
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
VocaluxeLib/Xml/CXmlDeserializer.cs
+2
View File
@@ -213,6 +213,8 @@ namespace VocaluxeLib.Xml
return value;
}
}
if (type == typeof(Guid))
return Guid.Parse(node.InnerText);
if (type == typeof(string))
return node == null ? null : node.InnerText;
if (type.IsPrimitive)
VocaluxeLib/Xml/CXmlSerializer.cs
+4
View File
@@ -96,6 +96,10 @@ namespace VocaluxeLib.Xml
writer.WriteEndElement();
}
}
else if (type == typeof(Guid))
{
writer.WriteElementString(name, value.ToString());
}
else if (type.IsNullable())
_WriteValue(writer, name, type.GetGenericArguments()[0], value, isAttribute, arrayItemName, nameAttribute);
else if (type.IsList() || type.IsArray)
VocaluxeTests/VocaluxeTests.csproj
+3 -2
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -8,7 +8,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>VocaluxeTests</RootNamespace>
<AssemblyName>VocaluxeTests</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
@@ -16,6 +16,7 @@
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
<IsCodedUITest>False</IsCodedUITest>
<TestProjectType>UnitTest</TestProjectType>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
WebserverInitalConfig/App.config
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/>
</startup>
</configuration>
WebserverInitalConfig/WebserverInitalConfig.csproj
+5 -3
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>WebserverInitalConfig</RootNamespace>
<AssemblyName>VocaluxeServerConfig</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<NuGetPackageImportStamp>ee6e2fa6</NuGetPackageImportStamp>
@@ -23,6 +23,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -32,6 +33,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>Vocaluxe.ico</ApplicationIcon>
@@ -66,7 +68,7 @@
<PropertyGroup>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
</PropertyGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Rebuild for automatic package restore. The missing file is {0}.</ErrorText>