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

Automatic cleanup/formating

Browse Source
This commit is contained in:
Flamefire committed 2013-04-24 01:26:36 +02:00
1 parent b1e28ae7bc
commit 69d8af4e87
32 files changed
+93 -100
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

VocaluxeLib/Menu/CNameSelection.cs
+6 -4
View File
@@ -106,10 +106,12 @@ namespace VocaluxeLib.Menu
{
_PrepareTiles();
_PlayerSelector = new CStatic(_PartyModeID) {
Texture = _TextureTileSelected,
Rect = new SRectF(0, 0, _TileW + 6, _TileH + 6, Rect.Z - 0.5f),
Visible = false};
_PlayerSelector = new CStatic(_PartyModeID)
{
Texture = _TextureTileSelected,
Rect = new SRectF(0, 0, _TileW + 6, _TileH + 6, Rect.Z - 0.5f),
Visible = false
};
_UpdateVisibleProfiles();
VocaluxeLib/Menu/CPlaylist.cs
+21 -18
View File
@@ -500,24 +500,27 @@ namespace VocaluxeLib.Menu
{
if (keyEvent.KeyPressed && !Char.IsControl(keyEvent.Unicode))
_Theme.ButtonPlaylistName.Text.Text = _Theme.ButtonPlaylistName.Text.Text + keyEvent.Unicode;
else switch (keyEvent.Key)
else
{
case Keys.Enter:
CBase.Playlist.SetPlaylistName(ActivePlaylistID, _Theme.ButtonPlaylistName.Text.Text);
CBase.Playlist.SavePlaylist(ActivePlaylistID);
EditMode = EEditMode.None;
_Theme.ButtonPlaylistName.EditMode = false;
break;
case Keys.Escape:
_Theme.ButtonPlaylistName.Text.Text = CBase.Playlist.GetPlaylistName(ActivePlaylistID);
EditMode = EEditMode.None;
_Theme.ButtonPlaylistName.EditMode = false;
break;
case Keys.Delete:
case Keys.Back:
if (_Theme.ButtonPlaylistName.Text.Text != "")
_Theme.ButtonPlaylistName.Text.Text = _Theme.ButtonPlaylistName.Text.Text.Remove(_Theme.ButtonPlaylistName.Text.Text.Length - 1);
break;
switch (keyEvent.Key)
{
case Keys.Enter:
CBase.Playlist.SetPlaylistName(ActivePlaylistID, _Theme.ButtonPlaylistName.Text.Text);
CBase.Playlist.SavePlaylist(ActivePlaylistID);
EditMode = EEditMode.None;
_Theme.ButtonPlaylistName.EditMode = false;
break;
case Keys.Escape:
_Theme.ButtonPlaylistName.Text.Text = CBase.Playlist.GetPlaylistName(ActivePlaylistID);
EditMode = EEditMode.None;
_Theme.ButtonPlaylistName.EditMode = false;
break;
case Keys.Delete:
case Keys.Back:
if (_Theme.ButtonPlaylistName.Text.Text != "")
_Theme.ButtonPlaylistName.Text.Text = _Theme.ButtonPlaylistName.Text.Text.Remove(_Theme.ButtonPlaylistName.Text.Text.Length - 1);
break;
}
}
return true;
}
@@ -786,7 +789,7 @@ namespace VocaluxeLib.Menu
case Keys.PageDown:
_SetSelectionToLastEntry();
break;
case Keys.PageUp:
case Keys.PageUp:
_SetSelectionToFirstEntry();
break;
}
VocaluxeLib/Menu/Enums.cs
+8 -8
View File
@@ -95,7 +95,7 @@ namespace VocaluxeLib.Menu
public enum EColorDepth
{
// ReSharper disable UnusedMember.Global
// ReSharper disable UnusedMember.Global
Bit8 = 8,
Bit16 = 16,
Bit24 = 24,
@@ -127,9 +127,9 @@ namespace VocaluxeLib.Menu
// ReSharper disable InconsistentNaming
// don't change the order!
TR_CONFIG_OFF, //no debug infos
// ReSharper disable UnusedMember.Global
// ReSharper disable UnusedMember.Global
TR_CONFIG_ONLY_FPS,
// ReSharper restore UnusedMember.Global
// ReSharper restore UnusedMember.Global
TR_CONFIG_LEVEL1,
TR_CONFIG_LEVEL2,
TR_CONFIG_LEVEL3,
@@ -216,9 +216,9 @@ namespace VocaluxeLib.Menu
public enum ECoverLoading
{
// ReSharper disable InconsistentNaming
// ReSharper disable UnusedMember.Global
// ReSharper disable UnusedMember.Global
TR_CONFIG_COVERLOADING_ONDEMAND,
// ReSharper restore UnusedMember.Global
// ReSharper restore UnusedMember.Global
TR_CONFIG_COVERLOADING_ATSTART,
TR_CONFIG_COVERLOADING_DYNAMIC
// ReSharper restore InconsistentNaming
@@ -231,7 +231,7 @@ namespace VocaluxeLib.Menu
TR_CONFIG_EASY,
TR_CONFIG_NORMAL,
TR_CONFIG_HARD
// ReSharper restore UnusedMember.Global
// ReSharper restore UnusedMember.Global
// ReSharper restore InconsistentNaming
}
@@ -267,9 +267,9 @@ namespace VocaluxeLib.Menu
TR_CONFIG_PLAYERINFO_BOTH,
TR_CONFIG_PLAYERINFO_NAME,
TR_CONFIG_PLAYERINFO_AVATAR,
// ReSharper disable UnusedMember.Global
// ReSharper disable UnusedMember.Global
TR_CONFIG_PLAYERINFO_OFF
// ReSharper restore UnusedMember.Global
// ReSharper restore UnusedMember.Global
// ReSharper restore InconsistentNaming
}
VocaluxeLib/Menu/SingNotes/CNotes.cs
+1 -4
View File
@@ -597,10 +597,7 @@ namespace VocaluxeLib.Menu.SingNotes
public int NumLinesWithPoints
{
get
{
return _Lines.Count(line => line.Points > 0f);
}
get { return _Lines.Count(line => line.Points > 0f); }
}
#region Methods
VocaluxeLib/Menu/SongMenu/CSong.cs
+2 -4
View File
@@ -100,9 +100,9 @@ namespace VocaluxeLib.Menu.SongMenu
public float FadeInTime;
public float FadeOutTime;
// ReSharper disable UnusedParameter.Local
// ReSharper disable UnusedParameter.Local
public SMedley(int dummy)
// ReSharper restore UnusedParameter.Local
// ReSharper restore UnusedParameter.Local
{
Source = EMedleySource.None;
StartBeat = 0;
@@ -883,9 +883,7 @@ namespace VocaluxeLib.Menu.SongMenu
// build sentences list
List<string> sentences = new List<string>();
foreach (CLine line in lines.Line)
{
sentences.Add(line.Points != 0 ? line.Lyrics : String.Empty);
}
// find equal sentences series
List<SSeries> series = new List<SSeries>();
VocaluxeLib/Menu/Structs.cs
+3 -3
View File
@@ -181,7 +181,7 @@ namespace VocaluxeLib.Menu
public readonly bool MB; //middle button click
public readonly bool LBH; //left button hold (when moving)
// ReSharper disable MemberCanBePrivate.Global
// ReSharper disable MemberCanBePrivate.Global
public readonly bool RBH; //right button hold (when moving)
public readonly bool MBH; //middle button hold (when moving)
// ReSharper restore MemberCanBePrivate.Global
@@ -228,9 +228,9 @@ namespace VocaluxeLib.Menu
public string FileName;
public STexture Texture;
// ReSharper disable UnusedParameter.Local
// ReSharper disable UnusedParameter.Local
public SAvatar(int dummy)
// ReSharper restore UnusedParameter.Local
// ReSharper restore UnusedParameter.Local
{
FileName = String.Empty;
Texture = new STexture(-1);