merge with current trunk (just update)

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

8 files changed, 332 insertions, 13 deletions

diff --git a/unicode/game/themes/Classic.ini b/unicode/game/themes/Classic.ini
index d29ce968..144448f2 100644
--- a/unicode/game/themes/Classic.ini
+++ b/unicode/game/themes/Classic.ini
@@ -510,10 +510,8 @@ Size = 21
 Align=0
 Text=SING_SONG_SELECTION_PLAYLIST
 
-
 #and theese are the ones for partymode
 
-
 [SongStaticParty1]
 X =187
 Y =553
@@ -1748,6 +1746,7 @@ TexX1=0
 TexY1=0
 TexX2=1
 TexY2=1
+
 [ScorePlayer4Static2]
 X=20
 Y=345
@@ -1760,6 +1759,7 @@ TexX1=0
 TexY1=0
 TexX2=1
 TexY2=1
+
 [ScorePlayer4Static3]
 X=20
 Y=410
@@ -2361,7 +2361,6 @@ Texts = 3
 [OptionsBackground]
 Tex=OptionsBG
 
-
 [OptionsText1]
 X = 50
 Y = 170
@@ -2723,7 +2722,6 @@ SBGDColor = Gray
 STColor = White
 STDColor = GrayDark
 
-
 [OptionsGameSelectSlideLanguage]
 Tex = MainBar
 TexSBG = MainBar
@@ -2814,7 +2812,6 @@ Color = ColorDark
 DColor = Gray
 Type = Font Black
 
-
 [OptionsGraphics]
 Texts = 3
 
@@ -2978,7 +2975,6 @@ Color = ColorDark
 DColor = Gray
 Type = Font Black
 
-
 [OptionsSound]
 Texts = 3
 
@@ -3567,7 +3563,6 @@ SBGDColor = Gray
 STColor = White
 STDColor = GrayDark
 
-
 [OptionsRecordButtonExit]
 X = 40
 Y = 305
@@ -3841,7 +3836,6 @@ Size = 30
 Align =1
 Text =easy
 
-
 [Top5TextArtistTitle]
 X =100
 Y =120
@@ -3896,7 +3890,6 @@ Size = 33
 Align =0
 Text =5. Player5
 
-
 [Top5TextScore1]
 X =680
 Y =195
@@ -4052,9 +4045,134 @@ TexY1=0
 TexX2=1
 TexY2=1
 
+[Edit]
+Texts = 1
+
+[EditBackground]
+Tex = EditBG
+
+# main title
+[EditText1]
+X = 50
+Y = 170
+Color = GrayLight
+Font = 1
+Size = 75
+Text = SING_EDIT
+
+# main icon
+[EditStatic1]
+X = 40
+Y = 250
+W = 32
+H = 32
+Color = ColorDark
+Tex = MainIcon
+Type = Font Black
+
+# Navigate button text
+[EditText2]
+X = 226
+Y = 553
+Color = Gray
+Font = 1
+Size = 21
+Align = 0
+Text = SING_EDIT_NAVIGATE
+
+# Select button text
+[EditText3]
+X = 380
+Y = 553
+Color = Gray
+Font = 1
+Size = 21
+Align = 0
+Text = SING_EDIT_SELECT
+
+# Escape button text
+[EditText4]
+X = 540
+Y = 553
+Color = Gray
+Font = 1
+Size = 21
+Align = 0
+Text = SING_EDIT_EXIT
+
+[EditTextDescription]
+X = 72
+Y = 248
+Color = GrayDark
+Font = 1
+Size = 30
+#Text = SING_EDIT_TEXTDESCRIPTION
+
+[EditStatic2]
+X = 196
+Y = 553
+W = 22
+H = 22
+Tex = ButtonNavi
+Color = White
+Type = Plain
+TexX1=0
+TexY1=0
+TexX2=1
+TexY2=1
+
+[EditStatic3]
+X = 350
+Y = 552
+W = 22
+H = 22
+Tex = ButtonEnter
+Color = White
+Type = Plain
+TexX1=0
+TexY1=0
+TexX2=1
+TexY2=1
+
+[EditStatic4]
+X = 510
+Y = 553
+W = 22
+H = 22
+Tex = ButtonEsc
+Color = White
+Type = Plain
+TexX1=0
+TexY1=0
+TexX2=1
+TexY2=1
+
+[EditButtonConvert]
+X = 40
+Y = 310
+W = 250
+H = 70
+Tex = Button
+Color = ColorDark
+Int = 1
+DColor = White
+DInt = 0.5
+Type = Font Black
+Texts = 1
+
+[EditButtonConvertText1]
+X = 115
+Y = 20
+Font = 1
+Size = 27
+Align = 1
+Text = SING_EDIT_BUTTON_CONVERT
+Color = White
+
 [Level]
 Texts=2
 
