Load complete theme-date with de-serialization.

VocaluxeLib/Menu/SongMenu/CSongMenu.cs

@@ -30,7 +30,13 @@ namespace VocaluxeLib.Menu.SongMenu
         public CSongMenu(int partyModeID)
         {
             _PartyModeID = partyModeID;
-            _CreateSongMenu();
+            _CreateSongMenu(new SThemeSongMenu());
+        }
+
+        public CSongMenu(SThemeSongMenu theme, int partyModeID)
+        {
+            _PartyModeID = partyModeID;
+            _CreateSongMenu(theme);
         }
 
         #region ISongMenu
@@ -155,11 +161,6 @@ namespace VocaluxeLib.Menu.SongMenu
             return _SongMenu.LoadTheme(xmlPath, elementName, xmlReader, skinIndex);
         }
 
-        public bool SaveTheme(XmlWriter writer)
-        {
-            return _SongMenu.SaveTheme(writer);
-        }
-
         public void UnloadTextures()
         {
             _SongMenu.UnloadTextures();
@@ -191,7 +192,7 @@ namespace VocaluxeLib.Menu.SongMenu
         }
         #endregion IMenuElement
 
-        private void _CreateSongMenu()
+        private void _CreateSongMenu(SThemeSongMenu theme)
         {
             if (_SongMenu != null)
                 _SongMenu.OnHide();
@@ -207,7 +208,7 @@ namespace VocaluxeLib.Menu.SongMenu
                     //    _SongMenu = new CSongMenuDreidel();
                     //    break;
                 case ESongMenu.TR_CONFIG_TILE_BOARD:
-                    _SongMenu = new CSongMenuTileBoard(_PartyModeID);
+                    _SongMenu = new CSongMenuTileBoard(theme, _PartyModeID);
                     break;
 
                     //case ESongMenu.TR_CONFIG_BOOK:

VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs

@@ -279,48 +279,6 @@ namespace VocaluxeLib.Menu.SongMenu
             return _ThemeLoaded;
         }
 
-        public virtual bool SaveTheme(XmlWriter writer)
-        {
-            if (_ThemeLoaded)
-            {
-                writer.WriteStartElement(_Theme.Name);
-
-                writer.WriteComment("<CoverBackground>: Texture name of cover background/tiles");
-                writer.WriteElementString("CoverBackground", _Theme.CoverBackgroundName);
-
-                writer.WriteComment("<CoverBigBackground>: Texture name of big cover background and info texts");
-                writer.WriteElementString("CoverBigBackground", _Theme.CoverBigBackgroundName);
-
-                writer.WriteComment("<DuetIcon>: Texture name of duet icon");
-                writer.WriteElementString("DuetIcon", _Theme.DuetIconName);
-
-                writer.WriteComment("<VideoIcon>: Texture name of video icon");
-                writer.WriteElementString("VideoIcon", _Theme.VideoIconName);
-
-                writer.WriteComment("<MedleyCalcIcon>: Texture name of medley calc (calculated) icon");
-                writer.WriteElementString("MedleyCalcIcon", _Theme.MedleyCalcIcon);
-
-                writer.WriteComment("<MedleyTagIcon>: Texture name of medley tag (manuelly set) icon");
-                writer.WriteElementString("MedleyTagIcon", _Theme.MedleyTagIcon);
-
-                writer.WriteComment("<Color>: Tile color from ColorScheme (high priority)");
-                writer.WriteComment("or <R>, <G>, <B>, <A> (lower priority)");
-                if (!String.IsNullOrEmpty(_Theme.Color.Name))
-                    writer.WriteElementString("Color", _Theme.Color.Name);
-                else
-                {
-                    writer.WriteElementString("R", _Color.R.ToString("#0.00"));
-                    writer.WriteElementString("G", _Color.G.ToString("#0.00"));
-                    writer.WriteElementString("B", _Color.B.ToString("#0.00"));
-                    writer.WriteElementString("A", _Color.A.ToString("#0.00"));
-                }
-
-                writer.WriteEndElement();
-
-                return true;
-            }
-            return false;
-        }
         #endregion Theme
 
         public virtual void Init()

VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs

