Deleted Motas Methods to display variable Statics and Texts in Party Mode.

Added a new, more extendable and easier in Code Method for displaying Statics in Party Mode or in Normal Mode only
Enter in Songscreen in Party Mode Opens now SongMenu again when PartyPopup=1
Changed Theme to Fit these changes

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

1 files changed, 36 insertions, 124 deletions

diff --git a/Themes/Deluxe.ini b/Themes/Deluxe.ini
index cecd32b0..73fe2102 100644
--- a/Themes/Deluxe.ini
+++ b/Themes/Deluxe.ini
@@ -421,12 +421,19 @@ Text=
 

 

 #Variable statics and texts for song-screen in sing- and partymode

-#Each static or text comes in 2 versions now. E.g SongStaticKeys8Text and SongStaticKeys8TextParty. (Doh, i have to alter the names)

-#There are 8 statics and 8 texts for each mode. 32 items alltogether.

-

+# There can be an unlimited Number of Statics and Texts, As long 

+# as the numbers are in order.

+# Statics that are shown in PartyMode Only are Named_

+#	SongStaticParty[No]

+# Texts that are shown in PartyMode Only are Named_

+#	SongTextParty[No]

+# Statics that are shown in Normal Mode Only are Named_

+#	SongStaticNonParty[No]

+# Texts that are shown in Normal Mode Only are Named_

+#	SongTextNonParty[No]

 #Here are the ones for singmode

 

-[SongStaticKeys1]

+[SongStaticNonParty1]

 X =40

 Y =22

 W =27

@@ -435,7 +442,7 @@ Color =White
 Tex =SongCD

 Type=Font Black

 

-[SongStaticKeys2]

+[SongStaticNonParty2]

 X =260

 Y =553

 W =26

@@ -444,7 +451,7 @@ Tex=ButtonAlt
 Color =White

 Type=Plain

 

-[SongStaticKeys3]

+[SongStaticNonParty3]

 X =300

 Y =553

 W =26

@@ -453,7 +460,7 @@ Tex=ButtonAZ
 Color =White

 Type=Plain

 

-[SongStaticKeys4]

+[SongStaticNonParty4]

 X =425

 Y =553

 W =22

@@ -462,7 +469,7 @@ Tex=ButtonM
 Color =White

 Type=Plain

 

-[SongStaticKeys5]

+[SongStaticNonParty5]

 X =515

 Y =553

 W =22

@@ -471,7 +478,7 @@ Tex=ButtonJ
 Color =White

 Type=Plain

 

-[SongStaticKeys6]

+[SongStaticNonParty6]

 X =679

 Y =553

 W =22

@@ -480,27 +487,8 @@ Tex=ButtonP
 Color =White

 Type=Plain

 

-#Not used in this theme

-#[SongStaticKeys7]

-#X =

-#Y =

-#W =

-#H =

-#Tex=

-#Color =

-#Type=

-

-#Not used in this theme

-#[SongStaticKeys8]

-#X =

-#Y =

-#W =

-#H =

-#Tex=

-#Color =

-#Type=

-

-[SongStaticKeys1Text]

+#Texts Non Party

+[SongTextNonParty1]

 X =70

 Y =6

 Color=White

@@ -509,7 +497,7 @@ Size =20
 Text=SING_SONG_SELECTION

 Align=0

 

-[SongStaticKeys2Text]

+[SongTextNonParty2]

 X =238

 Y =552

 Color=Black

@@ -518,7 +506,7 @@ Size =7
 Align=2

 Text=SING_SONG_SELECTION_WHEREAMI

 

-[SongStaticKeys3Text]

+[SongTextNonParty3]

 X =288

 Y =556

 Color=Black

@@ -527,7 +515,7 @@ Size =5
 Align=0

 Text=+

 

-[SongStaticKeys4Text]

+[SongTextNonParty4]

 X =330

 Y =552

 Color=Black

@@ -536,7 +524,7 @@ Size =7
 Align=0

 Text=SING_SONG_SELECTION_GOTO

 

-[SongStaticKeys5Text]

+[SongTextNonParty5]

 X =450

 Y =552

 Color=Black

@@ -545,7 +533,7 @@ Size =7
 Align=0

 Text=SING_SONG_SELECTION_MENU

 