+
 [LevelBackground]
 Tex=MainBG
 
@@ -5509,7 +5627,6 @@ Color =P1Dark
 Reflection=1
 ReflectionSpacing=2
 
-
 [PartyWinStaticTeam1Deco]
 Tex =PartyWinDeco1
 X = 91
@@ -6824,7 +6941,6 @@ Color =ColorDark
 Tex =MainIcon
 Type=Font Black
 
-
 [StatMainStatic2]
 X =40
 Y =120
@@ -7166,7 +7282,6 @@ Tex=StatMainBG3
 Color =ColorLight
 Type=Font Black
 
-
 [StatDetailText1]
 X =40
 Y =6
diff --git a/unicode/game/themes/Deluxe.ini b/unicode/game/themes/Deluxe.ini
index e013a75a..5f47c215 100644
--- a/unicode/game/themes/Deluxe.ini
+++ b/unicode/game/themes/Deluxe.ini
@@ -4312,7 +4312,6 @@ SBGDColor = LightBlue
 STColor = White
 STDColor = GrayDark
 
-
 [OptionsAdvancedButtonExit]
 X = 40
 Y = 415
@@ -4605,6 +4604,199 @@ H = 40
 Color = P1Dark
 Type = Colorized
 
+[Edit]
+Texts = 5
+
+[EditBackground]
+Tex = EditBG
+
+# main icon
+[EditStatic1]
+X = 65
+Y = 150
+W = 25
+H = 25
+Color = White
+Tex = IconEdit
+Type = Transparent
+# Type = Colorized
+
+# main icon title
+[EditText1]
+X = 95
+Y = 135
+Color = White
+Font = 0
+Size = 54
+Align = 0
+Text = SING_EDIT
+
+# main icon subtitle
+[EditText2]
+X = 95
+Y = 175
+Color = ColorLightest
+Font = 0
+Size = 30
+Align = 0
+Text = SING_EDIT_MENU_DESCRIPTION
+
+# Navigate button text
+[EditText3]
+X = 300
+Y = 548
+Color = Black
+Font = 0
+Size = 24
+Align = 0
+Text = SING_EDIT_NAVIGATE
+Reflection = 1
+ReflectionSpacing = 20
+
+# Select button text
+[EditText4]
+X = 440
+Y = 548
+Color = Black
+Font = 0
+Size = 24
+Align = 0
+Text = SING_EDIT_SELECT
+Reflection=1
+ReflectionSpacing=20
+
+# Esc button text
+[EditText5]
+X = 590
+Y = 548
+Color = Black
+Font = 0
+Size = 24
+Align = 0
+Text = SING_EDIT_EXIT
+Reflection=1
+ReflectionSpacing=20
+
+[EditTextDescription]
+X = 95
+Y = 195
+Color = White
+Font = 0
+Size = 30
+Align = 0
+Text = SING_EDIT_TEXTDESCRIPTION
+
+[EditStatic2]
+X = 0
+Y = 545
+W = 250
+H = 30
+Tex = Leiste1
+Color = ColorLight
+Type = Colorized
+Reflection = 1
+ReflectionSpacing = 2
+
+[EditStatic3]
+X = 250
+Y = 545
+W = 550
+H = 30
+Tex = Leiste2
+Color = White
+Type = Transparent
+Reflection = 1
+ReflectionSpacing = 2
+
+[EditStatic4]
+X = 260
+Y = 545
+W = 32
+H = 30
+Tex = ButtonNavi
+Color = White
+Type = Transparent
+Reflection = 1
+ReflectionSpacing = 2
+
+[EditStatic5]
+X = 400
+Y = 545
+W = 32
+H = 30
+Tex = ButtonEnter
+Color = White
+Type = Transparent
+Reflection = 1
+ReflectionSpacing = 2
+
+[EditStatic6]
+X = 550
+Y = 545
+W = 32
+H = 30
+Tex = ButtonEsc
+Color = White
+Type = Transparent
+Reflection = 1
+ReflectionSpacing = 2
+
+[EditButtonConvert]
+X = 250
+Y = 270
+W = 150
+H = 50
+Tex = Button
+Color = ColorLight
+DColor = ColorDark
+Type = Transparent
+Texts = 1
+Reflection = 1
+ReflectionSpacing = 15
+DeSelectReflectionSpacing = 280
+Fade = 1
+FadeText = 1
+SelectH = 150
+FadeTex = ButtonFade
+FadeTexPos = 0
+
+[EditButtonConvertText1]
+X = 75
+Y = 10
+Font = 0
+Size = 30
+Align = 1
+Text = SING_EDIT_BUTTON_CONVERT
+Color = White
+
+[EditButtonExit]
+X = 405
+Y = 270
+W = 150
+H = 50
+Tex = Button
+Color = ColorLight
+DColor = ColorDark
+Type = Transparent
+Texts = 1
+Reflection = 1
+ReflectionSpacing = 15
+DeSelectReflectionSpacing = 280
+Fade = 1
+FadeText = 1
+SelectH = 150
+FadeTex = ButtonFade
+FadeTexPos = 0
+
+[EditButtonExitText1]
+X = 75
+Y = 10
+Font = 0
+Size = 30
+Align = 1
+Text = SING_EDIT_BUTTON_EXIT
+Color = White
+
 [Level]
 Texts = 5
 
