Used object initializers

VocaluxeLib/Menu/CButton.cs

@@ -117,11 +117,13 @@ namespace VocaluxeLib.Menu
         public CButton(CButton button)
         {
             _PartyModeID = button._PartyModeID;
-            _Theme = new SThemeButton();
-            _Theme.ColorName = button._Theme.ColorName;
-            _Theme.SelColorName = button._Theme.SelColorName;
-            _Theme.TextureName = button._Theme.TextureName;
-            _Theme.SelTextureName = button._Theme.SelTextureName;
+            _Theme = new SThemeButton
+                {
+                    ColorName = button._Theme.ColorName,
+                    SelColorName = button._Theme.SelColorName,
+                    TextureName = button._Theme.TextureName,
+                    SelTextureName = button._Theme.SelTextureName
+                };
 
             Rect = new SRectF(button.Rect);
             Color = new SColorF(button.Color);
@@ -303,10 +305,7 @@ namespace VocaluxeLib.Menu
 
             if (!Selected && !Pressed || !Enabled)
             {
-                if (Texture.Index != -1)
-                    texture = Texture;
-                else
-                    texture = CBase.Theme.GetSkinTexture(_Theme.TextureName, _PartyModeID);
+                texture = Texture.Index != -1 ? Texture : CBase.Theme.GetSkinTexture(_Theme.TextureName, _PartyModeID);
 
                 CBase.Drawing.DrawTexture(texture, Rect, Color);
 
@@ -320,10 +319,7 @@ namespace VocaluxeLib.Menu
             }
             else if (!IsSelText)
             {
-                if (Texture.Index != -1)
-                    texture = Texture;
-                else
-                    texture = CBase.Theme.GetSkinTexture(_Theme.SelTextureName, _PartyModeID);
+                texture = Texture.Index != -1 ? Texture : CBase.Theme.GetSkinTexture(_Theme.SelTextureName, _PartyModeID);
 
                 CBase.Drawing.DrawTexture(texture, Rect, SelColor);
 
@@ -337,10 +333,7 @@ namespace VocaluxeLib.Menu
             }
             else if (IsSelText)
             {
-                if (SelTexture.Index != -1)
-                    texture = SelTexture;
-                else
-                    texture = CBase.Theme.GetSkinTexture(_Theme.SelTextureName, _PartyModeID);
+                texture = SelTexture.Index != -1 ? SelTexture : CBase.Theme.GetSkinTexture(_Theme.SelTextureName, _PartyModeID);
 
                 CBase.Drawing.DrawTexture(texture, Rect, SelColor);
 

VocaluxeLib/Menu/CNameSelection.cs

@@ -106,10 +106,10 @@ namespace VocaluxeLib.Menu
         {
             _PrepareTiles();
 
-            _PlayerSelector = new CStatic(_PartyModeID);
-            _PlayerSelector.Texture = _TextureTileSelected;
-            _PlayerSelector.Rect = new SRectF(0, 0, _TileW + 6, _TileH + 6, Rect.Z - 0.5f);
-            _PlayerSelector.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/CObjectInteractions.cs

@@ -320,9 +320,7 @@ namespace VocaluxeLib.Menu
                                          _Interactions[i].Type == EType.SongMenu ||
                                          _Interactions[i].Type == EType.Equalizer))
                 {
-                    SZSort zs = new SZSort();
-                    zs.ID = i;
-                    zs.Z = _GetZValue(i);
+                    SZSort zs = new SZSort {ID = i, Z = _GetZValue(i)};
                     items.Add(zs);
                 }
             }
@@ -331,7 +329,7 @@ namespace VocaluxeLib.Menu
                 return;
 
 
-            items.Sort(delegate(SZSort s1, SZSort s2) { return s2.Z.CompareTo(s1.Z); });
+            items.Sort((s1, s2) => s2.Z.CompareTo(s1.Z));
 
             for (int i = 0; i < items.Count; i++)
                 _DrawInteraction(items[i].ID);

VocaluxeLib/Menu/CPlaylist.cs

