some additional changes

Vocaluxe/Base/CMain.cs

@@ -33,7 +33,7 @@ namespace Vocaluxe.Base
         public static IPlaylist Playlist = new BPlaylist();
 
 
-        public static Menu.Base Base = new Menu.Base(
+        public static Basic Base = new Basic(
             Config, Settings, Theme, Helper, Log, BackgroundMusic, Draw, Graphics, Fonts, Language, Game, Profiles, Record, Songs, Video, Sound, Cover, DataBase, Input, Playlist);
     }
 
@@ -100,6 +100,21 @@ namespace Vocaluxe.Base
         {
             return CConfig.SongFolder;
         }
+
+        public ESongSorting GetSongSorting()
+        {
+            return CConfig.SongSorting;
+        }
+
+        public EOffOn GetTabs()
+        {
+            return CConfig.Tabs;
+        }
+
+        public EOffOn GetIgnoreArticles()
+        {
+            return CConfig.IgnoreArticles;
+        }
     }
 
     class BSettings : ISettings

Vocaluxe/Base/CParty.cs

@@ -57,6 +57,7 @@ namespace Vocaluxe.Base
             //add dummy normal game mode and set it as default
             SPartyMode pm = new SPartyMode();
             pm.PartyMode = new CPartyModeNone();
+            pm.PartyMode.Initialize(CMain.Base);
             _PartyModes.Add(pm);
             _CurrentModeNr = 0;
 

Vocaluxe/Menu/CBackground.cs

@@ -30,7 +30,7 @@ namespace Vocaluxe.Menu
 
     public class CBackground : IMenuElement
     {
-        private Base _Base;
+        private Basic _Base;
         private SThemeBackground _Theme;
         private bool _ThemeLoaded;
                        
@@ -42,7 +42,7 @@ namespace Vocaluxe.Menu
         }
 
         #region Constructors
