merged unicode branch (r1931) into trunk

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

1 files changed, 7 insertions, 28 deletions

diff --git a/game/themes/Deluxe/Ocean.ini b/game/themes/Deluxe/Ocean.ini
index bdc90979..d18c7a60 100644
--- a/game/themes/Deluxe/Ocean.ini
+++ b/game/themes/Deluxe/Ocean.ini
@@ -9,32 +9,12 @@ Name=Ocean
 Color=Blue
 
 [Textures]
-/**
- * Interface
- */
-interface_selectbg_search   = interface/selectbg_search.png
-interface_dialog_background = interface/dialog_background.png
-
-Cursor = interface/cursor.png
-Cursor_Pressed = interface/cursor_pressed.png
-
-/**
- * Icons
- */
-icon_song_menu   = icon/song_menu.png
-icon_song_search = icon/song_search.png
-icon_song_video  = icon/song_video.png
-
-
 # # # M A I N # # #
 Button         = [main]button.png
 ButtonF        = [main]buttonf.jpg
 MainBar        = [main]mainBar.png
 SelectBG       = [main]selectbg.png
 
-Select_ArrowLeft = interface/select_arrow_left.png
-Select_ArrowRight = interface/select_arrow_right.png
-
 #Backgrounds
 LoadingBG      = [bg-load]blue.jpg
 MainBG         = [bg-video]_ocean.avi
@@ -48,16 +28,18 @@ PartyBG        = [bg-video]_ocean.avi
 #Icons on screen
 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
 StatIcon       = [icon]stats.png
+VideoIcon      = [icon]video.png
 
 IconError      = [icon]error.png
 IconQuestion   = [icon]question.png
 
-
 # # # S O N G S E L E C E T # # #
 SongSelection1 = [main]songSelection1.png
 SongSelection2 = [main]songSelection2.png
@@ -94,12 +76,11 @@ P              = [sing]p.png
 #Pointer for lyrics
 Ball           = [sing]LyricsBall.png
 
-
 # # # S C O R E / T O P 5 # # #
 ScoreBox        = [score]box.png
-ScoreGlassBox   = [score]glass_box.png
+ScoreGlassBox   = [score]glass_box.png 
 ScoreLevel      = [score]level.png
-ScoreLevelRound = [score]levelRound.png
+ScoreLevelRound = [score]levelround.png
 
 ScoreLevel_Dark           = [score]level_dark.png
 ScoreLevel_Dark_Round     = [score]level_dark_round.png
@@ -139,7 +120,6 @@ Rating_6 = [score]rating_6.png
 Rating_7 = [score]rating_7.png
 # thank you girls and guys!!!
 
-
 # # # P A R T Y # # #
 Joker             =[party]Joker.png
 PartyPlayerButton =[party]playerButton.png
@@ -161,7 +141,6 @@ PartyWinDeco1     =[party]winDecoration.png
 PartyWinDeco2     =[party]winDecoration.png
 PartyWinDeco3     =[party]winDecoration.png
 
-
 # # # S T A T S # # #
 StatMainBG1 = [stat]mainBG1.png
 StatMainBG2 = [stat]mainBG2.png
@@ -186,6 +165,7 @@ Leiste2     = [special]bar2.png
 JumpToBG    = [menu]jumpToBg.png
 SongMenuBG  = [menu]songMenuBg.png
 SongMenuSelectBG  = [menu]songMenuSelectBg.png
+PopUpBG     = [menu]popUpBG.png
 
 
 # # # N O T E S # # #
@@ -214,7 +194,6 @@ Rectangle  = [helper]rectangle.jpg
 ButtonFade = [helper]buttonFade.png
 BGFade     = [special]bg_fade.png
 
-
 # # # D U E T # # #
 LyricIcon_P1  = [sing.player1]lyric_active.png
 LyricIconD_P1 = [sing.player1]lyric_inactive.png
@@ -227,4 +206,4 @@ LyricIconD_P4 = [sing.player4]lyric_inactive.png
 LyricIcon_P5  = [sing.player5]lyric_active.png
 LyricIconD_P5 = [sing.player5]lyric_inactive.png
 LyricIcon_P6  = [sing.player6]lyric_active.png
-LyricIconD_P6 = [sing.player6]lyric_inactive.png
\ No newline at end of file
+LyricIconD_P6 = [sing.player6]lyric_inactive.png