From a13a4c743872c24471054a05d00867e680e5c71c Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Wed, 1 Jan 2014 19:15:59 +0000
Subject: adjust some minor issues and prepare for moving the threshold and
 mic-boost options from sound to record.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3067 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 game/themes/Candy.ini | 116 +++++++++++++++++++++++++-------------------------
 1 file changed, 57 insertions(+), 59 deletions(-)

(limited to 'game/themes/Candy.ini')

diff --git a/game/themes/Candy.ini b/game/themes/Candy.ini
index 09f929fd..96e3823b 100755
--- a/game/themes/Candy.ini
+++ b/game/themes/Candy.ini
@@ -3018,7 +3018,7 @@ Text = SING_OPTIONS_SOUND_VOICEPASSTHROUGH
 X = 70
 Y = 130
 W = 250
-H = 35
+H = 40
 SkipX = 10
 
 Color = Button
@@ -3038,31 +3038,9 @@ Type = Transparent
 TypeSBG = Transparent
 Text = SING_OPTIONS_SOUND_BACKGROUNDMUSIC
 X = 70
-Y = 170
-W = 250
-H = 35
-SkipX = 10
-
-Color = Button
-DColor = Light
-TColor = White
-TDColor = Button
-
-SBGColor = Button
-SBGDColor = Light
-STColor = White
-STDColor = White
-
-[OptionsSoundSelectMicBoost]
-Tex = Party1Bar
-TexSBG = Party1Bar
-Type = Transparent
-TypeSBG = Transparent
-Text = SING_OPTIONS_SOUND_MIC_BOOST
-X = 70
-Y = 210
+Y = 180
 W = 250
-H = 35
+H = 40
 SkipX = 10
 
 Color = Button
@@ -3082,9 +3060,9 @@ Type = Transparent
 TypeSBG = Transparent
 Text = SING_OPTIONS_SOUND_CLICK_ASSIST
 X = 70
-Y = 250
+Y = 230
 W = 250
-H = 35
+H = 40
 SkipX = 10
 
 Color = Button
@@ -3104,31 +3082,9 @@ Type = Transparent
 TypeSBG = Transparent
 Text = SING_OPTIONS_SOUND_BEAT_CLICK
 X = 70
-Y = 290
-W = 250
-H = 35
-SkipX = 10
-
-Color = Button
-DColor = Light
-TColor = White
-TDColor = Button
-
-SBGColor = Button
-SBGDColor = Light
-STColor = White
-STDColor = White
-
-[OptionsSoundSelectThreshold]
-Tex = Party1Bar
-TexSBG = Party1Bar
-Type = Transparent
-TypeSBG = Transparent
-Text = SING_OPTIONS_SOUND_THRESHOLD
-X = 70
-Y = 330
+Y = 280
 W = 250
-H = 35
+H = 40
 SkipX = 10
 
 Color = Button
@@ -3148,9 +3104,9 @@ Type = Transparent
 TypeSBG = Transparent
 Text = SING_OPTIONS_SOUND_PREVIEWVOLUME
 X = 70
-Y = 370
+Y = 330
 W = 250
-H = 35
+H = 40
 SkipX = 10
 
 Color = Button
@@ -3170,9 +3126,9 @@ Type = Transparent
 TypeSBG = Transparent
 Text = SING_OPTIONS_SOUND_PREVIEWFADING
 X = 70
-Y = 410
+Y = 380
 W = 250
-H = 35
+H = 40
 SkipX = 10
 
 Color = Button
@@ -3187,7 +3143,7 @@ STDColor = White
 
 [OptionsSoundButtonExit]
 X = 70
-Y = 460
+Y = 440
 W = 250
 H = 40
 Tex = Party1Bar
@@ -3614,9 +3570,53 @@ SBGDColor = Light
 STColor = Button
 STDColor = White
 
+[OptionsRecordSelectThreshold]
+Tex = Party1Bar
+TexSBG = Party1Bar
+Type = Transparent
+TypeSBG = Transparent
+Text = SING_OPTIONS_RECORD_THRESHOLD
+X = 70
+Y = 367
+W = 250
+H = 40
+SkipX = 10
+
+Color = Button
+DColor = Light
+TColor = White
+TDColor = Button
+
+SBGColor = Button
+SBGDColor = Light
+STColor = White
+STDColor = White
+
+[OptionsRecordSelectMicBoost]
+Tex = Party1Bar
+TexSBG = Party1Bar
+Type = Transparent
+TypeSBG = Transparent
+Text = SING_OPTIONS_RECORD_MIC_BOOST
+X = 70
+Y = 417
+W = 250
+H = 40
+SkipX = 10
+
+Color = Button
+DColor = Light
+TColor = White
+TDColor = Button
+
+SBGColor = Button
+SBGDColor = Light
+STColor = White
+STDColor = White
+
 [OptionsRecordButtonExit]
 X = 70
-Y = 390
+Y = 470
 W = 250
 H = 40
 Tex = Party1Bar
@@ -4128,7 +4128,6 @@ Color = White
 Type = Transparent
 
 [Top5StaticNumber4]
-Tex = PlayerNumberBox
 Tex = P
 X = 105
 Y = 342
@@ -4138,7 +4137,6 @@ Color = White
 Type = Transparent
 
 [Top5StaticNumber5]
-Tex = PlayerNumberBox
 Tex = P
 X = 105
 Y = 392
-- 
cgit v1.2.3