correction of submission part 1

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

8 files changed, 205 insertions, 28 deletions

diff --git a/game/languages/German.ini b/game/languages/German.ini
index 64ae0419..152d7768 100644
--- a/game/languages/German.ini
+++ b/game/languages/German.ini
@@ -14,7 +14,7 @@ SING_STATS=Statistiken
 SING_STATS_DESC=Die Statistiken anschauen
 
 SING_EDITOR=Editor
-SING_EDITOR_DESC=Mach deinen eigenen Song
+SING_EDITOR_DESC=Erstelle deinen eigenen Song
 
 SING_GAME_OPTIONS=Spiel-Optionen
 SING_GAME_OPTIONS_DESC=Verändere die Spieleinstellungen
@@ -96,6 +96,16 @@ SING_OPTIONS_ADVANCED_COUNT_HOW_OFTEN_SUNG=Wie oft gesungen mitzählen
 SING_OPTIONS_ADVANCED_ONSONGCLICK=nach Song-Wahl
 SING_OPTIONS_ADVANCED_PARTYPOPUP=Auto Party-Menü
 
+SING_EDIT=Editor
+SING_EDIT_MENU_DESCRIPTION=Erstelle deinen eigenen Song
+
+SING_EDIT_BUTTON_DESCRIPTION_CONVERT=Text aus Midi-Datei in Text importieren
+SING_EDIT_BUTTON_DESCRIPTION_EXIT=zurück
+SING_EDIT_BUTTON_CONVERT=Import
+SING_EDIT_BUTTON_EXIT=zurück
+
+SING_EDIT_NAVIGATE=Navigieren
+SING_EDIT_SELECT=Auswählen
 SING_EDIT_EXIT=zurück
 
 SING_LEGEND_SELECT=Auswählen
diff --git a/game/themes/Deluxe.ini b/game/themes/Deluxe.ini
index 93fc56a8..5f47c215 100644
--- a/game/themes/Deluxe.ini
+++ b/game/themes/Deluxe.ini
@@ -4312,7 +4312,6 @@ SBGDColor = LightBlue
 STColor = White
 STDColor = GrayDark
 
-
 [OptionsAdvancedButtonExit]
 X = 40
 Y = 415
@@ -4325,21 +4324,6 @@ Type = Transparent
 Reflection = 1
 ReflectionSpacing = 2
 
-[Edit]
-Texts = 1
-
-[EditButtonExit]
-X = 40
-Y = 415
-W = 230
-H = 70
-Tex = Button
-Color = ColorLight
-DColor = ColorDark
-Type = Transparent
-Reflection = 1
-ReflectionSpacing = 2
-
 [Top5]
 Texts = 1
 
@@ -4620,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/game/themes/Deluxe/Blue.ini b/game/themes/Deluxe/Blue.ini
index 87c9f0f4..30c68e3e 100644
--- a/game/themes/Deluxe/Blue.ini
+++ b/game/themes/Deluxe/Blue.ini
@@ -43,7 +43,7 @@ PartyBG        = [bg-main]blue.jpg
 SongCD         = [icon]cd.png
 MainIcon       = [icon]main.png
 IconOption     = [icon]options.png
-IconEdit       = [icon]options.png
+IconEdit     = [icon]options.png
 
 ScoreIcon      = [icon]score.png
 PartyIcon      = [icon]party.png
diff --git a/game/themes/Deluxe/Fall.ini b/game/themes/Deluxe/Fall.ini
index 72d9021b..57bf6539 100644
--- a/game/themes/Deluxe/Fall.ini
+++ b/game/themes/Deluxe/Fall.ini
@@ -22,7 +22,6 @@ 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
@@ -30,7 +29,6 @@ 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/game/themes/Deluxe/Ribbon.ini b/game/themes/Deluxe/Ribbon.ini
index 1631183e..0165a596 100644
--- a/game/themes/Deluxe/Ribbon.ini
+++ b/game/themes/Deluxe/Ribbon.ini
@@ -23,7 +23,6 @@ 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

@@ -31,7 +30,6 @@ 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/game/themes/Deluxe/Summer.ini b/game/themes/Deluxe/Summer.ini
index 3d40c2f8..85dc8e3f 100644
--- a/game/themes/Deluxe/Summer.ini
+++ b/game/themes/Deluxe/Summer.ini
@@ -22,7 +22,6 @@ 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
@@ -30,7 +29,6 @@ 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/game/themes/Deluxe/Winter.ini b/game/themes/Deluxe/Winter.ini
index 32c37a02..0ececd74 100644
--- a/game/themes/Deluxe/Winter.ini
+++ b/game/themes/Deluxe/Winter.ini
@@ -22,7 +22,6 @@ 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
@@ -30,7 +29,6 @@ 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/game/themes/Deluxe/ocean.ini b/game/themes/Deluxe/ocean.ini
index d18c7a60..82701c41 100644
--- a/game/themes/Deluxe/ocean.ini
+++ b/game/themes/Deluxe/ocean.ini
@@ -22,7 +22,6 @@ 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
@@ -30,7 +29,6 @@ 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