-[SongStaticKeys6Text]

+[SongTextNonParty6]

 X =540

 Y =552

 Color=Black

@@ -554,7 +542,7 @@ Size =7
 Align=0

 Text=SONG_JUMPTO_DESC

 

-[SongStaticKeys7Text]

+[SongTextNonParty7]

 X =705

 Y =552

 Color=Black

@@ -563,19 +551,10 @@ Size =7
 Align=0

 Text=SING_SONG_SELECTION_PLAYLIST

 

-#Not used in this Theme

-#[SongStaticKeys8Text]

-#X =

-#Y =

-#Color=

-#Font =0

-#Size =0

-#Align=0

-#Text=

 

 #and theese are the ones for partymode

 

-[SongStaticKeys1Party]

+[SongStaticParty1]

 X =40

 Y =22

 W =27

@@ -584,7 +563,7 @@ Color =White
 Tex =PartyIcon

 Type=Font Black

 

-[SongStaticKeys2Party]

+[SongStaticParty2]

 X =260

 Y =553

 W =26

@@ -593,7 +572,7 @@ Tex=Button13
 Color =White

 Type=Plain

 

-[SongStaticKeys3Party]

+[SongStaticParty3]

 X =400

 Y =553

 W =22

@@ -602,7 +581,7 @@ Tex=ButtonM
 Color =White

 Type=Plain

 

-[SongStaticKeys4Party]

+[SongStaticParty4]

 X =540

 Y =553

 W =26

@@ -611,47 +590,9 @@ Tex=ButtonEnter
 Color =White

 Type=Plain

 

-#Not used in this theme

-#[SongStaticKeys5Party]

-#X =

-#Y =

-#W =

-#H =

-#Tex=

-#Color =

-#Type=

-

-#Not used in this theme

-#[SongStaticKeys6Party]

-#X =

-#Y =

-#W =

-#H =

-#Tex=

-#Color =

-#Type=

-

-#Not used in this theme

-#[SongStaticKeys7Party]

-#X =

-#Y =

-#W =

-#H =

-#Tex=

-#Color =

-#Type=

-

-#Not used in this theme

-#[SongStaticKeys8Party]

-#X =

-#Y =

-#W =

-#H =

-#Tex=

-#Color =

-#Type=

-

-[SongStaticKeys1TextParty]

+#Texts for Party Mode

+

+[SongTextParty1]

 X =70

 Y =6

 ColR = 0.7

@@ -662,7 +603,7 @@ Size = 20
 Color =White

 Text=PARTY_MODE

 

-[SongStaticKeys2TextParty]

+[SongTextParty2]

 X =238

 Y =552

 Color=Black

@@ -671,7 +612,7 @@ Size =7
 Align=2

 Text=PARTY_SONG_WHEREAMI

 

-[SongStaticKeys3TextParty]

+[SongTextParty3]

 X =288

 Y =552

 Color=Black

@@ -680,7 +621,7 @@ Size =7
 Align=0

 Text=SONG_MENU_NAME_PARTY_JOKER

 

-[SongStaticKeys4TextParty]

+[SongTextParty4]

 X =426

 Y =552

 Color=Black

@@ -689,7 +630,7 @@ Size =7
 Align=0

 Text=PARTY_SONG_MENU

 

-[SongStaticKeys5TextParty]

+[SongTextParty5]

 X =570

 Y =552

 Color=Black

@@ -698,39 +639,10 @@ Size =7
 Align=0

 Text=PARTY_SONG_LEGEND_CONTINUE

 

-#Not used in this Theme

-#[SongStaticKeys6TextParty]

-#X =

-#Y =

-#Color=

-#Font =0

-#Size =0

-#Align=0

-#Text=

-

-#Not used in this Theme

-#[SongStaticKeys7TextParty]

-#X =

-#Y =

-#Color=

-#Font =0

-#Size =0

-#Align=0

-#Text=

-

-#Not used in this Theme

-#[SongStaticKeys8TextParty]

-#X =

-#Y =

-#Color=

-#Font =0

-#Size =0

-#Align=0

-#Text=

-

 #variable statics end

 

 

+# Jokers, 5 for each team, only shown in party Mode

 [SongStaticTeam1Joker1]

 Tex =Joker

 X =480