Skin/Theme: Some usage of the new colorize stuff, more to come - singscreen looks better now - everything else will be done after sleeping :P

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@364 b956fd51-792f-4845-bead-9b4dfca2ff2c

10 files changed, 32 insertions, 33 deletions

diff --git a/Skins/Deluxe/Blue.ini b/Skins/Deluxe/Blue.ini
index 8957e45c..93e2c06e 100644
--- a/Skins/Deluxe/Blue.ini
+++ b/Skins/Deluxe/Blue.ini
@@ -9,7 +9,6 @@ Name=Blue
 Color=Blue

 

 [Textures]

-testing = testing.png

 

 # # # M A I N # # #

 Button         = [main]button.jpg

@@ -63,15 +62,15 @@ TimeBar      = [sing]timeBar.jpg
 LineBonusBack  = [sing]lineBonusPopUp.jpg

 

 #Singbar (the thing beneath the scores)

-SingBarBack    = [sing]singBarBack.jpg

+SingBarBack    = [sing]singBarBack.png

 SingBarBar     = [sing]singBarBar.jpg

-SingBarFront   = [sing]singBarFront.jpg

+SingBarFront   = [sing]singBarFront.png

 

 #Background for scores

-ScoreBG        = [sing]scoreBg.jpg

+ScoreBG        = [sing]scoreBg.png

 

 #Background for the P1, P2 and so on

-P              = [sing]p.jpg

+P              = [sing]p.png

 

 #Pointer for lyrics

 Ball           = [sing]LyricsBall.bmp

diff --git a/Skins/Deluxe/[sing]p.jpg b/Skins/Deluxe/[sing]p.jpg
deleted file mode 100644
index e490fbf4..00000000
--- a/Skins/Deluxe/[sing]p.jpg
+++ /dev/null
diff --git a/Skins/Deluxe/[sing]p.png b/Skins/Deluxe/[sing]p.png
new file mode 100644
index 00000000..7458d8e5
--- /dev/null
+++ b/Skins/Deluxe/[sing]p.png
diff --git a/Skins/Deluxe/[sing]scoreBg.jpg b/Skins/Deluxe/[sing]scoreBg.jpg
index 01d3ca75..4a4459f6 100644
--- a/Skins/Deluxe/[sing]scoreBg.jpg
+++ b/Skins/Deluxe/[sing]scoreBg.jpg
diff --git a/Skins/Deluxe/testing.png b/Skins/Deluxe/[sing]scoreBg.png
index 4a4459f6..4a4459f6 100644
--- a/Skins/Deluxe/testing.png
+++ b/Skins/Deluxe/[sing]scoreBg.png
diff --git a/Skins/Deluxe/[sing]singBarBack.jpg b/Skins/Deluxe/[sing]singBarBack.jpg
deleted file mode 100644
index d7dcd791..00000000
--- a/Skins/Deluxe/[sing]singBarBack.jpg
+++ /dev/null
diff --git a/Skins/Deluxe/[sing]singBarBack.png b/Skins/Deluxe/[sing]singBarBack.png
new file mode 100644
index 00000000..eb85a954
--- /dev/null
+++ b/Skins/Deluxe/[sing]singBarBack.png
diff --git a/Skins/Deluxe/[sing]singBarFront.jpg b/Skins/Deluxe/[sing]singBarFront.jpg
deleted file mode 100644
index eec27b79..00000000
--- a/Skins/Deluxe/[sing]singBarFront.jpg
+++ /dev/null
diff --git a/Skins/Deluxe/[sing]singBarFront.png b/Skins/Deluxe/[sing]singBarFront.png
new file mode 100644
index 00000000..b8564af3
--- /dev/null
+++ b/Skins/Deluxe/[sing]singBarFront.png
diff --git a/Themes/Deluxe.ini b/Themes/Deluxe.ini
index 9e8a0988..9f074fad 100644
--- a/Themes/Deluxe.ini
+++ b/Themes/Deluxe.ini
@@ -927,14 +927,14 @@ Align=0
 Tex =P

 X =20

 Y =297

-W =33

-H =38

+W =30

+H =28

 Color =P1Dark

-Type=Transparent

+Type=Colorized

 

 [SingP1Text]

-Text =P2

-X =26

+Text =P1

+X =25

 Y =302

 Font =1

 Size =6

@@ -946,9 +946,9 @@ Tex =ScoreBG
 X =680

 Y =282

 W =100

-H =34

+H =36

 Color =P1Dark

-Type=Transparent

+Type=Colorized

 

 [SingP1TextScore]

 Text =00000

@@ -971,14 +971,14 @@ H =8
 Tex =P

 X =20

 Y =117

-W =33

-H =38

+W =30

+H =28

 Color =P1Dark

-Type=Transparent

+Type=Colorized

 

 [SingP1TwoPText]

 Text =P1

-X =26

+X =25

 Y =122

 Font =1

 Size =6

@@ -990,9 +990,9 @@ Tex =ScoreBG
 X =680

 Y =102

 W =100

-H =34

+H =36

 Color =P1Dark

-Type=Transparent

+Type=Colorized

 

 [SingP1TwoPTextScore]

 Text =00000

@@ -1014,14 +1014,14 @@ H =8
 Tex =P

 X =20

 Y =297

-W =33

-H =38

+W =30

+H =28

 Color =P2Dark

-Type=Transparent

+Type=Colorized

 

 [SingP2RText]

 Text =P2

-X =26

+X =24

 Y =302

 Font =1

 Size =6

@@ -1033,9 +1033,9 @@ Tex =ScoreBG
 X =680

 Y =282

 W =100

-H =34

+H =36

 Color =P2Dark

-Type=Transparent

+Type=Colorized

 

 [SingP2RTextScore]

 Text =00000

@@ -1061,7 +1061,7 @@ Y =59
 W =50

 H =54

 Color =P1Dark

-Type=Transparent

+Type=Colorized

 

 [SingP1ThreePText]

 Text =P1

@@ -1077,9 +1077,9 @@ Tex =ScoreBG
 X =75

 Y =61

 W =100

-H =34

+H =36

 Color =P1Dark

-Type=Transparent

+Type=Colorized

 

 [SingP1ThreePTextScore]

 Text =00000

@@ -1104,7 +1104,7 @@ Y =59
 W =50

 H =54

 Color =P2Dark

-Type=Transparent

+Type=Colorized

 

 [SingP2MText]

 Text =P2

@@ -1120,9 +1120,9 @@ Tex =ScoreBG
 X =370

 Y =61

 W =100

-H =34

+H =36

 Color =P2Dark

-Type=Transparent

+Type=Colorized

 

 [SingP2MTextScore]

 Text =00000

@@ -1147,7 +1147,7 @@ Y =59
 W =50

 H =54

 Color =P3Dark

-Type=Transparent

+Type=Colorized

 

 [SingP3RText]

 Text =P3

@@ -1163,9 +1163,9 @@ Tex =ScoreBG
 X =670

 Y =61

 W =100

-H =34

+H =36

 Color =P3Dark

-Type=Transparent

+Type=Colorized

 

 [SingP3RTextScore]

 Text =00000