aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Game/Code/Screens/UScreenOptionsThemes.pas49
-rw-r--r--Game/Code/Screens/UScreenSingModi.pas2
-rw-r--r--Game/Output/Themes/Blue Sensation.ini66
-rw-r--r--Game/Output/Themes/Deluxe.ini66
-rw-r--r--Game/Output/Themes/iStar.ini66
5 files changed, 129 insertions, 120 deletions
diff --git a/Game/Code/Screens/UScreenOptionsThemes.pas b/Game/Code/Screens/UScreenOptionsThemes.pas
index a6b5d543..41383a54 100644
--- a/Game/Code/Screens/UScreenOptionsThemes.pas
+++ b/Game/Code/Screens/UScreenOptionsThemes.pas
@@ -9,9 +9,12 @@ type
TScreenOptionsThemes = class(TMenu)
private
procedure ReloadTheme;
-
+ procedure ReloadScreens;
public
- AktualTheme: Integer;
+ ActualTheme: Integer;
+ ActualSkin: Integer;
+ ActualColor: Integer;
+
SkinSelect: Integer;
constructor Create; override;
function ParseInput(PressedKey: Cardinal; ScanCode: byte; PressedDown: Boolean): Boolean; override;
@@ -47,14 +50,8 @@ begin
begin
Ini.Save;
- // Reload all screens, after Theme changed
- if(AktualTheme<>Ini.Theme) then
- begin
- UGraphic.UnLoadScreens();
- UGraphic.LoadScreens( true );
- ScreenSong.Refresh(true);
- PlaylistMan.LoadPlayLists;
- end;
+ ReloadScreens;
+
Music.PlayBack;
FadeTo(@ScreenOptions);
end;
@@ -64,14 +61,8 @@ begin
begin
Ini.Save;
- // Reload all screens, after Theme changed
- if(AktualTheme<>Ini.Theme) then
- begin
- UGraphic.UnLoadScreens();
- UGraphic.LoadScreens( true );
- ScreenSong.Refresh(true);
- PlaylistMan.LoadPlayLists;
- end;
+ ReloadScreens;
+
Music.PlayBack;
FadeTo(@ScreenOptions);
end;
@@ -152,7 +143,9 @@ begin
if not Help.SetHelpID(ID) then
Log.LogError('No Entry for Help-ID ' + ID + ' (ScreenOptionsThemes)');
- AktualTheme := Ini.Theme;
+ ActualTheme := Ini.Theme;
+ ActualSkin := Ini.SkinNo;
+ ActualColor := Ini.Color;
end;
procedure TScreenOptionsThemes.ReloadTheme;
@@ -170,9 +163,25 @@ begin
Display.Draw;
SwapBuffers;
- ScreenOptionsThemes.AktualTheme := self.AktualTheme;
+ ScreenOptionsThemes.ActualTheme := self.ActualTheme;
+ ScreenOptionsThemes.ActualSkin := self.ActualSkin;
+ ScreenOptionsThemes.ActualColor := self.ActualColor;
freeandnil( self );
end;
+procedure TScreenOptionsThemes.ReloadScreens;
+begin
+ // Reload all screens, after Theme changed
+ if(ActualTheme <> Ini.Theme) or
+ (ActualSkin <> Ini.SkinNo) or
+ (ActualColor <> Ini.Color) then
+ begin
+ UGraphic.UnLoadScreens();
+ UGraphic.LoadScreens( true );
+ ScreenSong.Refresh(true);
+ PlaylistMan.LoadPlayLists;
+ end;
+end;
+
end.
diff --git a/Game/Code/Screens/UScreenSingModi.pas b/Game/Code/Screens/UScreenSingModi.pas
index 715ec0b2..1c1d8ade 100644
--- a/Game/Code/Screens/UScreenSingModi.pas
+++ b/Game/Code/Screens/UScreenSingModi.pas
@@ -597,7 +597,7 @@ end;
// update and draw movie
if ShowFinish and AktSong.VideoLoaded AND DllMan.Selected.LoadVideo then
begin
- acGetFrame(Czas.Teraz);
+ acGetFrame(Music.Position);
acDrawGL(ScreenAct, not WebCam); // this only draws
end;
diff --git a/Game/Output/Themes/Blue Sensation.ini b/Game/Output/Themes/Blue Sensation.ini
index 0d6a3970..0e845c14 100644
--- a/Game/Output/Themes/Blue Sensation.ini
+++ b/Game/Output/Themes/Blue Sensation.ini
@@ -7897,8 +7897,8 @@ X = 450
Y = 103
W = 330
H = 24
-Color = DarkBlue
-Type = Colorized
+Color = ColorDark
+Type = Font Black
[PartyNewRoundM2Static5]
X =260
@@ -7915,8 +7915,8 @@ X = 50
Y = 495
W = 700
H = 30
-Color = LightBlue
-Type = Colorized
+Color = ColorLight
+Type = Font Black
[PartyNewRoundM2Static7]
Tex = PartyRoundBG1
@@ -7924,8 +7924,8 @@ X = 20
Y = 103
W = 410
H = 24
-Color = DarkBlue
-Type = Colorized
+Color = ColorDark
+Type = Font Black
[PartyNewRoundM2Static8]
X = 525
@@ -7943,8 +7943,8 @@ X = 20
Y = 135
W = 410
H = 20
-Color = LightBlue
-Type = Colorized
+Color = ColorLight
+Type = Font Black
[PartyNewRoundM2StaticTable2]
Tex = PartyRoundBG2
@@ -7952,8 +7952,8 @@ X = 20
Y = 164
W = 410
H = 20
-Color = LightBlue
-Type = Colorized
+Color = ColorLight
+Type = Font Black
[PartyNewRoundM2StaticTable3]
Tex = PartyRoundBG2
@@ -7961,8 +7961,8 @@ X = 20
Y = 193
W = 410
H = 20
-Color = LightBlue
-Type = Colorized
+Color = ColorLight
+Type = Font Black
[PartyNewRoundM2StaticTable4]
Tex = PartyRoundBG2
@@ -7970,8 +7970,8 @@ X = 20
Y = 222
W = 410
H = 20
-Color = LightBlue
-Type = Colorized
+Color = ColorLight
+Type = Font Black
[PartyNewRoundM2StaticTable5]
Tex = PartyRoundBG2
@@ -7979,8 +7979,8 @@ X = 20
Y = 251
W = 410
H = 20
-Color = LightBlue
-Type = Colorized
+Color = ColorLight
+Type = Font Black
[PartyNewRoundM2StaticTable6]
Tex = PartyRoundBG2
@@ -7988,8 +7988,8 @@ X = 20
Y = 280
W = 410
H = 20
-Color = LightBlue
-Type = Colorized
+Color = ColorLight
+Type = Font Black
[PartyNewRoundM2StaticTable7]
Tex = PartyRoundBG2
@@ -7997,8 +7997,8 @@ X = 20
Y = 309
W = 410
H = 20
-Color = LightBlue
-Type = Colorized
+Color = ColorLight
+Type = Font Black
[PartyNewRoundM2StaticTable8]
Tex = PartyRoundBG2
@@ -8006,8 +8006,8 @@ X = 20
Y = 338
W = 410
H = 20
-Color = LightBlue
-Type = Colorized
+Color = ColorLight
+Type = Font Black
[PartyNewRoundM2StaticTable9]
Tex = PartyRoundBG2
@@ -8015,8 +8015,8 @@ X = 20
Y = 367
W = 410
H = 20
-Color = LightBlue
-Type = Colorized
+Color = ColorLight
+Type = Font Black
;results
[PartyNewRoundM2Text1]
@@ -8351,7 +8351,7 @@ X = 450
Y = 135
W = 330
H = 20
-Color =LightBlue
+Color =ColorLight
Type =Font Black
[PartyNewRoundM2StaticRound2]
@@ -8360,7 +8360,7 @@ X = 450
Y = 164
W = 330
H = 20
-Color =LightBlue
+Color =ColorLight
Type =Font Black
[PartyNewRoundM2StaticRound3]
@@ -8369,7 +8369,7 @@ X = 450
Y = 193
W = 330
H = 20
-Color =LightBlue
+Color =ColorLight
Type =Font Black
[PartyNewRoundM2StaticRound4]
@@ -8378,7 +8378,7 @@ X = 450
Y = 222
W = 330
H = 20
-Color =LightBlue
+Color =ColorLight
Type =Font Black
[PartyNewRoundM2StaticRound5]
@@ -8387,7 +8387,7 @@ X = 450
Y = 251
W = 330
H = 20
-Color =LightBlue
+Color =ColorLight
Type =Font Black
[PartyNewRoundM2StaticRound6]
@@ -8396,7 +8396,7 @@ X = 450
Y = 280
W = 330
H = 20
-Color =LightBlue
+Color =ColorLight
Type =Font Black
[PartyNewRoundM2StaticRound7]
@@ -8405,7 +8405,7 @@ X = 450
Y = 309
W = 330
H = 20
-Color =LightBlue
+Color =ColorLight
Type =Font Black
[PartyNewRoundM2StaticRound8]
@@ -8414,7 +8414,7 @@ X = 450
Y = 338
W = 330
H = 20
-Color =LightBlue
+Color =ColorLight
Type =Font Black
[PartyNewRoundM2StaticRound9]
@@ -8423,7 +8423,7 @@ X = 450
Y = 367
W = 330
H = 20
-Color =LightBlue
+Color =ColorLight
Type =Font Black
[PartyNewRoundM2TextNextRound]
diff --git a/Game/Output/Themes/Deluxe.ini b/Game/Output/Themes/Deluxe.ini
index 07b90805..16a419fb 100644
--- a/Game/Output/Themes/Deluxe.ini
+++ b/Game/Output/Themes/Deluxe.ini
@@ -9590,8 +9590,8 @@ X = 450
Y = 103
W = 330
H = 24
-Color = DarkBlue
-Type = Colorized
+Color = ColorDark
+Type = Font Black
[PartyNewRoundM2Static5]
X =260
@@ -9608,8 +9608,8 @@ X = 50
Y = 495
W = 700
H = 30
-Color = LightBlue
-Type = Colorized
+Color = ColorLight
+Type = Font Black
[PartyNewRoundM2Static7]
Tex = PartyRoundBG1
@@ -9617,8 +9617,8 @@ X = 20
Y = 103
W = 410
H = 24
-Color = DarkBlue
-Type = Colorized
+Color = ColorDark
+Type = Font Black
[PartyNewRoundM2Static8]
X = 525
@@ -9636,8 +9636,8 @@ X = 20
Y = 135
W = 410
H = 20
-Color = LightBlue
-Type = Colorized
+Color = ColorLight
+Type = Font Black
[PartyNewRoundM2StaticTable2]
Tex = PartyRoundBG2
@@ -9645,8 +9645,8 @@ X = 20
Y = 164
W = 410
H = 20
-Color = LightBlue
-Type = Colorized
+Color = ColorLight
+Type = Font Black
[PartyNewRoundM2StaticTable3]
Tex = PartyRoundBG2
@@ -9654,8 +9654,8 @@ X = 20
Y = 193
W = 410
H = 20
-Color = LightBlue
-Type = Colorized
+Color = ColorLight
+Type = Font Black
[PartyNewRoundM2StaticTable4]
Tex = PartyRoundBG2
@@ -9663,8 +9663,8 @@ X = 20
Y = 222
W = 410
H = 20
-Color = LightBlue
-Type = Colorized
+Color = ColorLight
+Type = Font Black
[PartyNewRoundM2StaticTable5]
Tex = PartyRoundBG2
@@ -9672,8 +9672,8 @@ X = 20
Y = 251
W = 410
H = 20
-Color = LightBlue
-Type = Colorized
+Color = ColorLight
+Type = Font Black
[PartyNewRoundM2StaticTable6]
Tex = PartyRoundBG2
@@ -9681,8 +9681,8 @@ X = 20
Y = 280
W = 410
H = 20
-Color = LightBlue
-Type = Colorized
+Color = ColorLight
+Type = Font Black
[PartyNewRoundM2StaticTable7]
Tex = PartyRoundBG2
@@ -9690,8 +9690,8 @@ X = 20
Y = 309
W = 410
H = 20
-Color = LightBlue
-Type = Colorized
+Color = ColorLight
+Type = Font Black
[PartyNewRoundM2StaticTable8]
Tex = PartyRoundBG2
@@ -9699,8 +9699,8 @@ X = 20
Y = 338
W = 410
H = 20
-Color = LightBlue
-Type = Colorized
+Color = ColorLight
+Type = Font Black
[PartyNewRoundM2StaticTable9]
Tex = PartyRoundBG2
@@ -9708,8 +9708,8 @@ X = 20
Y = 367
W = 410
H = 20
-Color = LightBlue
-Type = Colorized
+Color = ColorLight
+Type = Font Black
;results
[PartyNewRoundM2Text1]
@@ -10044,7 +10044,7 @@ X = 450
Y = 135
W = 330
H = 20
-Color =LightBlue
+Color =ColorLight
Type =Font Black
[PartyNewRoundM2StaticRound2]
@@ -10053,7 +10053,7 @@ X = 450
Y = 164
W = 330
H = 20
-Color =LightBlue
+Color =ColorLight
Type =Font Black
[PartyNewRoundM2StaticRound3]
@@ -10062,7 +10062,7 @@ X = 450
Y = 193
W = 330
H = 20
-Color =LightBlue
+Color =ColorLight
Type =Font Black
[PartyNewRoundM2StaticRound4]
@@ -10071,7 +10071,7 @@ X = 450
Y = 222
W = 330
H = 20
-Color =LightBlue
+Color =ColorLight
Type =Font Black
[PartyNewRoundM2StaticRound5]
@@ -10080,7 +10080,7 @@ X = 450
Y = 251
W = 330
H = 20
-Color =LightBlue
+Color =ColorLight
Type =Font Black
[PartyNewRoundM2StaticRound6]
@@ -10089,7 +10089,7 @@ X = 450
Y = 280
W = 330
H = 20
-Color =LightBlue
+Color =ColorLight
Type =Font Black
[PartyNewRoundM2StaticRound7]
@@ -10098,7 +10098,7 @@ X = 450
Y = 309
W = 330
H = 20
-Color =LightBlue
+Color =ColorLight
Type =Font Black
[PartyNewRoundM2StaticRound8]
@@ -10107,7 +10107,7 @@ X = 450
Y = 338
W = 330
H = 20
-Color =LightBlue
+Color =ColorLight
Type =Font Black
[PartyNewRoundM2StaticRound9]
@@ -10116,7 +10116,7 @@ X = 450
Y = 367
W = 330
H = 20
-Color =LightBlue
+Color =ColorLight
Type =Font Black
[PartyNewRoundM2TextNextRound]
diff --git a/Game/Output/Themes/iStar.ini b/Game/Output/Themes/iStar.ini
index 9bd747ab..a2ff0f7d 100644
--- a/Game/Output/Themes/iStar.ini
+++ b/Game/Output/Themes/iStar.ini
@@ -10920,8 +10920,8 @@ X = 450
Y = 103
W = 330
H = 24
-Color = DarkBlue
-Type = Colorized
+Color = ColorDark
+Type = Font Black
[PartyNewRoundM2Static5]
X =260
@@ -10938,8 +10938,8 @@ X = 50
Y = 495
W = 700
H = 30
-Color = LightBlue
-Type = Colorized
+Color = ColorLight
+Type = Font Black
[PartyNewRoundM2Static7]
Tex = PartyRoundBG1
@@ -10947,8 +10947,8 @@ X = 20
Y = 103
W = 410
H = 24
-Color = DarkBlue
-Type = Colorized
+Color = ColorDark
+Type = Font Black
[PartyNewRoundM2Static8]
X = 525
@@ -10966,8 +10966,8 @@ X = 20
Y = 135
W = 410
H = 20
-Color = LightBlue
-Type = Colorized
+Color = ColorLight
+Type = Font Black
[PartyNewRoundM2StaticTable2]
Tex = PartyRoundBG2
@@ -10975,8 +10975,8 @@ X = 20
Y = 164
W = 410
H = 20
-Color = LightBlue
-Type = Colorized
+Color = ColorLight
+Type = Font Black
[PartyNewRoundM2StaticTable3]
Tex = PartyRoundBG2
@@ -10984,8 +10984,8 @@ X = 20
Y = 193
W = 410
H = 20
-Color = LightBlue
-Type = Colorized
+Color = ColorLight
+Type = Font Black
[PartyNewRoundM2StaticTable4]
Tex = PartyRoundBG2
@@ -10993,8 +10993,8 @@ X = 20
Y = 222
W = 410
H = 20
-Color = LightBlue
-Type = Colorized
+Color = ColorLight
+Type = Font Black
[PartyNewRoundM2StaticTable5]
Tex = PartyRoundBG2
@@ -11002,8 +11002,8 @@ X = 20
Y = 251
W = 410
H = 20
-Color = LightBlue
-Type = Colorized
+Color = ColorLight
+Type = Font Black
[PartyNewRoundM2StaticTable6]
Tex = PartyRoundBG2
@@ -11011,8 +11011,8 @@ X = 20
Y = 280
W = 410
H = 20
-Color = LightBlue
-Type = Colorized
+Color = ColorLight
+Type = Font Black
[PartyNewRoundM2StaticTable7]
Tex = PartyRoundBG2
@@ -11020,8 +11020,8 @@ X = 20
Y = 309
W = 410
H = 20
-Color = LightBlue
-Type = Colorized
+Color = ColorLight
+Type = Font Black
[PartyNewRoundM2StaticTable8]
Tex = PartyRoundBG2
@@ -11029,8 +11029,8 @@ X = 20
Y = 338
W = 410
H = 20
-Color = LightBlue
-Type = Colorized
+Color = ColorLight
+Type = Font Black
[PartyNewRoundM2StaticTable9]
Tex = PartyRoundBG2
@@ -11038,8 +11038,8 @@ X = 20
Y = 367
W = 410
H = 20
-Color = LightBlue
-Type = Colorized
+Color = ColorLight
+Type = Font Black
;results
[PartyNewRoundM2Text1]
@@ -11374,7 +11374,7 @@ X = 450
Y = 135
W = 330
H = 20
-Color =LightBlue
+Color =ColorLight
Type =Font Black
[PartyNewRoundM2StaticRound2]
@@ -11383,7 +11383,7 @@ X = 450
Y = 164
W = 330
H = 20
-Color =LightBlue
+Color =ColorLight
Type =Font Black
[PartyNewRoundM2StaticRound3]
@@ -11392,7 +11392,7 @@ X = 450
Y = 193
W = 330
H = 20
-Color =LightBlue
+Color =ColorLight
Type =Font Black
[PartyNewRoundM2StaticRound4]
@@ -11401,7 +11401,7 @@ X = 450
Y = 222
W = 330
H = 20
-Color =LightBlue
+Color =ColorLight
Type =Font Black
[PartyNewRoundM2StaticRound5]
@@ -11410,7 +11410,7 @@ X = 450
Y = 251
W = 330
H = 20
-Color =LightBlue
+Color =ColorLight
Type =Font Black
[PartyNewRoundM2StaticRound6]
@@ -11419,7 +11419,7 @@ X = 450
Y = 280
W = 330
H = 20
-Color =LightBlue
+Color =ColorLight
Type =Font Black
[PartyNewRoundM2StaticRound7]
@@ -11428,7 +11428,7 @@ X = 450
Y = 309
W = 330
H = 20
-Color =LightBlue
+Color =ColorLight
Type =Font Black
[PartyNewRoundM2StaticRound8]
@@ -11437,7 +11437,7 @@ X = 450
Y = 338
W = 330
H = 20
-Color =LightBlue
+Color =ColorLight
Type =Font Black
[PartyNewRoundM2StaticRound9]
@@ -11446,7 +11446,7 @@ X = 450
Y = 367
W = 330
H = 20
-Color =LightBlue
+Color =ColorLight
Type =Font Black
[PartyNewRoundM2TextNextRound]
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 07:03:09 +0000