diff --git a/unicode/game/themes/Deluxe/Blue.ini b/unicode/game/themes/Deluxe/Blue.ini
index 6f3c1e55..30c68e3e 100644
--- a/unicode/game/themes/Deluxe/Blue.ini
+++ b/unicode/game/themes/Deluxe/Blue.ini
@@ -36,12 +36,14 @@ SongBG         = [bg-main]blue.jpg
 ScoreScreenBG  = [bg-main]blue.jpg
 Top5BG         = [bg-main]blue.jpg
 OptionsBG      = [bg-main]blue.jpg
+EditBG         = [bg-main]blue.jpg
 PartyBG        = [bg-main]blue.jpg
 
 #Icons on screen
 SongCD         = [icon]cd.png
 MainIcon       = [icon]main.png
 IconOption     = [icon]options.png
+IconEdit     = [icon]options.png
 
 ScoreIcon      = [icon]score.png
 PartyIcon      = [icon]party.png
diff --git a/unicode/game/themes/Deluxe/Fall.ini b/unicode/game/themes/Deluxe/Fall.ini
index 57bf6539..72d9021b 100644
--- a/unicode/game/themes/Deluxe/Fall.ini
+++ b/unicode/game/themes/Deluxe/Fall.ini
@@ -22,6 +22,7 @@ SongBG         = [bg-main]fall.jpg
 ScoreScreenBG  = [bg-main]fall.jpg
 Top5BG         = [bg-main]fall.jpg
 OptionsBG      = [bg-main]fall.jpg
+EditBG         = [bg-main]fall.jpg
 PartyBG        = [bg-main]fall.jpg
 
 #Icons on screen
@@ -29,6 +30,7 @@ SongCD         = [icon]cd.png
 MainIcon       = [icon]main.png
 MainSearch     = [icon]search.png
 IconOption     = [icon]options.png
+IconEdit       = [icon]options.png
 IconSongMenu   = [icon]songmenu.png
 ScoreIcon      = [icon]score.png
 PartyIcon      = [icon]party.png
