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

added partymodeID to all elements, fixed bug in buttons (text was drawn twice)

Browse Source
This commit is contained in:
Alexander Eckart committed 2012-12-15 18:40:22 +01:00
1 parent 632206c317
commit 9257e6f134
32 files changed
+725 -136
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

VocaluxeLib/Menu/SongMenu/CSongMenu.cs
+4 -2
View File
@@ -11,13 +11,15 @@ namespace Vocaluxe.Menu.SongMenu
{
public class CSongMenu : ISongMenu
{
private int _PartyModeID;
private Basic _Base;
private ISongMenu _SongMenu;
private ESongMenu _Type;
public CSongMenu(Basic Base)
public CSongMenu(Basic Base, int PartyModeID)
{
_PartyModeID = PartyModeID;
_Base = Base;
CreateSongMenu();
}
@@ -218,7 +220,7 @@ namespace Vocaluxe.Menu.SongMenu
// break;
case ESongMenu.TR_CONFIG_TILE_BOARD:
_SongMenu = new CSongMenuTileBoard(_Base);
_SongMenu = new CSongMenuTileBoard(_Base, _PartyModeID);
break;
//case ESongMenu.TR_CONFIG_BOOK:
VocaluxeLib/Menu/SongMenu/CSongMenuBook.cs
+2 -2
View File
@@ -8,8 +8,8 @@ namespace Vocaluxe.Menu.SongMenu
{
new private Basic _Base;
public CSongMenuBook(Basic Base)
: base(Base)
public CSongMenuBook(Basic Base, int PartyModeID)
: base(Base, PartyModeID)
{
_Base = Base;
}
VocaluxeLib/Menu/SongMenu/CSongMenuDreidel.cs
+2 -2
View File
@@ -29,8 +29,8 @@ namespace Vocaluxe.Menu.SongMenu
}
*/
public CSongMenuDreidel(Basic Base)
: base(Base)
public CSongMenuDreidel(Basic Base, int PartyModeID)
: base(Base, PartyModeID)
{
_Base = Base;
}
VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs
+13 -11
View File
@@ -91,6 +91,7 @@ namespace Vocaluxe.Menu.SongMenu
abstract class CSongMenuFramework : ISongMenu
{
protected int _PartyModeID;
protected Basic _Base;
protected SThemeSongMenu _Theme;
private bool _ThemeLoaded;
@@ -233,21 +234,22 @@ namespace Vocaluxe.Menu.SongMenu
_Visible = Visible;
}
public CSongMenuFramework(Basic Base)
public CSongMenuFramework(Basic Base, int PartyModeID)
{
_PartyModeID = PartyModeID;
_Base = Base;
_Theme = new SThemeSongMenu();
_Theme.songMenuTileBoard.TextArtist = new CText(_Base);
_Theme.songMenuTileBoard.TextTitle = new CText(_Base);
_Theme.songMenuTileBoard.TextSongLength = new CText(_Base);
_Theme.songMenuTileBoard.TextArtist = new CText(_Base, _PartyModeID);
_Theme.songMenuTileBoard.TextTitle = new CText(_Base, _PartyModeID);
_Theme.songMenuTileBoard.TextSongLength = new CText(_Base, _PartyModeID);
_Theme.songMenuTileBoard.StaticCoverBig = new CStatic(_Base);
_Theme.songMenuTileBoard.StaticTextBG = new CStatic(_Base);
_Theme.songMenuTileBoard.StaticDuetIcon = new CStatic(_Base);
_Theme.songMenuTileBoard.StaticVideoIcon = new CStatic(_Base);
_Theme.songMenuTileBoard.StaticMedleyCalcIcon = new CStatic(_Base);
_Theme.songMenuTileBoard.StaticMedleyTagIcon = new CStatic(_Base);
_Theme.songMenuTileBoard.StaticCoverBig = new CStatic(_Base, _PartyModeID);
_Theme.songMenuTileBoard.StaticTextBG = new CStatic(_Base, _PartyModeID);
_Theme.songMenuTileBoard.StaticDuetIcon = new CStatic(_Base, _PartyModeID);
_Theme.songMenuTileBoard.StaticVideoIcon = new CStatic(_Base, _PartyModeID);
_Theme.songMenuTileBoard.StaticMedleyCalcIcon = new CStatic(_Base, _PartyModeID);
_Theme.songMenuTileBoard.StaticMedleyTagIcon = new CStatic(_Base, _PartyModeID);
_ThemeLoaded = false;
}
@@ -540,7 +542,7 @@ namespace Vocaluxe.Menu.SongMenu
public virtual CStatic GetSelectedSongCover()
{
return new CStatic(_Base);
return new CStatic(_Base, _PartyModeID);
}
public virtual int GetSelectedCategory()
VocaluxeLib/Menu/SongMenu/CSongMenuList.cs
+2 -2
View File
@@ -8,8 +8,8 @@ namespace Vocaluxe.Menu.SongMenu
{
new private Basic _Base;
public CSongMenuList(Basic Base)
: base(Base)
public CSongMenuList(Basic Base, int PartyModeID)
: base(Base, PartyModeID)
{
_Base = Base;
}
VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs
+6 -6
View File
@@ -42,8 +42,8 @@ namespace Vocaluxe.Menu.SongMenu
private bool _SmallView = false;
public CSongMenuTileBoard(Basic Base)
: base(Base)
public CSongMenuTileBoard(Basic Base, int PartyModeID)
: base(Base, PartyModeID)
{
_Base = Base;
}
@@ -79,7 +79,7 @@ namespace Vocaluxe.Menu.SongMenu
{
SRectF rect = new SRectF(_Theme.songMenuTileBoard.TileRect.X + j * (_TileW + _SpaceW),
_Theme.songMenuTileBoard.TileRect.Y + i * (_TileH + _SpaceH), _TileW, _TileH, _Rect.Z);
CStatic tile = new CStatic(_Base, _CoverTexture, Color, rect);
CStatic tile = new CStatic(_Base, _PartyModeID, _CoverTexture, Color, rect);
_Tiles.Add(tile);
}
}
@@ -523,7 +523,7 @@ namespace Vocaluxe.Menu.SongMenu
if (tile.Selected)
return new CStatic(tile);
}
return new CStatic(_Base);
return new CStatic(_Base, _PartyModeID);
}
public override void SetSelectedSong(int VisibleSongNr)
@@ -776,7 +776,7 @@ namespace Vocaluxe.Menu.SongMenu
{
SRectF rect = new SRectF(_Theme.songMenuTileBoard.TileRectSmall.X + j * (_TileW + _SpaceW),
_Theme.songMenuTileBoard.TileRectSmall.Y + i * (_TileH + _SpaceH), _TileW, _TileH, _Rect.Z);
CStatic tile = new CStatic(_Base, _CoverTexture, Color, rect);
CStatic tile = new CStatic(_Base, _PartyModeID, _CoverTexture, Color, rect);
_Tiles.Add(tile);
}
}
@@ -802,7 +802,7 @@ namespace Vocaluxe.Menu.SongMenu
{
SRectF rect = new SRectF(_Theme.songMenuTileBoard.TileRect.X + j * (_TileW + _SpaceW),
_Theme.songMenuTileBoard.TileRect.Y + i * (_TileH + _SpaceH), _TileW, _TileH, _Rect.Z);
CStatic tile = new CStatic(_Base, _CoverTexture, Color, rect);
CStatic tile = new CStatic(_Base, _PartyModeID, _CoverTexture, Color, rect);
_Tiles.Add(tile);
}
}