-        public CBackground(Base Base)
+        public CBackground(Basic Base)
         {
             _Base = Base;
             _ThemeLoaded = false;

Vocaluxe/Menu/CButton.cs

@@ -20,7 +20,7 @@ namespace Vocaluxe.Menu
 
     class CButton : IMenuElement
     {
-        private Base _Base;
+        private Basic _Base;
         private SThemeButton _Theme;
         private bool _ThemeLoaded;
 
@@ -69,7 +69,7 @@ namespace Vocaluxe.Menu
             return _Theme.Name;
         }
 
-        public CButton(Base Base)
+        public CButton(Basic Base)
         {
             _Base = Base;
             _Theme = new SThemeButton();

Vocaluxe/Menu/CEqualizer.cs

@@ -28,7 +28,7 @@ namespace Vocaluxe.Menu
 
     class CEqualizer : IMenuElement
     {
-        private Base _Base;
+        private Basic _Base;
         private SThemeEqualizer _Theme;
         private bool _ThemeLoaded;
 
@@ -52,7 +52,7 @@ namespace Vocaluxe.Menu
 
         private float[] _Bars;
 
-        public CEqualizer(Base Base)
+        public CEqualizer(Basic Base)
         {
             _Base = Base;
             _Theme = new SThemeEqualizer();

Vocaluxe/Menu/CLyric.cs

@@ -28,7 +28,7 @@ namespace Vocaluxe.Menu
 
     class CLyric : IMenuElement
     {
-        private Base _Base;
+        private Basic _Base;
         private SThemeLyrics _Theme;
         private bool _ThemeLoaded;
 
@@ -86,7 +86,7 @@ namespace Vocaluxe.Menu
             set { _Style = value; }
         }
 
-        public CLyric(Base Base)
+        public CLyric(Basic Base)
         {
             _Base = Base;
             _Theme = new SThemeLyrics();

Vocaluxe/Menu/CMenu.cs

@@ -73,7 +73,7 @@ namespace Vocaluxe.Menu
         protected string[] _ThemePlaylists;
 
         protected SRectF _ScreenArea;
-        private Base _Base;
+        private Basic _Base;
 
         public SRectF ScreenArea
         {
@@ -94,7 +94,7 @@ namespace Vocaluxe.Menu
         {
         }
 
-        public void Initialize(Base Base)
+        public void Initialize(Basic Base)
         {
             _Base = Base;
             Init();
@@ -2326,7 +2326,7 @@ namespace Vocaluxe.Menu
         #endregion Theme Handling
     }
 
-    public class Base
+    public class Basic
     {
         public IConfig Config;
         public ISettings Settings;
@@ -2349,7 +2349,7 @@ namespace Vocaluxe.Menu
         public IInputs Input;
         public IPlaylist Playlist;
 
-        public Base(IConfig Config, ISettings Settings, ITheme Theme, IHelper Helper, ILog Log, IBackgroundMusic BackgroundMusic,
+        public Basic(IConfig Config, ISettings Settings, ITheme Theme, IHelper Helper, ILog Log, IBackgroundMusic BackgroundMusic,
             IDrawing Draw, IGraphics Graphics, IFonts Fonts, ILanguage Language, IGame Game, IProfiles Profiles, IRecording Record,
             ISongs Songs, IVideo Video, ISound Sound, ICover Cover, IDataBase DataBase, IInputs Input, IPlaylist Playlist)
         {

Vocaluxe/Menu/CNameSelection.cs

@@ -26,12 +26,12 @@ namespace Vocaluxe.Menu
     {
         class CTile
         {
-            private Base _Base;
+            private Basic _Base;
             public int PlayerNr;
             public CStatic Avatar;
             public CText Name;
 
-            public CTile(Base Base)
+            public CTile(Basic Base)
             {
                 _Base = Base;
             }
@@ -44,7 +44,7 @@ namespace Vocaluxe.Menu
             }
         }
 
-        private Base _Base;
+        private Basic _Base;
         private SThemeNameSelection _Theme;
         private bool _ThemeLoaded;
 
@@ -84,7 +84,7 @@ namespace Vocaluxe.Menu
         private CStatic PlayerSelector;
 
 
-        public CNameSelection(Base Base)
+        public CNameSelection(Basic Base)
         {
             _Base = Base;
             _Theme = new SThemeNameSelection();

Vocaluxe/Menu/CObjectInteractions.cs

@@ -16,7 +16,7 @@ namespace Vocaluxe.Menu
 {
     class CObjectInteractions
     {
-        private Base _Base;
+        private Basic _Base;
         private List<CInteraction> _Interactions;
         private int _Selection = 0;
 
@@ -40,7 +40,7 @@ namespace Vocaluxe.Menu
             get { return _ScreenArea; }
         }
 
-        public CObjectInteractions(Base Base)
+        public CObjectInteractions(Basic Base)
         {
             _Base = Base;
             Init();

Vocaluxe/Menu/CParticle.cs

@@ -17,7 +17,7 @@ namespace Vocaluxe.Menu
     class CParticle
     {
         #region private vars
-        private Base _Base;
+        private Basic _Base;
         private string _TextureName;
         private STexture _Texture;
         private SRectF _Rect;
@@ -84,7 +84,7 @@ namespace Vocaluxe.Menu
         #endregion public vars
 
         #region Constructors
-        public CParticle(Base Base, string textureName, SColorF color, float x, float y, float size, float maxage, float z, float vx, float vy, float vr, float vsize, EParticeType type)
+        public CParticle(Basic Base, string textureName, SColorF color, float x, float y, float size, float maxage, float z, float vx, float vy, float vr, float vsize, EParticeType type)
         {
             _Base = Base;
             _TextureName = textureName;
@@ -107,7 +107,7 @@ namespace Vocaluxe.Menu
             _Rotation = (float)(_Base.Game.GetRandomDouble() * 360.0);
         }
 
-        public CParticle(Base Base, STexture texture, SColorF color, float x, float y, float size, float maxage, float z, float vx, float vy, float vr, float vsize, EParticeType type)
+        public CParticle(Basic Base, STexture texture, SColorF color, float x, float y, float size, float maxage, float z, float vx, float vy, float vr, float vsize, EParticeType type)
         {
             _Base = Base;
             _TextureName = String.Empty;
@@ -288,7 +288,7 @@ namespace Vocaluxe.Menu
 
     class CParticleEffect
     {
-        private Base _Base;
+        private Basic _Base;
         private List<CParticle> _Stars;
         private string _TextureName;
         private STexture _Texture;
@@ -316,7 +316,7 @@ namespace Vocaluxe.Menu
             set { _Area = value; }
         }
 
-        public CParticleEffect(Base Base, int MaxNumber, SColorF Color, SRectF Area, string TextureName, float Size, EParticeType Type)
+        public CParticleEffect(Basic Base, int MaxNumber, SColorF Color, SRectF Area, string TextureName, float Size, EParticeType Type)
         {
             _Base = Base;
             _Stars = new List<CParticle>();
@@ -331,7 +331,7 @@ namespace Vocaluxe.Menu
             _NextSpawnTime = 0f;
         }
 
-        public CParticleEffect(Base Base, int MaxNumber, SColorF Color, SRectF Area, STexture texture, float Size, EParticeType Type)
+        public CParticleEffect(Basic Base, int MaxNumber, SColorF Color, SRectF Area, STexture texture, float Size, EParticeType Type)
         {
             _Base = Base;
             _Stars = new List<CParticle>();

Vocaluxe/Menu/CPlaylist.cs

@@ -78,14 +78,14 @@ namespace Vocaluxe.Menu
 
         class PlaylistElement
         {
-            Base _Base;
+            Basic _Base;
             public CStatic Cover;
             public CStatic Background;
             public CText Text1;
             public CSelectSlide SelectSlide;
             public int Content;
 
-            public PlaylistElement(Base Base)
+            public PlaylistElement(Basic Base)
             {
                 _Base = Base;
             }
@@ -133,7 +133,7 @@ namespace Vocaluxe.Menu
             }
         }
 
-        private Base _Base;
+        private Basic _Base;
         private SThemePlaylist _Theme;
         private bool _ThemeLoaded;
 
@@ -191,7 +191,7 @@ namespace Vocaluxe.Menu
 
         //private static
 
-        public CPlaylist(Base Base)
+        public CPlaylist(Basic Base)
         {
             _Base = Base;
             _Theme = new SThemePlaylist();

Vocaluxe/Menu/CSelectSlide.cs

@@ -37,7 +37,7 @@ namespace Vocaluxe.Menu
 
     class CSelectSlide : IMenuElement, ICloneable
     {
-        private Base _Base;
+        private Basic _Base;
         private SThemeSelectSlide _Theme;
         private bool _ThemeLoaded;
 
@@ -139,7 +139,7 @@ namespace Vocaluxe.Menu
             }
         }
 
-        public CSelectSlide(Base Base)
+        public CSelectSlide(Basic Base)
         {
             _Base = Base;
             _Theme = new SThemeSelectSlide();

Vocaluxe/Menu/CStatic.cs

@@ -16,7 +16,7 @@ namespace Vocaluxe.Menu
 
     class CStatic : IMenuElement
     {
-        private Base _Base;
+        private Basic _Base;
 
         private SThemeStatic _Theme;
         private bool _ThemeLoaded;
@@ -54,7 +54,7 @@ namespace Vocaluxe.Menu
 
         public EAspect Aspect = EAspect.Stretch;
 
-        public CStatic(Base Base)
+        public CStatic(Basic Base)
         {
             _Base = Base;
             _Theme = new SThemeStatic();
@@ -90,7 +90,7 @@ namespace Vocaluxe.Menu
             Visible = s.Visible;
         }
 
-        public CStatic(Base Base, STexture texture, SColorF color, SRectF rect)
+        public CStatic(Basic Base, STexture texture, SColorF color, SRectF rect)
         {
             _Base = Base;
             _Theme = new SThemeStatic();
@@ -108,7 +108,7 @@ namespace Vocaluxe.Menu
             Visible = true;
         }
 
-        public CStatic(Base Base, string TextureSkinName, SColorF color, SRectF rect)
+        public CStatic(Basic Base, string TextureSkinName, SColorF color, SRectF rect)
         {
             _Base = Base;
             _Theme = new SThemeStatic();

Vocaluxe/Menu/CText.cs

@@ -36,7 +36,7 @@ namespace Vocaluxe.Menu
 
     public class CText : IMenuElement
     {
-        private Base _Base;
+        private Basic _Base;
         private SThemeText _Theme;
         private bool _ThemeLoaded;
 
@@ -219,7 +219,7 @@ namespace Vocaluxe.Menu
 
         public float Alpha = 1f;
 
-        public CText(Base Base)
+        public CText(Basic Base)
         {
             _Base = Base;
             _Theme = new SThemeText();
@@ -281,7 +281,7 @@ namespace Vocaluxe.Menu
             EditMode = text.EditMode;
         }
 
-        public CText(Base Base, float x, float y, float z, EAlignment align, float h, float mw, float r, float g, float b, float a, EStyle style, string font, string text, float rspace, float rheight)
+        public CText(Basic Base, float x, float y, float z, EAlignment align, float h, float mw, float r, float g, float b, float a, EStyle style, string font, string text, float rspace, float rheight)
         {
             _Base = Base;
             _Theme = new SThemeText();
@@ -319,7 +319,7 @@ namespace Vocaluxe.Menu
             ReflectionHeight = rheight;
         }
 
-        public CText(Base Base, float x, float y, float z, EAlignment align, float h, float mw, float r, float g, float b, float a, EStyle style, string font, string text)
+        public CText(Basic Base, float x, float y, float z, EAlignment align, float h, float mw, float r, float g, float b, float a, EStyle style, string font, string text)
         {
             _Base = Base;
             _Theme = new SThemeText();
@@ -355,7 +355,7 @@ namespace Vocaluxe.Menu
             Reflection = false;
         }
 
-        public CText(Base Base, float x, float y, float z, float h, float mw, EAlignment align, EStyle style, string font, SColorF col, string text, float rspace, float rheight)
+        public CText(Basic Base, float x, float y, float z, float h, float mw, EAlignment align, EStyle style, string font, SColorF col, string text, float rspace, float rheight)
         {
             _Base = Base;
             _Theme = new SThemeText();
@@ -393,7 +393,7 @@ namespace Vocaluxe.Menu
             ReflectionHeight = rheight;
         }
 
-        public CText(Base Base, float x, float y, float z, float h, float mw, EAlignment align, EStyle style, string font, SColorF col, string text)
+        public CText(Basic Base, float x, float y, float z, float h, float mw, EAlignment align, EStyle style, string font, SColorF col, string text)
         {
             _Base = Base;
             _Theme = new SThemeText();

Vocaluxe/Menu/IMenu.cs

@@ -11,7 +11,7 @@ namespace Vocaluxe.Menu
 {
     interface IMenu
     {
-        void Initialize(Base Base);
+        void Initialize(Basic Base);
 
         void LoadTheme();
         void SaveTheme();
@@ -62,6 +62,9 @@ namespace Vocaluxe.Menu
         int GetCoverSize();
 
         List<string> GetSongFolder();
+        ESongSorting GetSongSorting();
+        EOffOn GetTabs();
+        EOffOn GetIgnoreArticles();
     }
 
     public interface ISettings

Vocaluxe/Menu/SingNotes/CNotes.cs

@@ -83,7 +83,7 @@ namespace Vocaluxe.Menu.SingNotes
 
     public class CNote
     {
-        private Base _Base;
+        private Basic _Base;
         private int _StartBeat;
         private int _Duration;
         private int _Tone;
@@ -93,7 +93,7 @@ namespace Vocaluxe.Menu.SingNotes
         private bool _Perfect;          // for drawing perfect note effect
 
         #region Contructors
-        public CNote(Base Base)
+        public CNote(Basic Base)
         {
             _Base = Base;
             StartBeat = 0;
@@ -117,7 +117,7 @@ namespace Vocaluxe.Menu.SingNotes
             _Perfect = note._Perfect;
         }
 
-        public CNote(Base Base, int StartBeat, int Duration, int Tone, string Text)
+        public CNote(Basic Base, int StartBeat, int Duration, int Tone, string Text)
             : this(Base)
         {
             this.StartBeat = StartBeat;
@@ -127,7 +127,7 @@ namespace Vocaluxe.Menu.SingNotes
             this.Text = Text;
         }
 
-        public CNote(Base Base, int StartBeat, int Duration, int Tone, string Text, bool Hit)
+        public CNote(Basic Base, int StartBeat, int Duration, int Tone, string Text, bool Hit)
             : this(Base)
         {
             this.StartBeat = StartBeat;
@@ -138,13 +138,13 @@ namespace Vocaluxe.Menu.SingNotes
             this.Hit = Hit;
         }
 
-        public CNote(Base Base, int StartBeat, int Duration, int Tone, string Text, ENoteType NoteType)
+        public CNote(Basic Base, int StartBeat, int Duration, int Tone, string Text, ENoteType NoteType)
             : this(Base, StartBeat, Duration, Tone, Text)
         {
             this.NoteType = NoteType;
         }
 
-        public CNote(Base Base, int StartBeat, int Duration, int Tone, string Text, bool Hit, ENoteType NoteType)
+        public CNote(Basic Base, int StartBeat, int Duration, int Tone, string Text, bool Hit, ENoteType NoteType)
             : this(Base, StartBeat, Duration, Tone, Text)
         {
             this.NoteType = NoteType;

Vocaluxe/Menu/SingNotes/CSingNotes.cs

@@ -42,7 +42,7 @@ namespace Vocaluxe.Menu.SingNotes
 
     abstract class CSingNotes : ISingNotes, IMenuElement
     {
-        private Base _Base;
+        private Basic _Base;
         private SThemeSingBar _Theme;
         private bool _ThemeLoaded;
 
@@ -63,7 +63,7 @@ namespace Vocaluxe.Menu.SingNotes
             set { _BarPos = value; }
         }
 
-        public CSingNotes(Base Base)
+        public CSingNotes(Basic Base)
         {
             _Base = Base;
             _Theme = new SThemeSingBar();

Vocaluxe/Menu/SingNotes/CSingNotesClassic.cs

@@ -6,9 +6,9 @@ namespace Vocaluxe.Menu.SingNotes
 {
     class CSingNotesClassic : CSingNotes
     {
-        private Base _Base;
+        private Basic _Base;
 
-        public CSingNotesClassic(Base Base)
+        public CSingNotesClassic(Basic Base)
             : base(Base)
         {
             _Base = Base;

Vocaluxe/Menu/SongMenu/CSong.cs

@@ -69,7 +69,7 @@ namespace Vocaluxe.Menu.SongMenu
 
     public class CSong
     {
-        private Base _Base;
+        private Basic _Base;
         private bool _CoverLoaded = false;
         private bool _NotesLoaded = false;
         private STexture _CoverTextureSmall = new STexture(-1);
@@ -194,7 +194,7 @@ namespace Vocaluxe.Menu.SongMenu
             }
         }
 
-        public CSong(Base Base)
+        public CSong(Basic Base)
         {
             _Base = Base;
         }

Vocaluxe/Menu/SongMenu/CSongMenu.cs

@@ -11,12 +11,12 @@ namespace Vocaluxe.Menu.SongMenu
 {
     class CSongMenu : ISongMenu
     {
-        private Base _Base;
+        private Basic _Base;
 
         private ISongMenu _SongMenu;
         private ESongMenu _Type;
 
-        public CSongMenu(Base Base)
+        public CSongMenu(Basic Base)
         {
             _Base = Base;
             CreateSongMenu();

Vocaluxe/Menu/SongMenu/CSongMenuBook.cs

@@ -6,9 +6,9 @@ namespace Vocaluxe.Menu.SongMenu
 {
     class CSongMenuBook : CSongMenuFramework
     {
-        new private Base _Base;
+        new private Basic _Base;
 
-        public CSongMenuBook(Base Base)
+        public CSongMenuBook(Basic Base)
             : base(Base)
         {
             _Base = Base;

Vocaluxe/Menu/SongMenu/CSongMenuDreidel.cs

@@ -8,7 +8,7 @@ namespace Vocaluxe.Menu.SongMenu
 {
     class CSongMenuDreidel : CSongMenuFramework
     {
-        new private Base _Base;
+        new private Basic _Base;
         /*
         private SRectF _ScrollRect;
         private CStatic _CoverBig;
@@ -29,7 +29,7 @@ namespace Vocaluxe.Menu.SongMenu
         }
         */
 
-        public CSongMenuDreidel(Base Base)
+        public CSongMenuDreidel(Basic Base)
             : base(Base)
         {
             _Base = Base;

Vocaluxe/Menu/SongMenu/CSongMenuFramework.cs

@@ -91,7 +91,7 @@ namespace Vocaluxe.Menu.SongMenu
 
     abstract class CSongMenuFramework : ISongMenu
     {
-        protected Base _Base;
+        protected Basic _Base;
         protected SThemeSongMenu _Theme;
         private bool _ThemeLoaded;
 
@@ -233,7 +233,7 @@ namespace Vocaluxe.Menu.SongMenu
             _Visible = Visible;
         }
 
-        public CSongMenuFramework(Base Base)
+        public CSongMenuFramework(Basic Base)
         {
             _Base = Base;
             _Theme = new SThemeSongMenu();

Vocaluxe/Menu/SongMenu/CSongMenuList.cs

@@ -6,9 +6,9 @@ namespace Vocaluxe.Menu.SongMenu
 {
     class CSongMenuList : CSongMenuFramework
     {
-        new private Base _Base;
+        new private Basic _Base;
 
-        public CSongMenuList(Base Base)
+        public CSongMenuList(Basic Base)
             : base(Base)
         {
             _Base = Base;

Vocaluxe/Menu/SongMenu/CSongMenuTileBoard.cs

@@ -11,7 +11,7 @@ namespace Vocaluxe.Menu.SongMenu
 {
     class CSongMenuTileBoard : CSongMenuFramework
     {
-        new private Base _Base;
+        new private Basic _Base;
         private SRectF _ScrollRect;
         private List<CStatic> _Tiles;
         private CStatic _CoverBig;
@@ -42,7 +42,7 @@ namespace Vocaluxe.Menu.SongMenu
 
         private bool _SmallView = false;
 
-        public CSongMenuTileBoard(Base Base)
+        public CSongMenuTileBoard(Basic Base)
             : base(Base)
         {
             _Base = Base;

Vocaluxe/PartyModes/CPartyMode.cs

@@ -8,6 +8,7 @@ namespace Vocaluxe.PartyModes
 {
     abstract class CPartyMode : IPartyMode
     {
+        protected Basic _Base;
         protected ScreenSongOptions _ScreenSongOptions;
         protected List<CMenu> _Screens;
         protected string _Folder;
@@ -21,6 +22,11 @@ namespace Vocaluxe.PartyModes
             _ScreenSongOptions.Sorting = new SortingOptions();
         }
 
+        public void Initialize(Basic Base)
+        {
+            _Base = Base;
+        }
+
         #region Implementation
         public virtual bool Init(string Folder)
         {

Vocaluxe/PartyModes/CPartyModeNone.cs

@@ -2,8 +2,6 @@
 using System.Collections.Generic;
 using System.Text;
 
-using Vocaluxe.Base;
-
 namespace Vocaluxe.PartyModes
 {
     class CPartyModeNone : CPartyMode
@@ -22,9 +20,9 @@ namespace Vocaluxe.PartyModes
 
         public override ScreenSongOptions GetScreenSongOptions()
         {
-            _ScreenSongOptions.Sorting.SongSorting = CConfig.SongSorting;
-            _ScreenSongOptions.Sorting.Tabs = CConfig.Tabs;
-            _ScreenSongOptions.Sorting.IgnoreArticles = CConfig.IgnoreArticles;
+            _ScreenSongOptions.Sorting.SongSorting = _Base.Config.GetSongSorting();
+            _ScreenSongOptions.Sorting.Tabs = _Base.Config.GetTabs();
+            _ScreenSongOptions.Sorting.IgnoreArticles = _Base.Config.GetIgnoreArticles();
 
             return _ScreenSongOptions;
         }

Vocaluxe/PartyModes/IPartyMode.cs

@@ -53,6 +53,7 @@ namespace Vocaluxe.PartyModes
     interface IPartyMode
     {
         bool Init(string Folder);
+        void Initialize(Basic Base);
 
         CMenu GetNextPartyScreen();
         EScreens GetStartScreen();