diff --git a/unicode/game/themes/Deluxe/Ribbon.ini b/unicode/game/themes/Deluxe/Ribbon.ini
index 0165a596..1631183e 100644
--- a/unicode/game/themes/Deluxe/Ribbon.ini
+++ b/unicode/game/themes/Deluxe/Ribbon.ini
@@ -23,6 +23,7 @@ SongBG         = [bg-video]ribbon.mov
 ScoreScreenBG  = [bg-video]ribbon.mov

 Top5BG         = [bg-video]ribbon.mov

 OptionsBG      = [bg-video]ribbon.mov

+EditBG         = [bg-video]ribbon.mov

 PartyBG        = [bg-video]ribbon.mov

 

 #Icons on screen

@@ -30,6 +31,7 @@ SongCD         = [icon]cd.png
 MainIcon       = [icon]main.png

 MainSearch     = [icon]search.png

 IconOption     = [icon]options.png

+IconEdit       = [icon]options.png

 IconSongMenu   = [icon]songmenu.png

 ScoreIcon      = [icon]score.png

 PartyIcon      = [icon]party.png

diff --git a/unicode/game/themes/Deluxe/Summer.ini b/unicode/game/themes/Deluxe/Summer.ini
index 85dc8e3f..3d40c2f8 100644
--- a/unicode/game/themes/Deluxe/Summer.ini
+++ b/unicode/game/themes/Deluxe/Summer.ini
@@ -22,6 +22,7 @@ SongBG         = [bg-main]summer.jpg
 ScoreScreenBG  = [bg-main]summer.jpg
 Top5BG         = [bg-main]summer.jpg
 OptionsBG      = [bg-main]summer.jpg
+EditBG         = [bg-main]summer.jpg
 PartyBG        = [bg-main]summer.jpg
 
 #Icons on screen
@@ -29,6 +30,7 @@ SongCD         = [icon]cd.png
 MainIcon       = [icon]main.png
 MainSearch     = [icon]search.png
 IconOption     = [icon]options.png
+IconEdit       = [icon]options.png
 IconSongMenu   = [icon]songmenu.png
 ScoreIcon      = [icon]score.png
 PartyIcon      = [icon]party.png
diff --git a/unicode/game/themes/Deluxe/Winter.ini b/unicode/game/themes/Deluxe/Winter.ini
index 0ececd74..32c37a02 100644
--- a/unicode/game/themes/Deluxe/Winter.ini
+++ b/unicode/game/themes/Deluxe/Winter.ini
@@ -22,6 +22,7 @@ SongBG         = [bg-main]winter.jpg
 ScoreScreenBG  = [bg-main]winter.jpg
 Top5BG         = [bg-main]winter.jpg
 OptionsBG      = [bg-main]winter.jpg
+EditBG         = [bg-main]winter.jpg
 PartyBG        = [bg-main]winter.jpg
 
 #Icons on screen
@@ -29,6 +30,7 @@ SongCD         = [icon]cd.png
 MainIcon       = [icon]main.png
 MainSearch     = [icon]search.png
 IconOption     = [icon]options.png
+IconEdit       = [icon]options.png
 IconSongMenu   = [icon]songmenu.png
 ScoreIcon      = [icon]score.png
 PartyIcon      = [icon]party.png
diff --git a/unicode/game/themes/Deluxe/ocean.ini b/unicode/game/themes/Deluxe/ocean.ini
index 82701c41..d18c7a60 100644
--- a/unicode/game/themes/Deluxe/ocean.ini
+++ b/unicode/game/themes/Deluxe/ocean.ini
@@ -22,6 +22,7 @@ SongBG         = [bg-video]_ocean.avi
 ScoreScreenBG  = [bg-video]_ocean.avi
 Top5BG         = [bg-video]_ocean.avi
 OptionsBG      = [bg-video]_ocean.avi
+EditBG         = [bg-video]_ocean.avi
 PartyBG        = [bg-video]_ocean.avi
 
 #Icons on screen
@@ -29,6 +30,7 @@ SongCD         = [icon]cd.png
 MainIcon       = [icon]main.png
 MainSearch     = [icon]search.png
 IconOption     = [icon]options.png
+IconEdit       = [icon]options.png
 IconSongMenu   = [icon]songmenu.png
 ScoreIcon      = [icon]score.png
 PartyIcon      = [icon]party.png