@@ -203,17 +203,19 @@ namespace VocaluxeLib.Menu
         public CPlaylist(int partyModeID)
         {
             _PartyModeID = partyModeID;
-            _Theme = new SThemePlaylist();
-            _Theme.Text1 = new CText(_PartyModeID);
-            _Theme.StaticCover = new CStatic(_PartyModeID);
-            _Theme.StaticPlaylistFooter = new CStatic(_PartyModeID);
-            _Theme.StaticPlaylistHeader = new CStatic(_PartyModeID);
-            _Theme.ButtonPlaylistName = new CButton(_PartyModeID);
-            _Theme.ButtonPlaylistClose = new CButton(_PartyModeID);
-            _Theme.ButtonPlaylistDelete = new CButton(_PartyModeID);
-            _Theme.ButtonPlaylistSave = new CButton(_PartyModeID);
-            _Theme.ButtonPlaylistSing = new CButton(_PartyModeID);
-            _Theme.SelectSlideGameMode = new CSelectSlide(_PartyModeID);
+            _Theme = new SThemePlaylist
+                {
+                    Text1 = new CText(_PartyModeID),
+                    StaticCover = new CStatic(_PartyModeID),
+                    StaticPlaylistFooter = new CStatic(_PartyModeID),
+                    StaticPlaylistHeader = new CStatic(_PartyModeID),
+                    ButtonPlaylistName = new CButton(_PartyModeID),
+                    ButtonPlaylistClose = new CButton(_PartyModeID),
+                    ButtonPlaylistDelete = new CButton(_PartyModeID),
+                    ButtonPlaylistSave = new CButton(_PartyModeID),
+                    ButtonPlaylistSing = new CButton(_PartyModeID),
+                    SelectSlideGameMode = new CSelectSlide(_PartyModeID)
+                };
 
             CompleteRect = new SRectF();
             Rect = new SRectF();
@@ -626,8 +628,7 @@ namespace VocaluxeLib.Menu
                                     CBase.Playlist.MovePlaylistSongUp(ActivePlaylistID, CurrentPlaylistElement + Offset);
                                     UpdatePlaylist();
 
-                                    SKeyEvent key = new SKeyEvent();
-                                    key.Key = Keys.Up;
+                                    SKeyEvent key = new SKeyEvent {Key = Keys.Up};
 
                                     if (CurrentPlaylistElement > scrollLimit)
                                     {
@@ -656,8 +657,7 @@ namespace VocaluxeLib.Menu
                                     CBase.Playlist.MovePlaylistSongDown(ActivePlaylistID, CurrentPlaylistElement + Offset);
                                     UpdatePlaylist();
 
-                                    SKeyEvent key = new SKeyEvent();
-                                    key.Key = Keys.Down;
+                                    SKeyEvent key = new SKeyEvent {Key = Keys.Down};
 
                                     if (CurrentPlaylistElement >= scrollLimit)
                                     {
@@ -795,10 +795,7 @@ namespace VocaluxeLib.Menu
                 return;
 
             int off = _PlaylistElementContents.Count - _PlaylistElements.Count;
-            if (off >= 0)
-                Offset = off;
-            else
-                Offset = 0;
+            Offset = off >= 0 ? off : 0;
 
             Update();
 
@@ -839,10 +836,7 @@ namespace VocaluxeLib.Menu
                 return;
 
             int off = _PlaylistElementContents.Count - _PlaylistElements.Count;
-            if (off >= 0)
-                Offset = off;
-            else
-                Offset = 0;
+            Offset = off >= 0 ? off : 0;
 
             Update();
         }
@@ -1100,12 +1094,13 @@ namespace VocaluxeLib.Menu
 
             for (int i = 0; i < Math.Floor(Rect.H / _Theme.EntryHeight); i++)
             {
-                CPlaylistElement en = new CPlaylistElement();
+                CPlaylistElement en = new CPlaylistElement
+                    {
+                        Background = new CStatic(_PartyModeID, _Theme.TextureBackgroundName, BackgroundColor,
+                                                 new SRectF(Rect.X, Rect.Y + (i * _Theme.EntryHeight), Rect.W, _Theme.EntryHeight, Rect.Z)),
+                        Cover = new CStatic(_Theme.StaticCover)
+                    };
 
-                en.Background = new CStatic(_PartyModeID, _Theme.TextureBackgroundName, BackgroundColor,
-                                            new SRectF(Rect.X, Rect.Y + (i * _Theme.EntryHeight), Rect.W, _Theme.EntryHeight, Rect.Z));
-
-                en.Cover = new CStatic(_Theme.StaticCover);
                 en.Cover.Rect.Y += Rect.Y + (i * _Theme.EntryHeight);
                 en.Cover.Rect.X += Rect.X;
 
@@ -1140,10 +1135,12 @@ namespace VocaluxeLib.Menu
                 _PlaylistElementContents.Clear();
                 for (int i = 0; i < CBase.Playlist.GetPlaylistSongCount(ActivePlaylistID); i++)
                 {
-                    CPlaylistElementContent pec = new CPlaylistElementContent();
-                    pec.SongID = CBase.Playlist.GetPlaylistSong(ActivePlaylistID, i).SongID;
-                    pec.Modes = CBase.Songs.GetSongByID(CBase.Playlist.GetPlaylistSong(ActivePlaylistID, i).SongID).AvailableGameModes;
-                    pec.Mode = CBase.Playlist.GetPlaylistSong(ActivePlaylistID, i).GameMode;
+                    CPlaylistElementContent pec = new CPlaylistElementContent
+                        {
+                            SongID = CBase.Playlist.GetPlaylistSong(ActivePlaylistID, i).SongID,
+                            Modes = CBase.Songs.GetSongByID(CBase.Playlist.GetPlaylistSong(ActivePlaylistID, i).SongID).AvailableGameModes,
+                            Mode = CBase.Playlist.GetPlaylistSong(ActivePlaylistID, i).GameMode
+                        };
                     _PlaylistElementContents.Add(pec);
                 }
                 Update();
@@ -1157,8 +1154,7 @@ namespace VocaluxeLib.Menu
             _PlaylistElementContents.Clear();
             for (int i = 0; i < CBase.Playlist.GetPlaylistSongCount(ActivePlaylistID); i++)
             {
-                CPlaylistElementContent pec = new CPlaylistElementContent();
-                pec.SongID = CBase.Playlist.GetPlaylistSong(ActivePlaylistID, i).SongID;
+                CPlaylistElementContent pec = new CPlaylistElementContent {SongID = CBase.Playlist.GetPlaylistSong(ActivePlaylistID, i).SongID};
                 pec.Modes = CBase.Songs.GetSongByID(pec.SongID).AvailableGameModes;
                 pec.Mode = CBase.Playlist.GetPlaylistSong(ActivePlaylistID, i).GameMode;
                 _PlaylistElementContents.Add(pec);

VocaluxeLib/Menu/CSelectSlide.cs

@@ -187,29 +187,24 @@ namespace VocaluxeLib.Menu
         public CSelectSlide(CSelectSlide slide)
         {
             _PartyModeID = slide._PartyModeID;
-            _Theme = new SThemeSelectSlide();
-
-            _Theme.TextureArrowLeftName = slide._Theme.TextureArrowLeftName;
-            _Theme.TextureArrowRightName = slide._Theme.TextureArrowRightName;
-
-            _Theme.SelTextureName = slide._Theme.SelTextureName;
-            _Theme.SelTextureArrowLeftName = slide._Theme.SelTextureArrowLeftName;
-            _Theme.SelTextureArrowRightName = slide._Theme.SelTextureArrowRightName;
-
-            _Theme.HighlightTextureName = slide._Theme.HighlightTextureName;
-
-            _Theme.ColorName = slide._Theme.ColorName;
-            _Theme.SelColorName = slide._Theme.SelColorName;
-            _Theme.HighlightColorName = slide._Theme.HighlightColorName;
-
-            _Theme.ArrowColorName = slide._Theme.ArrowColorName;
-            _Theme.SelArrowColorName = slide._Theme.SelArrowColorName;
-
-            _Theme.TextColorName = slide._Theme.TextColorName;
-            _Theme.SelTextColorName = slide._Theme.SelTextColorName;
-
-            _Theme.TextFont = slide._Theme.TextFont;
-            _Theme.TextStyle = slide._Theme.TextStyle;
+            _Theme = new SThemeSelectSlide
+                {
+                    TextureArrowLeftName = slide._Theme.TextureArrowLeftName,
+                    TextureArrowRightName = slide._Theme.TextureArrowRightName,
+                    SelTextureName = slide._Theme.SelTextureName,
+                    SelTextureArrowLeftName = slide._Theme.SelTextureArrowLeftName,
+                    SelTextureArrowRightName = slide._Theme.SelTextureArrowRightName,
+                    HighlightTextureName = slide._Theme.HighlightTextureName,
+                    ColorName = slide._Theme.ColorName,
+                    SelColorName = slide._Theme.SelColorName,
+                    HighlightColorName = slide._Theme.HighlightColorName,
+                    ArrowColorName = slide._Theme.ArrowColorName,
+                    SelArrowColorName = slide._Theme.SelArrowColorName,
+                    TextColorName = slide._Theme.TextColorName,
+                    SelTextColorName = slide._Theme.SelTextColorName,
+                    TextFont = slide._Theme.TextFont,
+                    TextStyle = slide._Theme.TextStyle
+                };
 
             _ThemeLoaded = false;
 

VocaluxeLib/Menu/CStatic.cs

@@ -121,8 +121,7 @@ namespace VocaluxeLib.Menu
         public CStatic(int partyModeID, string textureSkinName, SColorF color, SRectF rect)
         {
             _PartyModeID = partyModeID;
-            _Theme = new SThemeStatic();
-            _Theme.TextureName = textureSkinName;
+            _Theme = new SThemeStatic {TextureName = textureSkinName};
             _ThemeLoaded = false;
 
             _Texture = new STexture(-1);
@@ -244,11 +243,7 @@ namespace VocaluxeLib.Menu
 
         public void Draw(float scale, float z, EAspect aspect, bool forceDraw)
         {
-            STexture texture;
-            if (_Texture.Index != -1)
-                texture = _Texture;
-            else
-                texture = CBase.Theme.GetSkinTexture(_Theme.TextureName, _PartyModeID);
+            STexture texture = _Texture.Index != -1 ? _Texture : CBase.Theme.GetSkinTexture(_Theme.TextureName, _PartyModeID);
 
             SRectF bounds = new SRectF(
                 Rect.X - Rect.W * (scale - 1f),

VocaluxeLib/Menu/CText.cs

@@ -577,10 +577,7 @@ namespace VocaluxeLib.Menu
                 writer.WriteElementString("Font", Font);
 
                 writer.WriteComment("<Text>: Nothing or translation tag");
-                if (CBase.Language.TranslationExists(_Theme.Text))
-                    writer.WriteElementString("Text", _Theme.Text);
-                else
-                    writer.WriteElementString("Text", string.Empty);
+                writer.WriteElementString("Text", CBase.Language.TranslationExists(_Theme.Text) ? _Theme.Text : string.Empty);
 
                 if (!_ButtonText)
                 {

VocaluxeLib/Menu/SingNotes/CNotes.cs

@@ -678,8 +678,7 @@ namespace VocaluxeLib.Menu.SingNotes
             if (lineIndex < 0)
             {
                 //Note is before ALL lines
-                CLine line = new CLine();
-                line.StartBeat = note.StartBeat;
+                CLine line = new CLine {StartBeat = note.StartBeat};
                 line.AddNote(note);
                 _Lines.Insert(0, line);
             }

VocaluxeLib/Menu/SingNotes/CSingNotes.cs

@@ -397,8 +397,7 @@ namespace VocaluxeLib.Menu.SingNotes
 
                     if (note.EndBeat >= CBase.Game.GetCurrentBeatD() && note.Hit && note.NoteType == ENoteType.Golden)
                     {
-                        SRectF re = new SRectF(rect);
-                        re.W = (CBase.Game.GetMidBeatD() - note.StartBeat) / beats * w;
+                        SRectF re = new SRectF(rect) {W = (CBase.Game.GetMidBeatD() - note.StartBeat) / beats * w};
                         _AddFlare(re, n);
                     }
 

VocaluxeLib/Menu/SongMenu/CSong.cs

@@ -217,17 +217,13 @@ namespace VocaluxeLib.Menu.SongMenu
         public List<string> Language = new List<string>();
 
         // Notes
-        public CNotes Notes = new CNotes();
+        public readonly CNotes Notes = new CNotes();
 
         public EGameMode[] AvailableGameModes
         {
             get
             {
-                List<EGameMode> gms = new List<EGameMode>();
-                if (IsDuet)
-                    gms.Add(EGameMode.TR_GAMEMODE_DUET);
-                else
-                    gms.Add(EGameMode.TR_GAMEMODE_NORMAL);
+                List<EGameMode> gms = new List<EGameMode> {IsDuet ? EGameMode.TR_GAMEMODE_DUET : EGameMode.TR_GAMEMODE_NORMAL};
                 if (Medley.Source != EMedleySource.None)
                     gms.Add(EGameMode.TR_GAMEMODE_MEDLEY);
                 gms.Add(EGameMode.TR_GAMEMODE_SHORTSONG);
@@ -250,12 +246,14 @@ namespace VocaluxeLib.Menu.SongMenu
             _CoverTextureSmall = song._CoverTextureSmall;
             _CoverTextureBig = song._CoverTextureBig;
 
-            Medley = new SMedley();
-            Medley.Source = song.Medley.Source;
-            Medley.StartBeat = song.Medley.StartBeat;
-            Medley.EndBeat = song.Medley.EndBeat;
-            Medley.FadeInTime = song.Medley.FadeInTime;
-            Medley.FadeOutTime = song.Medley.FadeOutTime;
+            Medley = new SMedley
+                {
+                    Source = song.Medley.Source,
+                    StartBeat = song.Medley.StartBeat,
+                    EndBeat = song.Medley.EndBeat,
+                    FadeInTime = song.Medley.FadeInTime,
+                    FadeOutTime = song.Medley.FadeOutTime
+                };
 
             CalculateMedley = song.CalculateMedley;
             PreviewStart = song.PreviewStart;
@@ -806,8 +804,7 @@ namespace VocaluxeLib.Menu.SongMenu
         private void _NewSentence(int player, int start)
         {
             CLines lines = Notes.GetLines(player);
-            CLine line = new CLine();
-            line.StartBeat = start;
+            CLine line = new CLine {StartBeat = start};
             lines.AddLine(line);
         }
 
@@ -830,8 +827,8 @@ namespace VocaluxeLib.Menu.SongMenu
         {
             if (CoverFileName == "")
             {
-                List<string> files = CHelper.ListFiles(Folder, "*.jpg", false);
-                files.AddRange(CHelper.ListFiles(Folder, "*.png", false));
+                List<string> files = CHelper.ListFiles(Folder, "*.jpg");
+                files.AddRange(CHelper.ListFiles(Folder, "*.png"));
                 foreach (String file in files)
                 {
                     if (Regex.IsMatch(file, @".[CO].", RegexOptions.IgnoreCase) &&
@@ -842,8 +839,8 @@ namespace VocaluxeLib.Menu.SongMenu
 
             if (BackgroundFileName == "")
             {
-                List<string> files = CHelper.ListFiles(Folder, "*.jpg", false);
-                files.AddRange(CHelper.ListFiles(Folder, "*.png", false));
+                List<string> files = CHelper.ListFiles(Folder, "*.jpg");
+                files.AddRange(CHelper.ListFiles(Folder, "*.png"));
                 foreach (String file in files)
                 {
                     if (Regex.IsMatch(file, @".[BG].", RegexOptions.IgnoreCase) &&
@@ -885,10 +882,7 @@ namespace VocaluxeLib.Menu.SongMenu
             List<string> sentences = new List<string>();
             foreach (CLine line in lines.Line)
             {
-                if (line.Points != 0)
-                    sentences.Add(line.Lyrics);
-                else
-                    sentences.Add(String.Empty);
+                sentences.Add(line.Points != 0 ? line.Lyrics : String.Empty);
             }
 
             // find equal sentences series

VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs

@@ -237,18 +237,21 @@ namespace VocaluxeLib.Menu.SongMenu
         public CSongMenuFramework(int partyModeID)
         {
             _PartyModeID = partyModeID;
-            _Theme = new SThemeSongMenu();
-
-            _Theme.SongMenuTileBoard.TextArtist = new CText(_PartyModeID);
-            _Theme.SongMenuTileBoard.TextTitle = new CText(_PartyModeID);
-            _Theme.SongMenuTileBoard.TextSongLength = new CText(_PartyModeID);
-
-            _Theme.SongMenuTileBoard.StaticCoverBig = new CStatic(_PartyModeID);
-            _Theme.SongMenuTileBoard.StaticTextBG = new CStatic(_PartyModeID);
-            _Theme.SongMenuTileBoard.StaticDuetIcon = new CStatic(_PartyModeID);
-            _Theme.SongMenuTileBoard.StaticVideoIcon = new CStatic(_PartyModeID);
-            _Theme.SongMenuTileBoard.StaticMedleyCalcIcon = new CStatic(_PartyModeID);
-            _Theme.SongMenuTileBoard.StaticMedleyTagIcon = new CStatic(_PartyModeID);
+            _Theme = new SThemeSongMenu
+                {
+                    SongMenuTileBoard =
+                        {
+                            TextArtist = new CText(_PartyModeID),
+                            TextTitle = new CText(_PartyModeID),
+                            TextSongLength = new CText(_PartyModeID),
+                            StaticCoverBig = new CStatic(_PartyModeID),
+                            StaticTextBG = new CStatic(_PartyModeID),
+                            StaticDuetIcon = new CStatic(_PartyModeID),
+                            StaticVideoIcon = new CStatic(_PartyModeID),
+                            StaticMedleyCalcIcon = new CStatic(_PartyModeID),
+                            StaticMedleyTagIcon = new CStatic(_PartyModeID)
+                        }
+                };
 
             _ThemeLoaded = false;
         }