From 42717e4611f758f137d86fd99e69bf9791d3a727 Mon Sep 17 00:00:00 2001 From: whiteshark0 Date: Thu, 5 Apr 2007 12:50:05 +0000 Subject: Fixed: Not loading Button Texts from Ini Fixed: Exit Text in Option Screens not translated git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@57 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/Screens/UScreenOptions.pas | 21 ++++++++++++++------- Game/Code/Screens/UScreenOptionsGame.pas | 3 ++- Game/Code/Screens/UScreenOptionsGraphics.pas | 3 ++- Game/Code/Screens/UScreenOptionsLyrics.pas | 3 ++- Game/Code/Screens/UScreenOptionsRecord.pas | 3 ++- Game/Code/Screens/UScreenOptionsSound.pas | 3 ++- Game/Code/Screens/UScreenOptionsThemes.pas | 5 ++--- 7 files changed, 26 insertions(+), 15 deletions(-) (limited to 'Game/Code') diff --git a/Game/Code/Screens/UScreenOptions.pas b/Game/Code/Screens/UScreenOptions.pas index 76ff2adc..f24b29c1 100644 --- a/Game/Code/Screens/UScreenOptions.pas +++ b/Game/Code/Screens/UScreenOptions.pas @@ -159,25 +159,32 @@ begin AddBackground(Theme.Options.Background.Tex); AddButton(Theme.Options.ButtonGame); - AddButtonText(14, 20, Theme.Options.Description[0]); + if (Length(Button[0].Text)=0) then + AddButtonText(14, 20, Theme.Options.Description[0]); AddButton(Theme.Options.ButtonGraphics); - AddButtonText(14, 20, Theme.Options.Description[1]); + if (Length(Button[1].Text)=0) then + AddButtonText(14, 20, Theme.Options.Description[1]); AddButton(Theme.Options.ButtonSound); - AddButtonText(14, 20, Theme.Options.Description[2]); + if (Length(Button[2].Text)=0) then + AddButtonText(14, 20, Theme.Options.Description[2]); AddButton(Theme.Options.ButtonLyrics); - AddButtonText(14, 20, Theme.Options.Description[3]); + if (Length(Button[3].Text)=0) then + AddButtonText(14, 20, Theme.Options.Description[3]); AddButton(Theme.Options.ButtonThemes); - AddButtonText(14, 20, Theme.Options.Description[4]); + if (Length(Button[4].Text)=0) then + AddButtonText(14, 20, Theme.Options.Description[4]); AddButton(Theme.Options.ButtonRecord); - AddButtonText(14, 20, Theme.Options.Description[5]); + if (Length(Button[5].Text)=0) then + AddButtonText(14, 20, Theme.Options.Description[5]); AddButton(Theme.Options.ButtonExit); - AddButtonText(14, 20, Theme.Options.Description[6]); + if (Length(Button[6].Text)=0) then + AddButtonText(14, 20, Theme.Options.Description[6]); for I := 0 to High(Theme.Options.Static) do AddStatic(Theme.Options.Static[I]); diff --git a/Game/Code/Screens/UScreenOptionsGame.pas b/Game/Code/Screens/UScreenOptionsGame.pas index 6f49bd19..cc6e850b 100644 --- a/Game/Code/Screens/UScreenOptionsGame.pas +++ b/Game/Code/Screens/UScreenOptionsGame.pas @@ -88,7 +88,8 @@ begin AddButton(Theme.OptionsGame.ButtonExit); - AddButtonText(14, 20, 'Exit'); + if (Length(Button[0].Text)=0) then + AddButtonText(14, 20, Theme.Options.Description[6]); end; diff --git a/Game/Code/Screens/UScreenOptionsGraphics.pas b/Game/Code/Screens/UScreenOptionsGraphics.pas index 1f30f9b5..62648e0c 100644 --- a/Game/Code/Screens/UScreenOptionsGraphics.pas +++ b/Game/Code/Screens/UScreenOptionsGraphics.pas @@ -89,7 +89,8 @@ begin AddButton(Theme.OptionsGraphics.ButtonExit); - AddButtonText(14, 20, 'Exit'); + if (Length(Button[0].Text)=0) then + AddButtonText(14, 20, Theme.Options.Description[6]); end; diff --git a/Game/Code/Screens/UScreenOptionsLyrics.pas b/Game/Code/Screens/UScreenOptionsLyrics.pas index 21a33998..0ce5c970 100644 --- a/Game/Code/Screens/UScreenOptionsLyrics.pas +++ b/Game/Code/Screens/UScreenOptionsLyrics.pas @@ -79,7 +79,8 @@ begin AddButton(Theme.OptionsLyrics.ButtonExit); - AddButtonText(14, 20, 'Exit'); + if (Length(Button[0].Text)=0) then + AddButtonText(14, 20, Theme.Options.Description[6]); end; diff --git a/Game/Code/Screens/UScreenOptionsRecord.pas b/Game/Code/Screens/UScreenOptionsRecord.pas index c27ec02a..b4075ba8 100644 --- a/Game/Code/Screens/UScreenOptionsRecord.pas +++ b/Game/Code/Screens/UScreenOptionsRecord.pas @@ -104,7 +104,8 @@ begin SelectSlideChannelR := AddSelectSlide(Theme.OptionsRecord.SelectSlideChannelR, Ini.CardList[0].ChannelR, IChannel); AddButton(Theme.OptionsRecord.ButtonExit); - AddButtonText(14, 20, 'Exit'); + if (Length(Button[0].Text)=0) then + AddButtonText(14, 20, Theme.Options.Description[6]); Interaction := 0; end; diff --git a/Game/Code/Screens/UScreenOptionsSound.pas b/Game/Code/Screens/UScreenOptionsSound.pas index a99ae86d..ad6db766 100644 --- a/Game/Code/Screens/UScreenOptionsSound.pas +++ b/Game/Code/Screens/UScreenOptionsSound.pas @@ -80,7 +80,8 @@ begin //AddSelect(Theme.OptionsSound.SelectTwoPlayerMode, Ini.TwoPlayerMode, ITwoPlayerMode); AddButton(Theme.OptionsSound.ButtonExit); - AddButtonText(14, 20, 'Exit'); + if (Length(Button[0].Text)=0) then + AddButtonText(14, 20, Theme.Options.Description[6]); Interaction := 0; end; diff --git a/Game/Code/Screens/UScreenOptionsThemes.pas b/Game/Code/Screens/UScreenOptionsThemes.pas index b7d18fa5..eb5ed33e 100644 --- a/Game/Code/Screens/UScreenOptionsThemes.pas +++ b/Game/Code/Screens/UScreenOptionsThemes.pas @@ -99,15 +99,14 @@ begin AddText(Theme.OptionsThemes.Text[I]); AddSelectSlide(Theme.OptionsThemes.SelectTheme, Ini.Theme, ITheme); - //SelectsS[High(SelectsS)].SetSelectOpt(Ini.Theme); SkinSelect := AddSelectSlide(Theme.OptionsThemes.SelectSkin, Ini.SkinNo, ISkin); - //AddSelectSlideOption('SingStar'); AddSelectSlide(Theme.OptionsThemes.SelectColor, Ini.Color, IColor); AddButton(Theme.OptionsThemes.ButtonExit); - AddButtonText(14, 20, 'Exit'); + if (Length(Button[0].Text)=0) then + AddButtonText(14, 20, Theme.Options.Description[6]); end; procedure TScreenOptionsThemes.onShow; -- cgit v1.2.3