1 files changed, 333 insertions, 119 deletions
diff --git a/Themes/Deluxe.ini b/Themes/Deluxe.ini
index 987bf070..582a4f8f 100644
--- a/Themes/Deluxe.ini
+++ b/Themes/Deluxe.ini
@@ -340,14 +340,46 @@ Space=1
 Bands=5
 Length=18
 
-[SongText1]
-X =70
-Y =6
-Color=White
-Font =0
-Size =20
-Text=SING_SONG_SELECTION
-Align=0
+[SongStatic1]
+X =0
+Y =549
+W =252
+H =28
+Tex=Leiste1
+Color =White
+Type=Plain
+Reflection=1
+ReflectionSpacing=1
+
+[SongStatic2]
+X =254
+Y =549
+W =548
+H =28
+Tex=Leiste2
+Color =White
+Type=Plain
+Reflection=1
+ReflectionSpacing=1
+
+[SongStatic3]
+X =200
+Y =120
+W =300
+H =200
+Color =LightBlue
+Tex =SongSelection1
+Type=Font Black
+
+[SongStatic4]
+X =248
+Y =320
+W =200
+H =200
+Z=0.98
+Color =LightBlue
+Tex =SongSelection2
+Type=Font Black
 
 [SongTextCat]
 X =70
@@ -358,7 +390,43 @@ Size =10
 Align =0
 Text=SING_CHOOSE_SONG
 
-[SongStatic1]
+[SongTextArtist]
+X =350
+Y =320
+W = 190
+Color=White
+Font =1
+Size =9
+Align =1
+Text=
+
+[SongTextTitle]
+X =350
+Y =380
+W = 190
+Color=White
+Font =0
+Size =9
+Align =1
+Text=
+
+[SongTextNumber]
+X =440
+Y =495
+Color=White
+Font =0
+Size =8
+Align =2
+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.
+
+#Here are the ones for singmode
+
+[SongStaticKeys1]
 X =40
 Y =22
 W =27
@@ -367,57 +435,90 @@ Color =White
 Tex =SongCD
 Type=Font Black
 
-[SongText2]
-X =238
-Y =552
-Color=Black
-Font =0
-Size =7
-Align=2
-Text=SING_SONG_SELECTION_WHEREAMI
+[SongStaticKeys2]
+X =260
+Y =553
+W =26
+H =22
+Tex=ButtonAlt
+Color =White
+Type=Plain
 
-[SongStatic2]
-X =248
-Y =320
-W =200
-H =200
-Z=0.98
-Color =LightBlue
-Tex =SongSelection2
-Type=Font Black
+[SongStaticKeys3]
+X =300
+Y =553
+W =26
+H =22
+Tex=ButtonAZ
+Color =White
+Type=Plain
 
-[SongStatic3]
-X =0
-Y =549
-W =252
-H =28
-Tex=Leiste1
+[SongStaticKeys4]
+X =425
+Y =553
+W =22
+H =22
+Tex=ButtonM
 Color =White
 Type=Plain
-Reflection=1
-ReflectionSpacing=1
 
-[SongStatic4]
-X =254
-Y =549
-W =548
-H =28
-Tex=Leiste2
+[SongStaticKeys5]
+X =515
+Y =553
+W =22
+H =22
+Tex=ButtonJ
 Color =White
 Type=Plain
-Reflection=1
-ReflectionSpacing=1
 
-[SongStatic8]
-X =260
+[SongStaticKeys6]
+X =679
 Y =553
-W =26
+W =22
 H =22
-Tex=ButtonAlt
+Tex=ButtonP
 Color =White
 Type=Plain
 
-[SongText5]
+#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]
+X =70
+Y =6
+Color=White
+Font =0
+Size =20
+Text=SING_SONG_SELECTION
+Align=0
+
+[SongStaticKeys2Text]
+X =238
+Y =552
+Color=Black
+Font =0
+Size =7
+Align=2
+Text=SING_SONG_SELECTION_WHEREAMI
+
+[SongStaticKeys3Text]
 X =288
 Y =556
 Color=Black
@@ -426,16 +527,7 @@ Size =5
 Align=0
 Text=+
 
