Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #121 from flokuep/develop

Browse Source 
Smaller improvements
This commit is contained in:
Stephan Sundermann committed 2014-12-04 17:22:35 +01:00
2 parents d9f677cbc4 94ee6c0418
commit 5580210632
7 files changed
+16 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Output/Themes/Ambient/Screens/ScreenOptionsGame.xml
+2 -2
View File
@@ -16,7 +16,7 @@
<Statics> <Statics>
<Static Name="Static1"> <Static Name="Static1">
<Skin>Menu</Skin> <Skin>Menu</Skin>
<Color Name="Invisible" /> <Color Name="StaticColor" />
<Rect> <Rect>
<X>40</X> <X>40</X>
<Y>40</Y> <Y>40</Y>
@@ -526,4 +526,4 @@
<Playlists /> <Playlists />
<ParticleEffects /> <ParticleEffects />
<ScreenSettings /> <ScreenSettings />
</Screen> </Screen>
Output/Themes/Ambient/Screens/ScreenOptionsRecord.xml
+1 -1
View File
@@ -16,7 +16,7 @@
<Statics> <Statics>
<Static Name="Static1"> <Static Name="Static1">
<Skin>Menu</Skin> <Skin>Menu</Skin>
<Color Name="Invisible" /> <Color Name="StaticColor" />
<Rect> <Rect>
<X>40</X> <X>40</X>
<Y>40</Y> <Y>40</Y>
Output/Themes/Ambient/Screens/ScreenOptionsVideo.xml
+2 -2
View File
@@ -16,7 +16,7 @@
<Statics> <Statics>
<Static Name="Static1"> <Static Name="Static1">
<Skin>Menu</Skin> <Skin>Menu</Skin>
<Color Name="Invisible" /> <Color Name="StaticColor" />
<Rect> <Rect>
<X>40</X> <X>40</X>
<Y>40</Y> <Y>40</Y>
@@ -504,4 +504,4 @@
<Playlists /> <Playlists />
<ParticleEffects /> <ParticleEffects />
<ScreenSettings /> <ScreenSettings />
</Screen> </Screen>
Output/Themes/Ambient/Screens/ScreenProfiles.xml
+2 -2
View File
@@ -16,7 +16,7 @@
<Statics> <Statics>
<Static Name="Static1"> <Static Name="Static1">
<Skin>Menu</Skin> <Skin>Menu</Skin>
<Color Name="Invisible" /> <Color Name="StaticColor" />
<Rect> <Rect>
<X>40</X> <X>40</X>
<Y>40</Y> <Y>40</Y>
@@ -691,4 +691,4 @@
<Playlists /> <Playlists />
<ParticleEffects /> <ParticleEffects />
<ScreenSettings /> <ScreenSettings />
</Screen> </Screen>
Output/Themes/Ambient/Screens/ScreenSing.xml
+4 -4
View File
@@ -78,7 +78,7 @@
<Skin>TimeLine</Skin> <Skin>TimeLine</Skin>
<Color Name="StaticColor" /> <Color Name="StaticColor" />
<Rect> <Rect>
<X>44</X> <X>50</X>
<Y>702</Y> <Y>702</Y>
<W>1090</W> <W>1090</W>
<H>10</H> <H>10</H>
@@ -89,7 +89,7 @@
<Skin>TimeLine</Skin> <Skin>TimeLine</Skin>
<Color Name="TimeBar" /> <Color Name="TimeBar" />
<Rect> <Rect>
<X>44</X> <X>50</X>
<Y>696</Y> <Y>696</Y>
<W>1090</W> <W>1090</W>
<H>9</H> <H>9</H>
@@ -100,7 +100,7 @@
<Skin>TimeLine</Skin> <Skin>TimeLine</Skin>
<Color Name="TimeBarSentence" /> <Color Name="TimeBarSentence" />
<Rect> <Rect>
<X>44</X> <X>50</X>
<Y>696</Y> <Y>696</Y>
<W>1090</W> <W>1090</W>
<H>9</H> <H>9</H>
@@ -1900,4 +1900,4 @@
<Playlists /> <Playlists />
<ParticleEffects /> <ParticleEffects />
<ScreenSettings /> <ScreenSettings />
</Screen> </Screen>
Vocaluxe/Screens/CScreenSing.cs
+4
View File
@@ -894,6 +894,10 @@ namespace Vocaluxe.Screens
_Statics[_StaticLyricsDuet].Alpha = 0f; _Statics[_StaticLyricsDuet].Alpha = 0f;
_Statics[_StaticLyricHelperDuet].Alpha = 0f; _Statics[_StaticLyricHelperDuet].Alpha = 0f;
_Statics[_StaticTimeLine].Visible = CConfig.Config.Theme.TimerLook == ETimerLook.TR_CONFIG_TIMERLOOK_NORMAL;
_Statics[_StaticTimeLineExpandedHighlighted].Visible = false;
_Statics[_StaticTimeLineExpandedNormal].Visible = false;
} }
private void _UpdateMedleyCountdown() private void _UpdateMedleyCountdown()
VocaluxeLib/Profile/CProfile.cs
+1 -2
View File
@@ -139,8 +139,7 @@ namespace VocaluxeLib.Profile
if (filename == "") if (filename == "")
filename = "1"; filename = "1";
FilePath = Path.Combine(CBase.Settings.GetDataPath(), CBase.Settings.GetFolderProfiles()); FilePath = CHelper.GetUniqueFileName(Path.Combine(CBase.Settings.GetDataPath(), CBase.Settings.GetFolderProfiles()), filename + ".xml");
FilePath = Path.Combine(FilePath, CHelper.GetUniqueFileName(FilePath, filename + ".xml", false));
} }
var xml = new CXmlSerializer(); var xml = new CXmlSerializer();