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

texts converted

Browse Source
This commit is contained in:
Alexander Eckart committed 2012-12-13 21:42:43 +01:00
1 parent 075eff5ae7
commit fe763e8a40
4 files changed
+74 -55
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Vocaluxe/Base/CGraphics.cs
+2 -2
View File
@@ -280,14 +280,14 @@ namespace Vocaluxe.Menu
for (int i = 0; i < _Screens.Count; i++) for (int i = 0; i < _Screens.Count; i++)
{ {
CLog.StartBenchmark(1, "Load Theme " + Enum.GetNames(typeof(EScreens))[i]); CLog.StartBenchmark(1, "Load Theme " + Enum.GetNames(typeof(EScreens))[i]);
_Screens[i].Initialize(CMain.Config, CMain.Settings, CMain.Theme, CMain.Helper, CMain.Log, CMain.BackgroundMusic, CMain.Draw, CMain.Graphics); _Screens[i].Initialize(CMain.Config, CMain.Settings, CMain.Theme, CMain.Helper, CMain.Log, CMain.BackgroundMusic, CMain.Draw, CMain.Graphics, CMain.Fonts, CMain.Language);
_Screens[i].LoadTheme(); _Screens[i].LoadTheme();
CLog.StopBenchmark(1, "Load Theme " + Enum.GetNames(typeof(EScreens))[i]); CLog.StopBenchmark(1, "Load Theme " + Enum.GetNames(typeof(EScreens))[i]);
} }
for (int i = 0; i < _PopupScreens.Count; i++) for (int i = 0; i < _PopupScreens.Count; i++)
{ {
_PopupScreens[i].Initialize(CMain.Config, CMain.Settings, CMain.Theme, CMain.Helper, CMain.Log, CMain.BackgroundMusic, CMain.Draw, CMain.Graphics); _PopupScreens[i].Initialize(CMain.Config, CMain.Settings, CMain.Theme, CMain.Helper, CMain.Log, CMain.BackgroundMusic, CMain.Draw, CMain.Graphics, CMain.Fonts, CMain.Language);
_PopupScreens[i].LoadTheme(); _PopupScreens[i].LoadTheme();
} }
} }
Vocaluxe/Menu/CMenu.cs
+7 -3
View File
@@ -96,9 +96,9 @@ namespace Vocaluxe.Menu
{ {
} }
public void Initialize(IConfig Config, ISettings Settings, ITheme Theme, IHelper Helper, ILog Log, IBackgroundMusic BackgroundMusic, IDrawing Draw, IGraphics Graphics) public void Initialize(IConfig Config, ISettings Settings, ITheme Theme, IHelper Helper, ILog Log, IBackgroundMusic BackgroundMusic, IDrawing Draw, IGraphics Graphics, IFonts Fonts, ILanguage Language)
{ {
_Base = new Base(Config, Settings, Theme, Helper, Log, BackgroundMusic, Draw, Graphics); _Base = new Base(Config, Settings, Theme, Helper, Log, BackgroundMusic, Draw, Graphics, Fonts, Language);
Init(); Init();
} }
@@ -2327,8 +2327,10 @@ namespace Vocaluxe.Menu
public IBackgroundMusic BackgroundMusic; public IBackgroundMusic BackgroundMusic;
public IDrawing Drawing; public IDrawing Drawing;
public IGraphics Graphics; public IGraphics Graphics;
public IFonts Fonts;
public ILanguage Language;
public Base(IConfig Config, ISettings Settings, ITheme Theme, IHelper Helper, ILog Log, IBackgroundMusic BackgroundMusic, IDrawing Draw, IGraphics Graphics) public Base(IConfig Config, ISettings Settings, ITheme Theme, IHelper Helper, ILog Log, IBackgroundMusic BackgroundMusic, IDrawing Draw, IGraphics Graphics, IFonts Fonts, ILanguage Language)
{ {
this.Config = Config; this.Config = Config;
this.Settings = Settings; this.Settings = Settings;
@@ -2338,6 +2340,8 @@ namespace Vocaluxe.Menu
this.BackgroundMusic = BackgroundMusic; this.BackgroundMusic = BackgroundMusic;
this.Drawing = Draw; this.Drawing = Draw;
this.Graphics = Graphics; this.Graphics = Graphics;
this.Fonts = Fonts;
this.Language = Language;
} }
} }
} }
Vocaluxe/Menu/CText.cs
+46 -49
View File
@@ -5,9 +5,6 @@ using System.Text;
using System.Xml; using System.Xml;
using System.Xml.XPath; using System.Xml.XPath;
using Vocaluxe.Base;
using Vocaluxe.Lib.Draw;
namespace Vocaluxe.Menu namespace Vocaluxe.Menu
{ {
struct SThemeText struct SThemeText
@@ -206,7 +203,7 @@ namespace Vocaluxe.Menu
get { return _Theme.Text; } get { return _Theme.Text; }
set set
{ {
string translation = CLanguage.Translate(value); string translation = _Base.Language.Translate(value);
if (_Theme.Text != value || translation != _Text) if (_Theme.Text != value || translation != _Text)
{ {
_Theme.Text = value; _Theme.Text = value;
@@ -310,11 +307,11 @@ namespace Vocaluxe.Menu
if (MaxWidth > 0) if (MaxWidth > 0)
{ {
Bounds = new SRectF(-CSettings.iRenderW, -CSettings.iRenderH, MaxWidth, 3f * CSettings.iRenderH, 0f); Bounds = new SRectF(-_Base.Settings.GetRenderW(), -_Base.Settings.GetRenderH(), MaxWidth, 3f * _Base.Settings.GetRenderH(), 0f);
} }
else else
{ {
Bounds = new SRectF(-CSettings.iRenderW, -CSettings.iRenderH, 3f * CSettings.iRenderW, 3f * CSettings.iRenderH, 0f); Bounds = new SRectF(-_Base.Settings.GetRenderW(), -_Base.Settings.GetRenderH(), 3f * _Base.Settings.GetRenderW(), 3f * _Base.Settings.GetRenderH(), 0f);
} }
Reflection = true; Reflection = true;
@@ -348,11 +345,11 @@ namespace Vocaluxe.Menu
if (MaxWidth > 0) if (MaxWidth > 0)
{ {
Bounds = new SRectF(-CSettings.iRenderW, -CSettings.iRenderH, MaxWidth, 3f * CSettings.iRenderH, 0f); Bounds = new SRectF(-_Base.Settings.GetRenderW(), -_Base.Settings.GetRenderH(), MaxWidth, 3f * _Base.Settings.GetRenderH(), 0f);
} }
else else
{ {
Bounds = new SRectF(-CSettings.iRenderW, -CSettings.iRenderH, 3f * CSettings.iRenderW, 3f * CSettings.iRenderH, 0f); Bounds = new SRectF(-_Base.Settings.GetRenderW(), -_Base.Settings.GetRenderH(), 3f * _Base.Settings.GetRenderW(), 3f * _Base.Settings.GetRenderH(), 0f);
} }
Reflection = false; Reflection = false;
@@ -384,11 +381,11 @@ namespace Vocaluxe.Menu
if (MaxWidth > 0) if (MaxWidth > 0)
{ {
Bounds = new SRectF(-CSettings.iRenderW, -CSettings.iRenderH, MaxWidth, 3f * CSettings.iRenderH, 0f); Bounds = new SRectF(-_Base.Settings.GetRenderW(), -_Base.Settings.GetRenderH(), MaxWidth, 3f * _Base.Settings.GetRenderH(), 0f);
} }
else else
{ {
Bounds = new SRectF(-CSettings.iRenderW, -CSettings.iRenderH, 3f * CSettings.iRenderW, 3f * CSettings.iRenderH, 0f); Bounds = new SRectF(-_Base.Settings.GetRenderW(), -_Base.Settings.GetRenderH(), 3f * _Base.Settings.GetRenderW(), 3f * _Base.Settings.GetRenderH(), 0f);
} }
Reflection = true; Reflection = true;
@@ -422,11 +419,11 @@ namespace Vocaluxe.Menu
if (MaxWidth > 0) if (MaxWidth > 0)
{ {
Bounds = new SRectF(-CSettings.iRenderW, -CSettings.iRenderH, MaxWidth, 3f * CSettings.iRenderH, 0f); Bounds = new SRectF(-_Base.Settings.GetRenderW(), -_Base.Settings.GetRenderH(), MaxWidth, 3f * _Base.Settings.GetRenderH(), 0f);
} }
else else
{ {
Bounds = new SRectF(-CSettings.iRenderW, -CSettings.iRenderH, 3f * CSettings.iRenderW, 3f * CSettings.iRenderH, 0f); Bounds = new SRectF(-_Base.Settings.GetRenderW(), -_Base.Settings.GetRenderH(), 3f * _Base.Settings.GetRenderW(), 3f * _Base.Settings.GetRenderH(), 0f);
} }
Reflection = false; Reflection = false;
@@ -453,7 +450,7 @@ namespace Vocaluxe.Menu
if (CHelper.GetValueFromXML(item + "/Color", navigator, ref _Theme.ColorName, String.Empty)) if (CHelper.GetValueFromXML(item + "/Color", navigator, ref _Theme.ColorName, String.Empty))
{ {
_ThemeLoaded &= CTheme.GetColor(_Theme.ColorName, SkinIndex, ref Color); _ThemeLoaded &= _Base.Theme.GetColor(_Theme.ColorName, SkinIndex, ref Color);
} }
else else
{ {
@@ -465,7 +462,7 @@ namespace Vocaluxe.Menu
if (CHelper.GetValueFromXML(item + "/SColor", navigator, ref _Theme.SColorName, String.Empty)) if (CHelper.GetValueFromXML(item + "/SColor", navigator, ref _Theme.SColorName, String.Empty))
{ {
_ThemeLoaded &= CTheme.GetColor(_Theme.SColorName, SkinIndex, ref SColor); _ThemeLoaded &= _Base.Theme.GetColor(_Theme.SColorName, SkinIndex, ref SColor);
} }
else else
{ {
@@ -511,9 +508,9 @@ namespace Vocaluxe.Menu
LoadTextures(); LoadTextures();
if (MaxWidth > 0) if (MaxWidth > 0)
Bounds = new SRectF(-CSettings.iRenderW, -CSettings.iRenderH, MaxWidth, 3f * CSettings.iRenderH, 0f); Bounds = new SRectF(-_Base.Settings.GetRenderW(), -_Base.Settings.GetRenderH(), MaxWidth, 3f * _Base.Settings.GetRenderH(), 0f);
else else
Bounds = new SRectF(-CSettings.iRenderW, -CSettings.iRenderH, 3f * CSettings.iRenderW, 3f * CSettings.iRenderH, 0f); Bounds = new SRectF(-_Base.Settings.GetRenderW(), -_Base.Settings.GetRenderH(), 3f * _Base.Settings.GetRenderW(), 3f * _Base.Settings.GetRenderH(), 0f);
_ButtonText = ButtonText; _ButtonText = ButtonText;
} }
@@ -584,7 +581,7 @@ namespace Vocaluxe.Menu
writer.WriteElementString("Font", Fon); writer.WriteElementString("Font", Fon);
writer.WriteComment("<Text>: Nothing or translation tag"); writer.WriteComment("<Text>: Nothing or translation tag");
if (CLanguage.TranslationExists(_Theme.Text)) if (_Base.Language.TranslationExists(_Theme.Text))
writer.WriteElementString("Text", _Theme.Text); writer.WriteElementString("Text", _Theme.Text);
else else
writer.WriteElementString("Text", string.Empty); writer.WriteElementString("Text", string.Empty);
@@ -623,7 +620,7 @@ namespace Vocaluxe.Menu
public void Draw(bool ForceDraw) public void Draw(bool ForceDraw)
{ {
if (!ForceDraw && !Visible && CSettings.GameState != EGameState.EditTheme) if (!ForceDraw && !Visible && _Base.Settings.GetGameState() != EGameState.EditTheme)
return; return;
// Update Text // Update Text
@@ -632,8 +629,8 @@ namespace Vocaluxe.Menu
if (_PositionNeedsUpdate) if (_PositionNeedsUpdate)
UpdateTextPosition(); UpdateTextPosition();
CFonts.SetFont(Fon); _Base.Fonts.SetFont(Fon);
CFonts.Style = Style; _Base.Fonts.SetStyle(Style);
SColorF CurrentColor = new SColorF(Color); SColorF CurrentColor = new SColorF(Color);
if (Selected) if (Selected)
@@ -642,9 +639,9 @@ namespace Vocaluxe.Menu
SColorF color = new SColorF(CurrentColor.R, CurrentColor.G, CurrentColor.B, CurrentColor.A * Alpha); SColorF color = new SColorF(CurrentColor.R, CurrentColor.G, CurrentColor.B, CurrentColor.A * Alpha);
if (!EditMode) if (!EditMode)
CFonts.DrawText(_Text, _DrawPosition.tH, _DrawPosition.X, _DrawPosition.Y, Z, color); _Base.Fonts.DrawText(_Text, _DrawPosition.tH, _DrawPosition.X, _DrawPosition.Y, Z, color);
else else
CFonts.DrawText(_Text + "|", _DrawPosition.tH, _DrawPosition.X, _DrawPosition.Y, Z, color); _Base.Fonts.DrawText(_Text + "|", _DrawPosition.tH, _DrawPosition.X, _DrawPosition.Y, Z, color);
if (Reflection) if (Reflection)
{ {
@@ -664,14 +661,14 @@ namespace Vocaluxe.Menu
break; break;
} }
if (!EditMode) if (!EditMode)
CFonts.DrawTextReflection(_Text, _DrawPosition.tH, _DrawPosition.X, _DrawPosition.Y, Z, color, ReflectionSpace + sFactor, ReflectionHeight); _Base.Fonts.DrawTextReflection(_Text, _DrawPosition.tH, _DrawPosition.X, _DrawPosition.Y, Z, color, ReflectionSpace + sFactor, ReflectionHeight);
else else
CFonts.DrawTextReflection(_Text + "|", _DrawPosition.tH, _DrawPosition.X, _DrawPosition.Y, Z, color, ReflectionSpace + sFactor, ReflectionHeight); _Base.Fonts.DrawTextReflection(_Text + "|", _DrawPosition.tH, _DrawPosition.X, _DrawPosition.Y, Z, color, ReflectionSpace + sFactor, ReflectionHeight);
} }
if (Selected && (CSettings.GameState == EGameState.EditTheme)) if (Selected && (_Base.Settings.GetGameState() == EGameState.EditTheme))
{ {
CDraw.DrawColor( _Base.Drawing.DrawColor(
new SColorF(0.5f, 1f, 0.5f, 0.5f * CGraphics.GlobalAlpha), new SColorF(0.5f, 1f, 0.5f, 0.5f * CGraphics.GlobalAlpha),
new SRectF(_DrawPosition.X, _DrawPosition.Y, _DrawPosition.Width, _DrawPosition.Height, Z) new SRectF(_DrawPosition.X, _DrawPosition.Y, _DrawPosition.Width, _DrawPosition.Height, Z)
); );
@@ -680,7 +677,7 @@ namespace Vocaluxe.Menu
public void Draw(float begin, float end) public void Draw(float begin, float end)
{ {
RectangleF bounds = CDraw.GetTextBounds(this); RectangleF bounds = _Base.Drawing.GetTextBounds(this);
float x = X; float x = X;
switch (Align) switch (Align)
@@ -701,22 +698,22 @@ namespace Vocaluxe.Menu
SColorF color = new SColorF(CurrentColor.R, CurrentColor.G, CurrentColor.B, CurrentColor.A * Alpha); SColorF color = new SColorF(CurrentColor.R, CurrentColor.G, CurrentColor.B, CurrentColor.A * Alpha);
CFonts.SetFont(Fon); _Base.Fonts.SetFont(Fon);
CFonts.Style = Style; _Base.Fonts.SetStyle(Style);
if (!EditMode) if (!EditMode)
CFonts.DrawText(Text, Height, x, Y, Z, color, begin, end); _Base.Fonts.DrawText(Text, Height, x, Y, Z, color, begin, end);
else else
CFonts.DrawText(Text + "|", Height, x, Y, Z, color, begin, end); _Base.Fonts.DrawText(Text + "|", Height, x, Y, Z, color, begin, end);
if (Reflection) if (Reflection)
{ {
// TODO // TODO
} }
if (Selected && (CSettings.GameState == EGameState.EditTheme)) if (Selected && (_Base.Settings.GetGameState() == EGameState.EditTheme))
{ {
CDraw.DrawColor(new SColorF(0.5f, 1f, 0.5f, 0.5f), new SRectF(x, Y, bounds.Width, bounds.Height, Z)); _Base.Drawing.DrawColor(new SColorF(0.5f, 1f, 0.5f, 0.5f), new SRectF(x, Y, bounds.Width, bounds.Height, Z));
} }
} }
@@ -740,7 +737,7 @@ namespace Vocaluxe.Menu
float x = X + rx; float x = X + rx;
float y = Y + ry; float y = Y + ry;
RectangleF bounds = CDraw.GetTextBounds(this); RectangleF bounds = _Base.Drawing.GetTextBounds(this);
if (bounds.Width > Bounds.W && Bounds.W > 0f && bounds.Width > 0f) if (bounds.Width > Bounds.W && Bounds.W > 0f && bounds.Width > 0f)
{ {
@@ -762,7 +759,7 @@ namespace Vocaluxe.Menu
break; break;
} }
bounds = CFonts.GetTextBounds(this, h); bounds = _Base.Fonts.GetTextBounds(this, h);
} }
switch (Align) switch (Align)
@@ -784,13 +781,13 @@ namespace Vocaluxe.Menu
SColorF color = new SColorF(CurrentColor.R, CurrentColor.G, CurrentColor.B, CurrentColor.A * Alpha); SColorF color = new SColorF(CurrentColor.R, CurrentColor.G, CurrentColor.B, CurrentColor.A * Alpha);
CFonts.SetFont(Fon); _Base.Fonts.SetFont(Fon);
CFonts.Style = Style; _Base.Fonts.SetStyle(Style);
if (!EditMode) if (!EditMode)
CFonts.DrawText(_Text, h, x, y, Z, color); _Base.Fonts.DrawText(_Text, h, x, y, Z, color);
else else
CFonts.DrawText(_Text + "|", h, x, y, Z, color); _Base.Fonts.DrawText(_Text + "|", h, x, y, Z, color);
if (reflection) if (reflection)
{ {
@@ -798,14 +795,14 @@ namespace Vocaluxe.Menu
float height = reflectionHeight - (rectHeight - Y) + bounds.Height; float height = reflectionHeight - (rectHeight - Y) + bounds.Height;
if (!EditMode) if (!EditMode)
CFonts.DrawTextReflection(_Text, h, x, y, Z, color, space, height); _Base.Fonts.DrawTextReflection(_Text, h, x, y, Z, color, space, height);
else else
CFonts.DrawTextReflection(_Text + "|", h, x, y, Z, color, space, height); _Base.Fonts.DrawTextReflection(_Text + "|", h, x, y, Z, color, space, height);
} }
if (Selected && (CSettings.GameState == EGameState.EditTheme)) if (Selected && (_Base.Settings.GetGameState() == EGameState.EditTheme))
{ {
CDraw.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 * CGraphics.GlobalAlpha), new SRectF(x, y, bounds.Width, bounds.Height, Z));
} }
} }
@@ -816,10 +813,10 @@ namespace Vocaluxe.Menu
public void LoadTextures() public void LoadTextures()
{ {
if (_Theme.ColorName != String.Empty) if (_Theme.ColorName != String.Empty)
Color = CTheme.GetColor(_Theme.ColorName); Color = _Base.Theme.GetColor(_Theme.ColorName);
if (_Theme.SColorName != String.Empty) if (_Theme.SColorName != String.Empty)
SColor = CTheme.GetColor(_Theme.SColorName); SColor = _Base.Theme.GetColor(_Theme.SColorName);
} }
public void ReloadTextures() public void ReloadTextures()
@@ -848,12 +845,12 @@ namespace Vocaluxe.Menu
if (_Text == String.Empty) if (_Text == String.Empty)
return; return;
CFonts.SetFont(Fon); _Base.Fonts.SetFont(Fon);
CFonts.Style = Style; _Base.Fonts.SetStyle(Style);
float h = Height; float h = Height;
float y = Y; float y = Y;
RectangleF bounds = CFonts.GetTextBounds(this); RectangleF bounds = _Base.Fonts.GetTextBounds(this, this.Height);
if (bounds.Width > Bounds.W && Bounds.W > 0f && bounds.Width > 0f) if (bounds.Width > Bounds.W && Bounds.W > 0f && bounds.Width > 0f)
{ {
@@ -875,7 +872,7 @@ namespace Vocaluxe.Menu
break; break;
} }
bounds = CFonts.GetTextBounds(this, h); bounds = _Base.Fonts.GetTextBounds(this, h);
} }
float x = X; float x = X;
Vocaluxe/Menu/IMenu.cs
+19 -1
View File
@@ -11,7 +11,7 @@ namespace Vocaluxe.Menu
{ {
interface IMenu interface IMenu
{ {
void Initialize(IConfig Config, ISettings Settings, ITheme Theme, IHelper Helper, ILog Log, IBackgroundMusic BackgroundMusic, IDrawing Draw, IGraphics Graphics); void Initialize(IConfig Config, ISettings Settings, ITheme Theme, IHelper Helper, ILog Log, IBackgroundMusic BackgroundMusic, IDrawing Draw, IGraphics Graphics, IFonts Fonts, ILanguage Language);
void LoadTheme(); void LoadTheme();
void SaveTheme(); void SaveTheme();
@@ -127,6 +127,24 @@ namespace Vocaluxe.Menu
void LogError(string ErrorText); void LogError(string ErrorText);
} }
public interface IFonts
{
void SetFont(string FontName);
void SetStyle(EStyle FontStyle);
RectangleF GetTextBounds(CText Text, float TextHeight);
void DrawText(string Text, float TextHeight, float x, float y, float z, SColorF Color);
void DrawTextReflection(string Text, float TextHeight, float x, float y, float z, SColorF Color, float ReflectionSpace, float ReflectionHeight);
void DrawText(string Text, float TextHeight, float x, float y, float z, SColorF Color, float Begin, float End);
}
public interface ILanguage
{
string Translate(string KeyWord);
bool TranslationExists(string KeyWord);
}
[Flags] [Flags]
public enum EModifier public enum EModifier
{ {