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

come corrections

Browse Source
This commit is contained in:
Alexander Eckart committed 2012-12-14 19:50:59 +01:00
1 parent 028e0b4dcb
commit cd07317ac0
13 files changed
+88 -51
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Vocaluxe/Base/CGraphics.cs
+3 -30
View File
@@ -5,39 +5,12 @@ using System.Drawing;
using System.Text; using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using Vocaluxe.Base; using Vocaluxe.Menu;
using Vocaluxe.Lib.Draw; using Vocaluxe.PartyModes;
using Vocaluxe.Screens; using Vocaluxe.Screens;
namespace Vocaluxe.Menu namespace Vocaluxe.Base
{ {
enum EScreens
{
ScreenTest = 0,
ScreenLoad = 1,
ScreenMain = 2,
ScreenSong = 3,
ScreenOptions = 4,
ScreenSing = 5,
ScreenProfiles = 6,
ScreenScore = 7,
ScreenHighscore = 8,
ScreenOptionsGame = 9,
ScreenOptionsSound = 10,
ScreenOptionsRecord = 11,
ScreenOptionsVideo = 12,
ScreenOptionsLyrics = 13,
ScreenOptionsTheme = 14,
ScreenNames = 15,
ScreenCredits = 16,
ScreenParty = 17,
ScreenPartyDummy = 18,
ScreenNull = -1
}
enum EPopupScreens enum EPopupScreens
{ {
PopupPlayerControl = 0, PopupPlayerControl = 0,
Vocaluxe/Base/CMain.cs
+15
View File
@@ -357,6 +357,21 @@ namespace Vocaluxe.Base
{ {
CGraphics.ReloadTheme(); CGraphics.ReloadTheme();
} }
public void SaveTheme()
{
CGraphics.SaveTheme();
}
public void FadeTo(EScreens NextScreen)
{
CGraphics.FadeTo(NextScreen);
}
public float GetGlobalAlpha()
{
return CGraphics.GlobalAlpha;
}
} }
class BLog : ILog class BLog : ILog
Vocaluxe/Base/CParty.cs
+8 -1
View File
@@ -71,7 +71,14 @@ namespace Vocaluxe.Base
public static CMenu GetNextPartyScreen() public static CMenu GetNextPartyScreen()
{ {
return _PartyModes[_CurrentModeNr].PartyMode.GetNextPartyScreen(); CMenu NextScreen = _PartyModes[_CurrentModeNr].PartyMode.GetNextPartyScreen();
if (NextScreen != null)
return NextScreen;
NextScreen = new CScreenPartyDummy();
NextScreen.Initialize(CMain.Base);
NextScreen.LoadTheme();
return NextScreen;
} }
#endregion public stuff #endregion public stuff
Vocaluxe/Menu/CMenu.cs
+7 -1
View File
@@ -151,6 +151,12 @@ namespace Vocaluxe.Menu
_ThemeEqualizers = null; _ThemeEqualizers = null;
_ThemePlaylists = null; _ThemePlaylists = null;
} }
protected void FadeTo(EScreens NextScreen)
{
_Base.Graphics.FadeTo(NextScreen);
}
#region ThemeHandler #region ThemeHandler
public virtual void LoadTheme() public virtual void LoadTheme()
{ {
@@ -1048,7 +1054,7 @@ namespace Vocaluxe.Menu
switch (KeyEvent.Key) switch (KeyEvent.Key)
{ {
case Keys.S: case Keys.S:
CGraphics.SaveTheme(); _Base.Graphics.SaveTheme();
break; break;
case Keys.R: case Keys.R:
Vocaluxe/Menu/CMenuParty.cs
+1 -1
View File
@@ -4,7 +4,7 @@ using System.Text;
namespace Vocaluxe.Menu namespace Vocaluxe.Menu
{ {
abstract class CMenuParty abstract class CMenuParty : CMenu
{ {
public CMenuParty() public CMenuParty()
{ {
Vocaluxe/Menu/CObjectInteractions.cs
+1 -1
View File
@@ -193,7 +193,7 @@ namespace Vocaluxe.Menu
switch (KeyEvent.Key) switch (KeyEvent.Key)
{ {
case Keys.S: case Keys.S:
CGraphics.SaveTheme(); _Base.Graphics.SaveTheme();
break; break;
case Keys.Up: case Keys.Up:
Vocaluxe/Menu/CPlaylist.cs
+1 -1
View File
@@ -1198,7 +1198,7 @@ namespace Vocaluxe.Menu
_Base.Game.AddSong(_Base.Playlist.GetPlaylistSong(ActivePlaylistID, i).SongID, _Base.Playlist.GetPlaylistSong(ActivePlaylistID, i).GameMode); _Base.Game.AddSong(_Base.Playlist.GetPlaylistSong(ActivePlaylistID, i).SongID, _Base.Playlist.GetPlaylistSong(ActivePlaylistID, i).GameMode);
} }
if (_Base.Game.GetNumSongs() > 0) if (_Base.Game.GetNumSongs() > 0)
CGraphics.FadeTo(EScreens.ScreenNames); _Base.Graphics.FadeTo(EScreens.ScreenNames); //TODO: What is if someone uses that in PartyMode?
} }
} }
Vocaluxe/Menu/CText.cs
+2 -2
View File
@@ -669,7 +669,7 @@ namespace Vocaluxe.Menu
if (Selected && (_Base.Settings.GetGameState() == EGameState.EditTheme)) if (Selected && (_Base.Settings.GetGameState() == EGameState.EditTheme))
{ {
_Base.Drawing.DrawColor( _Base.Drawing.DrawColor(
new SColorF(0.5f, 1f, 0.5f, 0.5f * CGraphics.GlobalAlpha), new SColorF(0.5f, 1f, 0.5f, 0.5f * _Base.Graphics.GetGlobalAlpha()),
new SRectF(_DrawPosition.X, _DrawPosition.Y, _DrawPosition.Width, _DrawPosition.Height, Z) new SRectF(_DrawPosition.X, _DrawPosition.Y, _DrawPosition.Width, _DrawPosition.Height, Z)
); );
} }
@@ -802,7 +802,7 @@ namespace Vocaluxe.Menu
if (Selected && (_Base.Settings.GetGameState() == EGameState.EditTheme)) if (Selected && (_Base.Settings.GetGameState() == EGameState.EditTheme))
{ {
_Base.Drawing.DrawColor(new SColorF(0.5f, 1f, 0.5f, 0.5f * CGraphics.GlobalAlpha), new SRectF(x, y, bounds.Width, bounds.Height, Z)); _Base.Drawing.DrawColor(new SColorF(0.5f, 1f, 0.5f, 0.5f * _Base.Graphics.GetGlobalAlpha()), new SRectF(x, y, bounds.Width, bounds.Height, Z));
} }
} }
Vocaluxe/Menu/IMenu.cs
+31
View File
@@ -147,6 +147,10 @@ namespace Vocaluxe.Menu
public interface IGraphics public interface IGraphics
{ {
void ReloadTheme(); void ReloadTheme();
void SaveTheme();
void FadeTo(EScreens NextScreen);
float GetGlobalAlpha();
} }
public interface ILog public interface ILog
@@ -791,4 +795,31 @@ namespace Vocaluxe.Menu
TR_GAMEMODE_DUET, TR_GAMEMODE_DUET,
TR_GAMEMODE_SHORTSONG TR_GAMEMODE_SHORTSONG
} }
public enum EScreens
{
ScreenTest = 0,
ScreenLoad = 1,
ScreenMain = 2,
ScreenSong = 3,
ScreenOptions = 4,
ScreenSing = 5,
ScreenProfiles = 6,
ScreenScore = 7,
ScreenHighscore = 8,
ScreenOptionsGame = 9,
ScreenOptionsSound = 10,
ScreenOptionsRecord = 11,
ScreenOptionsVideo = 12,
ScreenOptionsLyrics = 13,
ScreenOptionsTheme = 14,
ScreenNames = 15,
ScreenCredits = 16,
ScreenParty = 17,
ScreenPartyDummy = 18,
ScreenNull = -1
}
} }
Vocaluxe/Menu/SongMenu/CSongMenuTileBoard.cs
+1 -1
View File
@@ -371,7 +371,7 @@ namespace Vocaluxe.Menu.SongMenu
} }
else if (MouseEvent.RB && _Base.Songs.GetTabs() == EOffOn.TR_CONFIG_OFF && !SongOptions.Selection.PartyMode) else if (MouseEvent.RB && _Base.Songs.GetTabs() == EOffOn.TR_CONFIG_OFF && !SongOptions.Selection.PartyMode)
{ {
CGraphics.FadeTo(EScreens.ScreenMain); _Base.Graphics.FadeTo(EScreens.ScreenMain);
} }
else if (_PreviewSelected != -1 && MouseEvent.LB && _Base.Songs.GetCurrentCategoryIndex() != -1 && !SongOptions.Selection.PartyMode) else if (_PreviewSelected != -1 && MouseEvent.LB && _Base.Songs.GetCurrentCategoryIndex() != -1 && !SongOptions.Selection.PartyMode)
{ {
Vocaluxe/PartyModes/CPartyMode.cs
+1 -2
View File
@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Text; using System.Text;
using Vocaluxe.Menu; using Vocaluxe.Menu;
using Vocaluxe.Screens;
namespace Vocaluxe.PartyModes namespace Vocaluxe.PartyModes
{ {
@@ -30,7 +29,7 @@ namespace Vocaluxe.PartyModes
public virtual CMenu GetNextPartyScreen() public virtual CMenu GetNextPartyScreen()
{ {
return new CScreenPartyDummy(); return null;
} }
public virtual EScreens GetStartScreen() public virtual EScreens GetStartScreen()
Vocaluxe/PartyModes/CScreenPartyDummy.cs
+16 -10
View File
@@ -3,14 +3,15 @@ using System.Collections.Generic;
using System.Text; using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using Vocaluxe.Base;
using Vocaluxe.Menu; using Vocaluxe.Menu;
namespace Vocaluxe.Screens namespace Vocaluxe.PartyModes
{ {
class CScreenPartyDummy : CMenu class CScreenPartyDummy : CMenu
{// Version number for theme files. Increment it, if you've changed something on the theme files! {
// Version number for theme files. Increment it, if you've changed something on the theme files!
const int ScreenVersion = 1; const int ScreenVersion = 1;
private CText Warning;
public CScreenPartyDummy() public CScreenPartyDummy()
{ {
@@ -26,6 +27,16 @@ namespace Vocaluxe.Screens
public override void LoadTheme() public override void LoadTheme()
{ {
Warning = GetNewText();
Warning.Height = 100f;
Warning.X = 150;
Warning.Y = 300;
Warning.Fon = "Normal";
Warning.Style = EStyle.Normal;
Warning.Color = new SColorF(1f, 0f, 0f, 1f);
Warning.SColor = new SColorF(1f, 0f, 0f, 1f);
Warning.Text = "SOMETHING WENT WRONG!";
AddText(Warning);
} }
public override void ReloadTheme() public override void ReloadTheme()
@@ -58,7 +69,7 @@ namespace Vocaluxe.Screens
{ {
case Keys.Back: case Keys.Back:
case Keys.Escape: case Keys.Escape:
CGraphics.FadeTo(EScreens.ScreenParty); FadeTo(EScreens.ScreenParty);
break; break;
} }
} }
@@ -76,7 +87,7 @@ namespace Vocaluxe.Screens
if (MouseEvent.RB) if (MouseEvent.RB)
{ {
CGraphics.FadeTo(EScreens.ScreenParty); FadeTo(EScreens.ScreenParty);
} }
return true; return true;
@@ -95,11 +106,6 @@ namespace Vocaluxe.Screens
public override bool Draw() public override bool Draw()
{ {
base.Draw(); base.Draw();
CFonts.SetFont("Normal");
CFonts.Style = EStyle.Normal;
CDraw.DrawText("SOMETHING WENT WRONG!", 150, 300, 80);
return true; return true;
} }
Vocaluxe/Screens/CScreenParty.cs
+1 -1
View File
@@ -50,7 +50,7 @@ namespace Vocaluxe.Screens
break; break;
case Keys.C: case Keys.C:
//CGraphics.FadeTo(EScreens.ScreenPartyDummy); CGraphics.FadeTo(EScreens.ScreenPartyDummy);
break; break;
case Keys.Enter: case Keys.Enter: