Merge branch 'develop' of https://github.com/Vocaluxe/Vocaluxe into jukebox

2012-03-10 12:58:34 +01:00
commit 16e2be8fd9
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
  <ScreenOptionsSound>
-    <ScreenVersion>1</ScreenVersion>
+    <ScreenVersion>2</ScreenVersion>
    <Background1>
      <!--<Type>: Background type: None, Color, Texture, Video-->
      <Type>Video</Type>
@@ -394,4 +394,4 @@
      <NumVisible>1</NumVisible>
    </SelectSlideBackgroundMusicSource>
  </ScreenOptionsSound>
-</root>
+</root>
@@ -0,0 +1,18 @@
+ScreenOptionsSound
+
++++++++++
+Version 2:
+
+Add:
+
+<ButtonExit>
+
+<SelectSlideBackgroundMusic>
+<SelectSlideBackgroundMusicVolume>
+<SelectSlideBackgroundMusicSource>
+
+and some texts for description (Text2, Text3, Text4)
+"TR_SCREENOSOUND_BACKGROUNDMUSIC"
+"TR_SCREENOSOUND_BACKGROUNDMUSICVOLUME"
+"TR_SCREENOSOUND_BACKGROUNDMUSICSOURCE"
++++++++++