@@ -103,6 +103,9 @@ namespace VocaluxeLib.Menu.SongMenu
         public CSongMenuTileBoard(int partyModeID)
             : base(partyModeID) {}
 
+        public CSongMenuTileBoard(SThemeSongMenu theme, int partyModeID)
+            : base(theme, partyModeID) {}
+
         protected override int _PreviewNr
         {
             set
@@ -158,59 +161,6 @@ namespace VocaluxeLib.Menu.SongMenu
             return themeLoaded;
         }
 
-        public override bool SaveTheme(XmlWriter writer)
-        {
-            writer.WriteComment("<SongMenuTileBoard>: Config for TileBoard view");
-            writer.WriteStartElement("SongMenuTileBoard");
-
-            writer.WriteComment("<NumW>: Number of tiles horizontal");
-            writer.WriteElementString("NumW", _Theme.SongMenuTileBoard.NumW.ToString());
-
-            writer.WriteComment("<NumH>: Number of tiles vertical");
-            writer.WriteElementString("NumH", _Theme.SongMenuTileBoard.NumH.ToString());
-
-            writer.WriteComment("<SpaceW>: Space between tiles horizontal");
-            writer.WriteElementString("SpaceW", _Theme.SongMenuTileBoard.SpaceW.ToString("#0.00"));
-
-            writer.WriteComment("<SpaceH>: Space between tiles vertical");
-            writer.WriteElementString("SpaceH", _Theme.SongMenuTileBoard.SpaceH.ToString("#0.00"));
-
-            writer.WriteComment("<NumWsmall>: Number of tiles horizontal in small-mode");
-            writer.WriteElementString("NumWsmall", _Theme.SongMenuTileBoard.NumWsmall.ToString());
-
-            writer.WriteComment("<NumHsmall>: Number of tiles vertical in small-mode");
-            writer.WriteElementString("NumHsmall", _Theme.SongMenuTileBoard.NumHsmall.ToString());
-
-            writer.WriteComment("<TileRectX>, <TileRectY>, <TileRectZ>, <TileRectW>, <TileRectH>: SongMenu position, width and height");
-            writer.WriteElementString("TileRectX", _Theme.SongMenuTileBoard.TileRect.X.ToString("#0"));
-            writer.WriteElementString("TileRectY", _Theme.SongMenuTileBoard.TileRect.Y.ToString("#0"));
-            writer.WriteElementString("TileRectZ", _Theme.SongMenuTileBoard.TileRect.Z.ToString("#0.00"));
-            writer.WriteElementString("TileRectW", _Theme.SongMenuTileBoard.TileRect.W.ToString("#0"));
-            writer.WriteElementString("TileRectH", _Theme.SongMenuTileBoard.TileRect.H.ToString("#0"));
-
-            writer.WriteComment("<TileRectSmallX>, <TileRectSmallY>, <TileRectSmallZ>, <TileRectSmallW>, <TileRectSmallH>: SongMenu position, width and height in small-mode");
-            writer.WriteElementString("TileRectSmallX", _Theme.SongMenuTileBoard.TileRectSmall.X.ToString("#0"));
-            writer.WriteElementString("TileRectSmallY", _Theme.SongMenuTileBoard.TileRectSmall.Y.ToString("#0"));
-            writer.WriteElementString("TileRectSmallZ", _Theme.SongMenuTileBoard.TileRectSmall.Z.ToString("#0.00"));
-            writer.WriteElementString("TileRectSmallW", _Theme.SongMenuTileBoard.TileRectSmall.W.ToString("#0"));
-            writer.WriteElementString("TileRectSmallH", _Theme.SongMenuTileBoard.TileRectSmall.H.ToString("#0"));
-
-            _Artist.SaveTheme(writer);
-            _Title.SaveTheme(writer);
-            _SongLength.SaveTheme(writer);
-
-            _CoverBig.SaveTheme(writer);
-            _TextBG.SaveTheme(writer);
-            _DuetIcon.SaveTheme(writer);
-            _VideoIcon.SaveTheme(writer);
-            _MedleyCalcIcon.SaveTheme(writer);
-            _MedleyTagIcon.SaveTheme(writer);
-
-            writer.WriteEndElement();
-
-            return true;
-        }
-
         public override void Init()
         {
             base.Init();