Rename LoadTextures to LoadSkin

(Its also Colors, not only textures!)
This commit is contained in:
Flamefire committed 2014-10-18 10:42:35 +02:00
1 parent 9a699f4cb5
commit d8cce13211
25 files changed
+176 -181

No files matched your search

+7 -7
View File
@@ -82,7 +82,7 @@ namespace VocaluxeLib.Menu
_Theme = theme;
_PartyModeID = partyModeID;
LoadTextures();
LoadSkin();
}
#endregion Constructors
@@ -128,7 +128,7 @@ namespace VocaluxeLib.Menu
if (_ThemeLoaded)
{
_Theme.Name = elementName;
LoadTextures();
LoadSkin();
}
return _ThemeLoaded;
}
@@ -172,13 +172,13 @@ namespace VocaluxeLib.Menu
_DrawColor();
}
public void UnloadTextures()
public void UnloadSkin()
{
_SlideShowTextures.Clear();
CBase.Video.Close(ref _VideoStream);
}
public void LoadTextures()
public void LoadSkin()
{
_Theme.Color.Get(_PartyModeID, out Color);
@@ -210,10 +210,10 @@ namespace VocaluxeLib.Menu
_SlideShowTextures.Clear();
}
public void ReloadTextures()
public void ReloadSkin()
{
UnloadTextures();
LoadTextures();
UnloadSkin();
LoadSkin();
}
public SThemeBackground GetTheme()
+10 -10
View File
@@ -129,7 +129,7 @@ namespace VocaluxeLib.Menu
Selected = false;
EditMode = false;
LoadTextures();
LoadSkin();
}
public CButton(CButton button)
@@ -243,7 +243,7 @@ namespace VocaluxeLib.Menu
_Theme.Text = Text.GetTheme();
_Theme.SText = _SelText.GetTheme();
LoadTextures();
LoadSkin();
}
return _ThemeLoaded;
}
@@ -304,20 +304,20 @@ namespace VocaluxeLib.Menu
Selected = CHelper.IsInBounds(Rect, x, y);
}
public void UnloadTextures()
public void UnloadSkin()
{
Text.UnloadTextures();
Text.UnloadSkin();
}
public void LoadTextures()
public void LoadSkin()
{
Text = new CText(_Theme.Text, _PartyModeID);
Text.LoadTextures();
Text.LoadSkin();
if (_Theme.STextSpecified)
{
_SelText = new CText(_Theme.SText, _PartyModeID);
_SelText.LoadTextures();
_SelText.LoadSkin();
}
_Theme.Color.Get(_PartyModeID, out Color);
@@ -343,10 +343,10 @@ namespace VocaluxeLib.Menu
Text.Z = _Theme.Rect.Z;
}
public void ReloadTextures()
public void ReloadSkin()
{
UnloadTextures();
LoadTextures();
UnloadSkin();
LoadSkin();
}
public SThemeButton GetTheme()
+7 -7
View File
@@ -105,7 +105,7 @@ namespace VocaluxeLib.Menu
Visible = true;
ScreenHandles = false;
LoadTextures();
LoadSkin();
}
public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader)
@@ -169,7 +169,7 @@ namespace VocaluxeLib.Menu
_Theme.Name = elementName;
_Theme.Color.Color = Color;
_Theme.MaxColor.Color = MaxColor;
LoadTextures();
LoadSkin();
}
return _ThemeLoaded;
}
@@ -243,9 +243,9 @@ namespace VocaluxeLib.Menu
}
}
public void UnloadTextures() {}
public void UnloadSkin() {}
public void LoadTextures()
public void LoadSkin()
{
_Theme.Color.Get(_PartyModeID, out Color);
_Theme.MaxColor.Get(_PartyModeID, out MaxColor);
@@ -264,10 +264,10 @@ namespace VocaluxeLib.Menu
_Bars[i] = 0f;
}
public void ReloadTextures()
public void ReloadSkin()
{
UnloadTextures();
LoadTextures();
UnloadSkin();
LoadSkin();
}
public SThemeEqualizer GetTheme()
+7 -7
View File
@@ -127,7 +127,7 @@ namespace VocaluxeLib.Menu
LyricStyle = ELyricStyle.Fill;
LoadTextures();
LoadSkin();
}
public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader)
@@ -166,7 +166,7 @@ namespace VocaluxeLib.Menu
_Theme.Name = elementName;
_Theme.Color.Color = _Color;
_Theme.SColor.Color = _ColorProcessed;
LoadTextures();
LoadSkin();
_Text = new CText(_X, _Y, _Z, _H, _MaxW, EAlignment.Left, EStyle.Bold, "Normal", _Color, String.Empty);
}
return _ThemeLoaded;
@@ -441,9 +441,9 @@ namespace VocaluxeLib.Menu
}
#endregion draw
public void UnloadTextures() {}
public void UnloadSkin() {}
public void LoadTextures()
public void LoadSkin()
{
_Theme.Color.Get(_PartyModeID, out _Color);
_Theme.SColor.Get(_PartyModeID, out _ColorProcessed);
@@ -452,10 +452,10 @@ namespace VocaluxeLib.Menu
_Text = new CText(_X, _Y, _Z, _H, _MaxW, EAlignment.Left, EStyle.Bold, "Normal", _Color, String.Empty);
}
public void ReloadTextures()
public void ReloadSkin()
{
UnloadTextures();
LoadTextures();
UnloadSkin();
LoadSkin();
}
public SThemeLyrics GetTheme()
+29 -29
View File
@@ -398,88 +398,88 @@ namespace VocaluxeLib.Menu
}
}
public virtual void ReloadTextures()
public virtual void ReloadSkin()
{
foreach (CBackground background in _Backgrounds)
background.ReloadTextures();
background.ReloadSkin();
foreach (CButton button in _Buttons)
button.ReloadTextures();
button.ReloadSkin();
foreach (CText text in _Texts)
text.ReloadTextures();
text.ReloadSkin();
foreach (CStatic stat in _Statics)
stat.ReloadTextures();
stat.ReloadSkin();
foreach (CSelectSlide slide in _SelectSlides)
slide.ReloadTextures();
slide.ReloadSkin();
foreach (CSongMenu sm in _SongMenus)
sm.ReloadTextures();
sm.ReloadSkin();
foreach (CLyric lyric in _Lyrics)
lyric.ReloadTextures();
lyric.ReloadSkin();
foreach (CSingNotes sn in _SingNotes)
sn.ReloadTextures();
sn.ReloadSkin();
foreach (CNameSelection ns in _NameSelections)
ns.ReloadTextures();
ns.ReloadSkin();
foreach (CEqualizer eq in _Equalizers)
eq.ReloadTextures();
eq.ReloadSkin();
foreach (CPlaylist pls in _Playlists)
pls.ReloadTextures();
pls.ReloadSkin();
foreach (CParticleEffect pe in _ParticleEffects)
pe.ReloadTextures();
pe.ReloadSkin();
foreach (CScreenSetting se in _ScreenSettings)
se.ReloadTextures();
se.ReloadSkin();
}
public virtual void UnloadTextures()
public virtual void UnloadSkin()
{
foreach (CBackground background in _Backgrounds)
background.UnloadTextures();
background.UnloadSkin();
foreach (CButton button in _Buttons)
button.UnloadTextures();
button.UnloadSkin();
foreach (CText text in _Texts)
text.UnloadTextures();
text.UnloadSkin();
foreach (CStatic stat in _Statics)
stat.UnloadTextures();
stat.UnloadSkin();
foreach (CSelectSlide slide in _SelectSlides)
slide.UnloadTextures();
slide.UnloadSkin();
foreach (CSongMenu sm in _SongMenus)
sm.UnloadTextures();
sm.UnloadSkin();
foreach (CLyric lyric in _Lyrics)
lyric.UnloadTextures();
lyric.UnloadSkin();
foreach (CSingNotes sn in _SingNotes)
sn.UnloadTextures();
sn.UnloadSkin();
foreach (CNameSelection ns in _NameSelections)
ns.UnloadTextures();
ns.UnloadSkin();
foreach (CPlaylist pls in _Playlists)
pls.UnloadTextures();
pls.UnloadSkin();
foreach (CEqualizer eq in _Equalizers)
eq.UnloadTextures();
eq.UnloadSkin();
foreach (CParticleEffect pe in _ParticleEffects)
pe.UnloadTextures();
pe.UnloadSkin();
foreach (CScreenSetting se in _ScreenSettings)
se.UnloadTextures();
se.UnloadSkin();
}
public virtual void ReloadTheme(string xmlPath)
@@ -487,7 +487,7 @@ namespace VocaluxeLib.Menu
if (ThemePath == "")
return;
UnloadTextures();
UnloadSkin();
_ClearElements();
LoadTheme(xmlPath);
}
+7 -7
View File
@@ -134,7 +134,7 @@ namespace VocaluxeLib.Menu
_VisibleProfiles = new List<int>();
_UsedProfiles = new List<int>();
LoadTextures();
LoadSkin();
}
public void Init()
@@ -206,7 +206,7 @@ namespace VocaluxeLib.Menu
_Theme.Name = elementName;
_Theme.Tiles.Name.Color.Color = _ColorNameTile;
_Theme.ColorEmptyTile.Color = _ColorEmptyTile;
LoadTextures();
LoadSkin();
}
return _ThemeLoaded;
}
@@ -422,9 +422,9 @@ namespace VocaluxeLib.Menu
return new CStatic(_PartyModeID);
}
public void UnloadTextures() {}
public void UnloadSkin() {}
public void LoadTextures()
public void LoadSkin()
{
_TextureEmptyTile = CBase.Themes.GetSkinTexture(_Theme.SkinEmptyTile, _PartyModeID);
_TextureTileSelected = CBase.Themes.GetSkinTexture(_Theme.SkinTileSelected, _PartyModeID);
@@ -435,10 +435,10 @@ namespace VocaluxeLib.Menu
Rect = _Theme.Rect;
}
public void ReloadTextures()
public void ReloadSkin()
{
UnloadTextures();
LoadTextures();
UnloadSkin();
LoadSkin();
_PrepareTiles();
}
+7 -7
View File
@@ -387,7 +387,7 @@ namespace VocaluxeLib.Menu
_NextSpawnTime = 0f;
Visible = true;
LoadTextures();
LoadSkin();
}
public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader)
@@ -421,7 +421,7 @@ namespace VocaluxeLib.Menu
{
_Theme.Name = elementName;
_Theme.Color.Color = Color;
LoadTextures();
LoadSkin();
}
return _ThemeLoaded;
}
@@ -568,12 +568,12 @@ namespace VocaluxeLib.Menu
}
}
public void UnloadTextures()
public void UnloadSkin()
{
Texture = null;
}
public void LoadTextures()
public void LoadSkin()
{
_Theme.Color.Get(_PartyModeID, out Color);
@@ -583,10 +583,10 @@ namespace VocaluxeLib.Menu
Rect = _Theme.Rect;
}
public void ReloadTextures()
public void ReloadSkin()
{
UnloadTextures();
LoadTextures();
UnloadSkin();
LoadSkin();
}
public SThemeParticleEffect GetTheme()
+27 -27
View File
@@ -275,7 +275,7 @@ namespace VocaluxeLib.Menu
Visible = false;
Selected = false;
LoadTextures();
LoadSkin();
}
public void Init()
@@ -354,7 +354,7 @@ namespace VocaluxeLib.Menu
_Theme.ButtonPlaylistSave = ButtonPlaylistSave.GetTheme();
_Theme.ButtonPlaylistDelete = ButtonPlaylistDelete.GetTheme();
LoadTextures();
LoadSkin();
}
return _ThemeLoaded;
}
@@ -390,51 +390,51 @@ namespace VocaluxeLib.Menu
return CHelper.IsInBounds(CompleteRect, mouseEvent) || _Interactions.IsMouseOver(mouseEvent);
}
public void UnloadTextures()
public void UnloadSkin()
{
Text1.UnloadTextures();
ButtonPlaylistClose.UnloadTextures();
ButtonPlaylistDelete.UnloadTextures();
ButtonPlaylistName.UnloadTextures();
ButtonPlaylistSave.UnloadTextures();
ButtonPlaylistSing.UnloadTextures();
Text1.UnloadSkin();
ButtonPlaylistClose.UnloadSkin();
ButtonPlaylistDelete.UnloadSkin();
ButtonPlaylistName.UnloadSkin();
ButtonPlaylistSave.UnloadSkin();
ButtonPlaylistSing.UnloadSkin();
StaticCover.UnloadTextures();
StaticPlaylistFooter.UnloadTextures();
StaticPlaylistHeader.UnloadTextures();
StaticCover.UnloadSkin();
StaticPlaylistFooter.UnloadSkin();
StaticPlaylistHeader.UnloadSkin();
SelectSlideGameMode.UnloadTextures();
SelectSlideGameMode.UnloadSkin();
}
public void LoadTextures()
public void LoadSkin()
{
_Theme.ColorBackground.Get(_PartyModeID, out BackgroundColor);
_Theme.SelColorBackground.Get(_PartyModeID, out BackgroundSelColor);
Rect = _Theme.Rect;
Text1.LoadTextures();
ButtonPlaylistClose.LoadTextures();
ButtonPlaylistDelete.LoadTextures();
ButtonPlaylistName.LoadTextures();
ButtonPlaylistSave.LoadTextures();
ButtonPlaylistSing.LoadTextures();
Text1.LoadSkin();
ButtonPlaylistClose.LoadSkin();
ButtonPlaylistDelete.LoadSkin();
ButtonPlaylistName.LoadSkin();
ButtonPlaylistSave.LoadSkin();
ButtonPlaylistSing.LoadSkin();
StaticCover.LoadTextures();
StaticPlaylistFooter.LoadTextures();
StaticPlaylistHeader.LoadTextures();
StaticCover.LoadSkin();
StaticPlaylistFooter.LoadSkin();
StaticPlaylistHeader.LoadSkin();
SelectSlideGameMode.LoadTextures();
SelectSlideGameMode.LoadSkin();
_UpdateRect();
Init();
}
public void ReloadTextures()
public void ReloadSkin()
{
UnloadTextures();
LoadTextures();
UnloadSkin();
LoadSkin();
}
public bool HandleInput(SKeyEvent keyEvent)
+3 -3
View File
@@ -104,11 +104,11 @@ namespace VocaluxeLib.Menu
return null;
}
public void UnloadTextures() {}
public void UnloadSkin() {}
public void LoadTextures() {}
public void LoadSkin() {}
public void ReloadTextures() {}
public void ReloadSkin() {}
public SScreenSetting GetTheme()
{
+7 -7
View File
@@ -269,7 +269,7 @@ namespace VocaluxeLib.Menu
_ValueNames = new List<string>();
_ValuePartyModeIDs = new List<int>();
LoadTextures();
LoadSkin();
}
public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader)
@@ -396,7 +396,7 @@ namespace VocaluxeLib.Menu
_Theme.SColor.Color = SelColor;
_Theme.TextColor.Color = TextColor;
_Theme.TextSColor.Color = SelTextColor;
LoadTextures();
LoadSkin();
}
return _ThemeLoaded;
}
@@ -691,9 +691,9 @@ namespace VocaluxeLib.Menu
return _Theme;
}
public void UnloadTextures() {}
public void UnloadSkin() {}
public void LoadTextures()
public void LoadSkin()
{
_Theme.Color.Get(_PartyModeID, out Color);
_Theme.SColor.Get(_PartyModeID, out SelColor);
@@ -715,10 +715,10 @@ namespace VocaluxeLib.Menu
MaxW = _Theme.TextMaxW;
}
public void ReloadTextures()
public void ReloadSkin()
{
UnloadTextures();
LoadTextures();
UnloadSkin();
LoadSkin();
}
public object Clone()
+7 -7
View File
@@ -114,7 +114,7 @@ namespace VocaluxeLib.Menu
_PartyModeID = partyModeID;
_Theme = theme;
LoadTextures();
LoadSkin();
}
public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader)
@@ -158,7 +158,7 @@ namespace VocaluxeLib.Menu
if (_ThemeLoaded)
{
_Theme.Name = elementName;
LoadTextures();
LoadSkin();
}
return _ThemeLoaded;
}
@@ -191,9 +191,9 @@ namespace VocaluxeLib.Menu
CBase.Drawing.DrawRect(new SColorF(1f, 1f, 1f, 0.5f), rect);
}
public void UnloadTextures() {}
public void UnloadSkin() {}
public void LoadTextures()
public void LoadSkin()
{
_Theme.Color.Get(_PartyModeID, out Color);
@@ -206,10 +206,10 @@ namespace VocaluxeLib.Menu
}
}
public void ReloadTextures()
public void ReloadSkin()
{
UnloadTextures();
LoadTextures();
UnloadSkin();
LoadSkin();
}
public SThemeStatic GetTheme()
+7 -7
View File
@@ -318,7 +318,7 @@ namespace VocaluxeLib.Menu
_ButtonText = buttonText;
LoadTextures();
LoadSkin();
}
public bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader)
@@ -393,7 +393,7 @@ namespace VocaluxeLib.Menu
_PositionNeedsUpdate = true;
if (_ThemeLoaded)
LoadTextures();
LoadSkin();
return _ThemeLoaded;
}
@@ -453,9 +453,9 @@ namespace VocaluxeLib.Menu
Y -= ry;
}
public void UnloadTextures() {}
public void UnloadSkin() {}
public void LoadTextures()
public void LoadSkin()
{
_Theme.Color.Get(_PartyModeID, out Color);
_Theme.SColor.Get(_PartyModeID, out SelColor);
@@ -480,10 +480,10 @@ namespace VocaluxeLib.Menu
_ThemeLoaded = true;
}
public void ReloadTextures()
public void ReloadSkin()
{
UnloadTextures();
LoadTextures();
UnloadSkin();
LoadSkin();
}
public SThemeText GetTheme()
+2 -2
View File
@@ -25,8 +25,8 @@ namespace VocaluxeLib.Menu
void LoadTheme(string xmlPath);
void SaveTheme();
void ReloadTextures();
void UnloadTextures();
void ReloadSkin();
void UnloadSkin();
void ReloadTheme(string xmlPath);
bool HandleInput(SKeyEvent keyEvent);
+3 -3
View File
@@ -25,9 +25,9 @@ namespace VocaluxeLib.Menu
bool LoadTheme(string xmlPath, string elementName, CXMLReader xmlReader);
void UnloadTextures();
void LoadTextures();
void ReloadTextures();
void UnloadSkin();
void LoadSkin();
void ReloadSkin();
void MoveElement(int stepX, int stepY);
void ResizeElement(int stepW, int stepH);
+7 -7
View File
@@ -106,7 +106,7 @@ namespace VocaluxeLib.Menu.SingNotes
BarPos = new SRectF[CBase.Settings.GetMaxNumPlayer(),CBase.Settings.GetMaxNumPlayer()];
LoadTextures();
LoadSkin();
}
public string GetThemeName()
@@ -158,7 +158,7 @@ namespace VocaluxeLib.Menu.SingNotes
if (_ThemeLoaded)
{
_Theme.Name = elementName;
LoadTextures();
LoadSkin();
}
return _ThemeLoaded;
@@ -411,9 +411,9 @@ namespace VocaluxeLib.Menu.SingNotes
perfnote.Draw();
}
public void UnloadTextures() {}
public void UnloadSkin() {}
public void LoadTextures()
public void LoadSkin()
{
foreach (SBarPosition bp in _Theme.BarPos)
{
@@ -424,10 +424,10 @@ namespace VocaluxeLib.Menu.SingNotes
}
}
public void ReloadTextures()
public void ReloadSkin()
{
UnloadTextures();
LoadTextures();
UnloadSkin();
LoadSkin();
}
public SThemeSingBar GetTheme()
+6 -6
View File
@@ -161,19 +161,19 @@ namespace VocaluxeLib.Menu.SongMenu
return _SongMenu.LoadTheme(xmlPath, elementName, xmlReader);
}
public void UnloadTextures()
public void UnloadSkin()
{
_SongMenu.UnloadTextures();
_SongMenu.UnloadSkin();
}
public void LoadTextures()
public void LoadSkin()
{
_SongMenu.LoadTextures();
_SongMenu.LoadSkin();
}
public void ReloadTextures()
public void ReloadSkin()
{
_SongMenu.ReloadTextures();
_SongMenu.ReloadSkin();
}
public void MoveElement(int stepX, int stepY)
@@ -168,7 +168,7 @@ namespace VocaluxeLib.Menu.SongMenu
_PartyModeID = partyModeID;
_Theme = theme;
LoadTextures();
LoadSkin();
}
#region Theme
@@ -231,7 +231,7 @@ namespace VocaluxeLib.Menu.SongMenu
{
_Theme.Name = elementName;
LoadTextures();
LoadSkin();
Init();
}
@@ -321,19 +321,19 @@ namespace VocaluxeLib.Menu.SongMenu
_PreviewNr = _SelectionNr;
}
public virtual void UnloadTextures() {}
public virtual void UnloadSkin() {}
public virtual void LoadTextures()
public virtual void LoadSkin()
{
Init();
_Theme.Color.Get(_PartyModeID, out _ColorInternal);
}
public void ReloadTextures()
public void ReloadSkin()
{
UnloadTextures();
LoadTextures();
UnloadSkin();
LoadSkin();
}
public bool EnterSelectedCategory()
@@ -153,7 +153,7 @@ namespace VocaluxeLib.Menu.SongMenu
_Theme.SongMenuTileBoard.StaticTextBG = _TextBG.GetTheme();
_Theme.SongMenuTileBoard.StaticVideoIcon = _VideoIcon.GetTheme();
LoadTextures();
LoadSkin();
Init();
}
@@ -610,9 +610,9 @@ namespace VocaluxeLib.Menu.SongMenu
_Offset = offset;
}
public override void LoadTextures()
public override void LoadSkin()
{
base.LoadTextures();
base.LoadSkin();
_Artist = new CText(_Theme.SongMenuTileBoard.TextArtist, _PartyModeID);
_Title = new CText(_Theme.SongMenuTileBoard.TextTitle, _PartyModeID);