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

Merge branch 'develop' of git://github.com/flokuep/Vocaluxe into develop

Browse Source
This commit is contained in:
Alexander Eckart committed 2013-02-10 17:10:25 +01:00
2 parents f9d7de5f76 673ee5b41c
commit 748d9929b5
7 files changed
+41 -33
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeNames.cs
+1 -2
View File
@@ -296,8 +296,7 @@ namespace Vocaluxe.PartyModes
if (MouseEvent.RB) if (MouseEvent.RB)
{ {
if(!OnRemove()) Back();
Back();
} }
return true; return true;
Vocaluxe/Base/CConfig.cs
+5
View File
@@ -814,6 +814,11 @@ namespace Vocaluxe.Base
CSettings.CreateFolder(value); CSettings.CreateFolder(value);
CSettings.sFolderPlaylists = value; CSettings.sFolderPlaylists = value;
break; break;
case "profilefolder":
CSettings.CreateFolder(value);
CSettings.sFolderProfiles = value;
break;
} }
} }
} }
Vocaluxe/Base/CGraphics.cs
+6 -2
View File
@@ -533,9 +533,9 @@ namespace Vocaluxe.Base
if (PopupVolumeControlAllowed && CConfig.BackgroundMusic == EOffOn.TR_CONFIG_ON) if (PopupVolumeControlAllowed && CConfig.BackgroundMusic == EOffOn.TR_CONFIG_ON)
{ {
int Diff = 0; int Diff = 0;
if (KeyEvent.ModSHIFT && (KeyEvent.Key == Keys.Add || KeyEvent.Key == Keys.PageUp) || KeyEvent.Sender == ESender.WiiMote && KeyEvent.Key == Keys.Add) if ((KeyEvent.ModSHIFT && (KeyEvent.Key == Keys.Add || KeyEvent.Key == Keys.PageUp)) || (KeyEvent.Sender == ESender.WiiMote && KeyEvent.Key == Keys.Add))
Diff = 5; Diff = 5;
else if (KeyEvent.ModSHIFT && (KeyEvent.Key == Keys.Subtract || KeyEvent.Key == Keys.PageDown) || KeyEvent.Sender == ESender.WiiMote && KeyEvent.Key == Keys.Subtract) else if ((KeyEvent.ModSHIFT && (KeyEvent.Key == Keys.Subtract || KeyEvent.Key == Keys.PageDown)) || (KeyEvent.Sender == ESender.WiiMote && KeyEvent.Key == Keys.Subtract))
Diff = -5; Diff = -5;
else if (KeyEvent.Key == Keys.MediaNextTrack) else if (KeyEvent.Key == Keys.MediaNextTrack)
CMain.BackgroundMusic.Next(); CMain.BackgroundMusic.Next();
@@ -555,13 +555,17 @@ namespace Vocaluxe.Base
{ {
case EScreens.ScreenSong: case EScreens.ScreenSong:
if (CSongs.Category != -1) if (CSongs.Category != -1)
{
CConfig.PreviewMusicVolume += Diff; CConfig.PreviewMusicVolume += Diff;
_Screens[(int)_CurrentScreen].ApplyVolume();
}
else else
CConfig.BackgroundMusicVolume += Diff; CConfig.BackgroundMusicVolume += Diff;
break; break;
case EScreens.ScreenSing: case EScreens.ScreenSing:
CConfig.GameMusicVolume += Diff; CConfig.GameMusicVolume += Diff;
_Screens[(int)_CurrentScreen].ApplyVolume();
break; break;
default: default:
Vocaluxe/Base/CSettings.cs
+1 -1
View File
@@ -83,7 +83,7 @@ namespace Vocaluxe.Base
public const string sFolderSkins = "Skins"; public const string sFolderSkins = "Skins";
public const string sFolderThemeFonts = "Fonts"; public const string sFolderThemeFonts = "Fonts";
public const string sFolderScreens = "Screens"; public const string sFolderScreens = "Screens";
public const string sFolderProfiles = "Profiles"; public static string sFolderProfiles = "Profiles";
public const string sFolderSongs = "Songs"; public const string sFolderSongs = "Songs";
public const string sFolderSounds = "Sounds"; public const string sFolderSounds = "Sounds";
public const string sFolderLanguages = "Languages"; public const string sFolderLanguages = "Languages";
Vocaluxe/Screens/CPopupScreenVolumeControl.cs
+8 -7
View File
@@ -63,18 +63,18 @@ namespace Vocaluxe.Screens
else if (MouseEvent.Wheel > 0 && CHelper.IsInBounds(_ScreenArea, MouseEvent)) else if (MouseEvent.Wheel > 0 && CHelper.IsInBounds(_ScreenArea, MouseEvent))
{ {
if (SelectSlides[htSelectSlides(SelectSlideVolume)].Selection - MouseEvent.Wheel >= 0) if (SelectSlides[htSelectSlides(SelectSlideVolume)].Selection - MouseEvent.Wheel >= 0)
SelectSlides[htSelectSlides(SelectSlideVolume)].SetSelectionByValueIndex(SelectSlides[htSelectSlides(SelectSlideVolume)].Selection - MouseEvent.Wheel); SelectSlides[htSelectSlides(SelectSlideVolume)].Selection = SelectSlides[htSelectSlides(SelectSlideVolume)].Selection - MouseEvent.Wheel;
else if (SelectSlides[htSelectSlides(SelectSlideVolume)].Selection - MouseEvent.Wheel < 0) else if (SelectSlides[htSelectSlides(SelectSlideVolume)].Selection - MouseEvent.Wheel < 0)
SelectSlides[htSelectSlides(SelectSlideVolume)].SetSelectionByValueIndex(0); SelectSlides[htSelectSlides(SelectSlideVolume)].Selection = 0;
SaveConfig(); SaveConfig();
return true; return true;
} }
else if (MouseEvent.Wheel < 0 && CHelper.IsInBounds(_ScreenArea, MouseEvent)) else if (MouseEvent.Wheel < 0 && CHelper.IsInBounds(_ScreenArea, MouseEvent))
{ {
if (SelectSlides[htSelectSlides(SelectSlideVolume)].Selection - MouseEvent.Wheel < SelectSlides[htSelectSlides(SelectSlideVolume)].NumValues) if (SelectSlides[htSelectSlides(SelectSlideVolume)].Selection - MouseEvent.Wheel < SelectSlides[htSelectSlides(SelectSlideVolume)].NumValues)
SelectSlides[htSelectSlides(SelectSlideVolume)].SetSelectionByValueIndex(SelectSlides[htSelectSlides(SelectSlideVolume)].Selection - MouseEvent.Wheel); SelectSlides[htSelectSlides(SelectSlideVolume)].Selection = SelectSlides[htSelectSlides(SelectSlideVolume)].Selection - MouseEvent.Wheel;
else if (SelectSlides[htSelectSlides(SelectSlideVolume)].Selection - MouseEvent.Wheel >= SelectSlides[htSelectSlides(SelectSlideVolume)].NumValues) else if (SelectSlides[htSelectSlides(SelectSlideVolume)].Selection - MouseEvent.Wheel >= SelectSlides[htSelectSlides(SelectSlideVolume)].NumValues)
SelectSlides[htSelectSlides(SelectSlideVolume)].SetSelectionByValueIndex(SelectSlides[htSelectSlides(SelectSlideVolume)].NumValues - 1); SelectSlides[htSelectSlides(SelectSlideVolume)].Selection = SelectSlides[htSelectSlides(SelectSlideVolume)].NumValues - 1;
SaveConfig(); SaveConfig();
return true; return true;
} }
@@ -93,6 +93,7 @@ namespace Vocaluxe.Screens
public override bool UpdateGame() public override bool UpdateGame()
{ {
UpdateSlides();
return true; return true;
} }
@@ -132,15 +133,15 @@ namespace Vocaluxe.Screens
switch (CGraphics.CurrentScreen) switch (CGraphics.CurrentScreen)
{ {
case EScreens.ScreenSong: case EScreens.ScreenSong:
SelectSlides[htSelectSlides(SelectSlideVolume)].SetSelectionByValueIndex((int)CConfig.PreviewMusicVolume / 5); SelectSlides[htSelectSlides(SelectSlideVolume)].Selection = (int)(CConfig.PreviewMusicVolume / 5);
break; break;
case EScreens.ScreenSing: case EScreens.ScreenSing:
SelectSlides[htSelectSlides(SelectSlideVolume)].SetSelectionByValueIndex((int)CConfig.GameMusicVolume / 5); SelectSlides[htSelectSlides(SelectSlideVolume)].Selection = ((int)CConfig.GameMusicVolume / 5);
break; break;
default: default:
SelectSlides[htSelectSlides(SelectSlideVolume)].SetSelectionByValueIndex((int)CConfig.BackgroundMusicVolume / 5); SelectSlides[htSelectSlides(SelectSlideVolume)].Selection = ((int)CConfig.BackgroundMusicVolume / 5);
break; break;
} }
} }
Vocaluxe/Screens/CScreenNames.cs
+2 -2
View File
@@ -339,9 +339,9 @@ namespace Vocaluxe.Screens
if (CGame.GetNumSongs() == 1 && CGame.GetSong(1).IsDuet) if (CGame.GetNumSongs() == 1 && CGame.GetSong(1).IsDuet)
{ {
if (SelectSlides[htSelectSlides(SelectSlideDuetPlayer[selectingKeyboardPlayerNr - 1])].Selection == 0) if (SelectSlides[htSelectSlides(SelectSlideDuetPlayer[selectingKeyboardPlayerNr - 1])].Selection == 0)
SelectSlides[htSelectSlides(SelectSlideDuetPlayer[selectingKeyboardPlayerNr - 1])].SetSelectionByValueIndex(1); SelectSlides[htSelectSlides(SelectSlideDuetPlayer[selectingKeyboardPlayerNr - 1])].Selection = 1;
else else
SelectSlides[htSelectSlides(SelectSlideDuetPlayer[selectingKeyboardPlayerNr - 1])].SetSelectionByValueIndex(0); SelectSlides[htSelectSlides(SelectSlideDuetPlayer[selectingKeyboardPlayerNr - 1])].Selection = 0;
//Reset all values //Reset all values
selectingKeyboardPlayerNr = 0; selectingKeyboardPlayerNr = 0;
selectingKeyboardActive = false; selectingKeyboardActive = false;
VocaluxeLib/Menu/CNameSelection.cs
+18 -19
View File
@@ -360,7 +360,10 @@ namespace Vocaluxe.Menu
break; break;
} }
Selection = VisibleProfiles[_Offset * _Tiles.Count + _actualSelection]; if (_Offset * _Tiles.Count + _actualSelection < VisibleProfiles.Count)
Selection = VisibleProfiles[_Offset * _Tiles.Count + _actualSelection];
else
Selection = -1;
} }
public void KeyboardSelection(bool active, int player) public void KeyboardSelection(bool active, int player)
@@ -408,28 +411,24 @@ namespace Vocaluxe.Menu
if (offset < 0) if (offset < 0)
offset = 0; offset = 0;
if ( _Tiles.Count * (offset + 1) - VisibleProfiles.Count < _Tiles.Count) for (int i = 0; i < _Tiles.Count; i++)
{ {
if ((i + offset * _Tiles.Count) < VisibleProfiles.Count)
for (int i = 0; i < _Tiles.Count; i++)
{ {
if ((i + offset * _Tiles.Count) < VisibleProfiles.Count) _Tiles[i].Avatar.Texture = _Base.Profiles.GetProfiles()[VisibleProfiles[i + offset * _Tiles.Count]].Avatar.Texture;
{ _Tiles[i].Avatar.Color = new SColorF(1, 1, 1, 1);
_Tiles[i].Avatar.Texture = _Base.Profiles.GetProfiles()[VisibleProfiles[i + offset * _Tiles.Count]].Avatar.Texture; _Tiles[i].Name.Text = _Base.Profiles.GetProfiles()[VisibleProfiles[i + offset * _Tiles.Count]].PlayerName;
_Tiles[i].Avatar.Color = new SColorF(1, 1, 1, 1); _Tiles[i].PlayerNr = VisibleProfiles[i + offset * _Tiles.Count];
_Tiles[i].Name.Text = _Base.Profiles.GetProfiles()[VisibleProfiles[i + offset * _Tiles.Count]].PlayerName; }
_Tiles[i].PlayerNr = VisibleProfiles[i + offset * _Tiles.Count]; else
} {
else _Tiles[i].Avatar.Texture = _TextureEmptyTile;
{ _Tiles[i].Avatar.Color = ColorEmptyTile;
_Tiles[i].Avatar.Texture = _TextureEmptyTile; _Tiles[i].Name.Text = "";
_Tiles[i].Avatar.Color = ColorEmptyTile; _Tiles[i].PlayerNr = -1;
_Tiles[i].Name.Text = "";
_Tiles[i].PlayerNr = -1;
}
} }
_Offset = offset;
} }
_Offset = offset;
} }
public bool isOverTile(MouseEvent mevent) public bool isOverTile(MouseEvent mevent)