-[SongStatic9]
-X =300
-Y =553
-W =26
-H =22
-Tex=ButtonAZ
-Color =White
-Type=Plain
-
-[SongText6]
+[SongStaticKeys4Text]
 X =330
 Y =552
 Color=Black
@@ -444,16 +536,7 @@ Size =7
 Align=0
 Text=SING_SONG_SELECTION_GOTO
 
-[SongStatic6]
-X =425
-Y =553
-W =22
-H =22
-Tex=ButtonM
-Color =White
-Type=Plain
-
-[SongText3]
+[SongStaticKeys5Text]
 X =450
 Y =552
 Color=Black
@@ -462,16 +545,7 @@ Size =7
 Align=0
 Text=SING_SONG_SELECTION_MENU
 
-[SongStatic7]
-X =515
-Y =553
-W =22
-H =22
-Tex=ButtonJ
-Color =White
-Type=Plain
-
-[SongText4]
+[SongStaticKeys6Text]
 X =540
 Y =552
 Color=Black
@@ -480,62 +554,182 @@ Size =7
 Align=0
 Text=SONG_JUMPTO_DESC
 
-[SongStaticKeys1]
-X =679
+[SongStaticKeys7Text]
+X =705
+Y =552
+Color=Black
+Font =0
+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]
+X =40
+Y =22
+W =27
+H =27
+Color =White
+Tex =PartyIcon
+Type=Font Black
+
+[SongStaticKeys2Party]
+X =260
+Y =553
+W =26
+H =22
+Tex=Button13
+Color =White
+Type=Plain
+
+[SongStaticKeys3Party]
+X =400
 Y =553
 W =22
 H =22
-Tex=ButtonP
+Tex=ButtonM
 Color =White
 Type=Plain
-Texts=1
 
-[SongStaticKeys1Text]
-X =705
+[SongStaticKeys4Party]
+X =540
+Y =553
+W =26
+H =22
+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]
+X =70
+Y =6
+ColR = 0.7
+ColG = 0.7
+ColB = 0.7
+Font = 0
+Size = 20
+Color =White
+Text=PARTY_MODE
+
+[SongStaticKeys2TextParty]
+X =238
 Y =552
 Color=Black
 Font =0
 Size =7
-Align=0
-Text=SING_SONG_SELECTION_PLAYLIST
-
-[SongStatic5]
-X =200
-Y =120
-W =300
-H =200
-Color =LightBlue
-Tex =SongSelection1
-Type=Font Black
+Align=2
+Text=PARTY_SONG_WHEREAMI
 
-[SongTextArtist]
-X =350
-Y =320
-W = 190
-Color=White
-Font =1
-Size =9
-Align =1
-Text=
+[SongStaticKeys3TextParty]
+X =288
+Y =552
+Color=Black
+Font =0
+Size =7
+Align=0
+Text=SONG_MENU_NAME_PARTY_JOKER
 
-[SongTextTitle]
-X =350
-Y =380
-W = 190
-Color=White
+[SongStaticKeys4TextParty]
+X =426
+Y =552
+Color=Black
 Font =0
-Size =9
-Align =1
-Text=
+Size =7
+Align=0
+Text=PARTY_SONG_MENU
 
-[SongTextNumber]
-X =440
-Y =495
-Color=White
+[SongStaticKeys5TextParty]
+X =570
+Y =552
+Color=Black
 Font =0
-Size =8
-Align =2
-Text=
+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
+
 
 [SongStaticTeam1Joker1]
 Tex =Joker
@@ -4121,11 +4315,31 @@ SBGDColor = Gray
 STColor = White
 STDColor = GrayDark
 
-[OptionsAdvancedButtonExit]
+[OptionsAdvancedSelectPartyPopup]
+Tex =MainBar
+TexSBG =MainBar
+Text =SING_OPTIONS_ADVANCED_PARTYPOPUP
 X = 40
 Y = 415
 W = 230
 H = 70
+SkipX = 50
+
+Color = ColorDark
+DColor = Gray
+TColor = White
+TDColor = White
+SBGTex =MainBar
+SBGColor = ColorDark
+SBGDColor = Gray
+STColor = White
+STDColor = GrayDark
+
+[OptionsAdvancedButtonExit]
+X = 40
+Y = 470
+W = 230
+H = 70
 Tex =MainBar
 Color = ColorDark
 DColor = Gray