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

Removed unused method overrides

Browse Source 
renamed some parameter casings
This commit is contained in:
Flamefire committed 2013-03-22 22:16:51 +01:00
1 parent 36847b88ab
commit d047b12415
32 files changed
+349 -404
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

PartyModes/PartyModeChallenge/PartyScreenChallengeConfig.cs
+8 -13
View File
@@ -39,11 +39,6 @@ namespace VocaluxeLib.PartyModes.Challenge
Data.ScreenConfig = config;
}
public override void LoadTheme(string XmlPath)
{
base.LoadTheme(XmlPath);
}
public override void DataToScreen(object ReceivedData)
{
DataToScreenConfig config = new DataToScreenConfig();
@@ -61,14 +56,14 @@ namespace VocaluxeLib.PartyModes.Challenge
}
}
public override bool HandleInput(KeyEvent KeyEvent)
public override bool HandleInput(KeyEvent keyEvent)
{
base.HandleInput(KeyEvent);
base.HandleInput(keyEvent);
if (KeyEvent.KeyPressed) {}
if (keyEvent.KeyPressed) {}
else
{
switch (KeyEvent.Key)
switch (keyEvent.Key)
{
case Keys.Back:
case Keys.Escape:
@@ -97,11 +92,11 @@ namespace VocaluxeLib.PartyModes.Challenge
return true;
}
public override bool HandleMouse(MouseEvent MouseEvent)
public override bool HandleMouse(MouseEvent mouseEvent)
{
base.HandleMouse(MouseEvent);
base.HandleMouse(mouseEvent);
if (MouseEvent.LB && IsMouseOver(MouseEvent))
if (mouseEvent.LB && IsMouseOver(mouseEvent))
{
UpdateSlides();
if (Buttons[ButtonBack].Selected)
@@ -111,7 +106,7 @@ namespace VocaluxeLib.PartyModes.Challenge
Next();
}
if (MouseEvent.RB)
if (mouseEvent.RB)
Back();
return true;
PartyModes/PartyModeChallenge/PartyScreenChallengeMain.cs
+13 -13
View File
@@ -129,14 +129,14 @@ namespace VocaluxeLib.PartyModes.Challenge
}
}
public override bool HandleInput(KeyEvent KeyEvent)
public override bool HandleInput(KeyEvent keyEvent)
{
base.HandleInput(KeyEvent);
base.HandleInput(keyEvent);
if (KeyEvent.KeyPressed) {}
if (keyEvent.KeyPressed) {}
else
{
switch (KeyEvent.Key)
switch (keyEvent.Key)
{
case Keys.Back:
case Keys.Escape:
@@ -182,11 +182,11 @@ namespace VocaluxeLib.PartyModes.Challenge
return true;
}
public override bool HandleMouse(MouseEvent MouseEvent)
public override bool HandleMouse(MouseEvent mouseEvent)
{
base.HandleMouse(MouseEvent);
base.HandleMouse(mouseEvent);
if (MouseEvent.LB && IsMouseOver(MouseEvent))
if (mouseEvent.LB && IsMouseOver(mouseEvent))
{
if (!ExitPopupVisible)
{
@@ -214,7 +214,7 @@ namespace VocaluxeLib.PartyModes.Challenge
}
}
if (MouseEvent.RB)
if (mouseEvent.RB)
{
if (!ExitPopupVisible)
{
@@ -227,12 +227,12 @@ namespace VocaluxeLib.PartyModes.Challenge
ShowPopup(false);
}
if (MouseEvent.Wheel != 0)
if (mouseEvent.Wheel != 0)
{
if (CHelper.IsInBounds(RoundsTableScrollArea, MouseEvent))
ScrollRoundsTable(MouseEvent.Wheel);
if (CHelper.IsInBounds(PlayerTableScrollArea, MouseEvent))
ScrollPlayerTable(MouseEvent.Wheel);
if (CHelper.IsInBounds(RoundsTableScrollArea, mouseEvent))
ScrollRoundsTable(mouseEvent.Wheel);
if (CHelper.IsInBounds(PlayerTableScrollArea, mouseEvent))
ScrollPlayerTable(mouseEvent.Wheel);
}
return true;
PartyModes/PartyModeChallenge/PartyScreenChallengeNames.cs
+14 -19
View File
@@ -76,11 +76,6 @@ namespace VocaluxeLib.PartyModes.Challenge
Data.ScreenNames = names;
}
public override void LoadTheme(string XmlPath)
{
base.LoadTheme(XmlPath);
}
public override void DataToScreen(object ReceivedData)
{
DataToScreenNames config = new DataToScreenNames();
@@ -103,14 +98,14 @@ namespace VocaluxeLib.PartyModes.Challenge
}
}
public override bool HandleInput(KeyEvent KeyEvent)
public override bool HandleInput(KeyEvent keyEvent)
{
base.HandleInput(KeyEvent);
base.HandleInput(keyEvent);
if (KeyEvent.KeyPressed) {}
if (keyEvent.KeyPressed) {}
else
{
switch (KeyEvent.Key)
switch (keyEvent.Key)
{
case Keys.Back:
case Keys.Escape:
@@ -136,9 +131,9 @@ namespace VocaluxeLib.PartyModes.Challenge
return true;
}
public override bool HandleMouse(MouseEvent MouseEvent)
public override bool HandleMouse(MouseEvent mouseEvent)
{
base.HandleMouse(MouseEvent);
base.HandleMouse(mouseEvent);
/*
//Check if LeftButton is hold and Select-Mode inactive
@@ -169,13 +164,13 @@ namespace VocaluxeLib.PartyModes.Challenge
}*/
//Check if LeftButton is hold and Select-Mode active
if (MouseEvent.LBH && SelectingMouseActive)
if (mouseEvent.LBH && SelectingMouseActive)
{
//Update coords for Drag/Drop-Texture
chooseAvatarStatic.Rect.X += (MouseEvent.X - OldMouseX);
chooseAvatarStatic.Rect.Y += (MouseEvent.Y - OldMouseY);
OldMouseX = MouseEvent.X;
OldMouseY = MouseEvent.Y;
chooseAvatarStatic.Rect.X += (mouseEvent.X - OldMouseX);
chooseAvatarStatic.Rect.Y += (mouseEvent.Y - OldMouseY);
OldMouseX = mouseEvent.X;
OldMouseY = mouseEvent.Y;
}
// LeftButton isn't hold anymore, but Selec-Mode is still active -> "Drop" of Avatar
else if (SelectingMouseActive)
@@ -190,7 +185,7 @@ namespace VocaluxeLib.PartyModes.Challenge
if (PlayerDestinationButtons[i].Visible)
{
//Check if Mouse is in area
if (CHelper.IsInBounds(PlayerDestinationButtons[i].Rect, MouseEvent))
if (CHelper.IsInBounds(PlayerDestinationButtons[i].Rect, mouseEvent))
{
int added = -1;
//Add Player-ID to list.
@@ -223,7 +218,7 @@ namespace VocaluxeLib.PartyModes.Challenge
chooseAvatarStatic.Visible = false;
}
if (MouseEvent.LB && IsMouseOver(MouseEvent))
if (mouseEvent.LB && IsMouseOver(mouseEvent))
{
if (Buttons[ButtonBack].Selected)
Back();
@@ -235,7 +230,7 @@ namespace VocaluxeLib.PartyModes.Challenge
OnRemove();
}
if (MouseEvent.RB)
if (mouseEvent.RB)
Back();
return true;
PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyConfig.cs
+8 -13
View File
@@ -39,11 +39,6 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
Data.ScreenConfig = config;
}
public override void LoadTheme(string XmlPath)
{
base.LoadTheme(XmlPath);
}
public override void DataToScreen(object ReceivedData)
{
DataToScreenConfig config = new DataToScreenConfig();
@@ -61,14 +56,14 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
}
}
public override bool HandleInput(KeyEvent KeyEvent)
public override bool HandleInput(KeyEvent keyEvent)
{
base.HandleInput(KeyEvent);
base.HandleInput(keyEvent);
if (KeyEvent.KeyPressed) {}
if (keyEvent.KeyPressed) {}
else
{
switch (KeyEvent.Key)
switch (keyEvent.Key)
{
case Keys.Back:
case Keys.Escape:
@@ -97,11 +92,11 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
return true;
}
public override bool HandleMouse(MouseEvent MouseEvent)
public override bool HandleMouse(MouseEvent mouseEvent)
{
base.HandleMouse(MouseEvent);
base.HandleMouse(mouseEvent);
if (MouseEvent.LB && IsMouseOver(MouseEvent))
if (mouseEvent.LB && IsMouseOver(mouseEvent))
{
UpdateSlides();
if (Buttons[ButtonBack].Selected)
@@ -111,7 +106,7 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
Next();
}
if (MouseEvent.RB)
if (mouseEvent.RB)
Back();
return true;
PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyMain.cs
+13 -13
View File
@@ -129,14 +129,14 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
}
}
public override bool HandleInput(KeyEvent KeyEvent)
public override bool HandleInput(KeyEvent keyEvent)
{
base.HandleInput(KeyEvent);
base.HandleInput(keyEvent);
if (KeyEvent.KeyPressed) {}
if (keyEvent.KeyPressed) {}
else
{
switch (KeyEvent.Key)
switch (keyEvent.Key)
{
case Keys.Back:
case Keys.Escape:
@@ -182,11 +182,11 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
return true;
}
public override bool HandleMouse(MouseEvent MouseEvent)
public override bool HandleMouse(MouseEvent mouseEvent)
{
base.HandleMouse(MouseEvent);
base.HandleMouse(mouseEvent);
if (MouseEvent.LB && IsMouseOver(MouseEvent))
if (mouseEvent.LB && IsMouseOver(mouseEvent))
{
if (!ExitPopupVisible)
{
@@ -214,7 +214,7 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
}
}
if (MouseEvent.RB)
if (mouseEvent.RB)
{
if (!ExitPopupVisible)
{
@@ -227,12 +227,12 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
ShowPopup(false);
}
if (MouseEvent.Wheel != 0)
if (mouseEvent.Wheel != 0)
{
if (CHelper.IsInBounds(RoundsTableScrollArea, MouseEvent))
ScrollRoundsTable(MouseEvent.Wheel);
if (CHelper.IsInBounds(PlayerTableScrollArea, MouseEvent))
ScrollPlayerTable(MouseEvent.Wheel);
if (CHelper.IsInBounds(RoundsTableScrollArea, mouseEvent))
ScrollRoundsTable(mouseEvent.Wheel);
if (CHelper.IsInBounds(PlayerTableScrollArea, mouseEvent))
ScrollPlayerTable(mouseEvent.Wheel);
}
return true;
PartyModes/PartyModeChallengeMedley/PartyScreenChallengeMedleyNames.cs
+14 -19
View File
@@ -76,11 +76,6 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
Data.ScreenNames = names;
}
public override void LoadTheme(string XmlPath)
{
base.LoadTheme(XmlPath);
}
public override void DataToScreen(object ReceivedData)
{
DataToScreenNames config = new DataToScreenNames();
@@ -103,14 +98,14 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
}
}
public override bool HandleInput(KeyEvent KeyEvent)
public override bool HandleInput(KeyEvent keyEvent)
{
base.HandleInput(KeyEvent);
base.HandleInput(keyEvent);
if (KeyEvent.KeyPressed) {}
if (keyEvent.KeyPressed) {}
else
{
switch (KeyEvent.Key)
switch (keyEvent.Key)
{
case Keys.Back:
case Keys.Escape:
@@ -136,9 +131,9 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
return true;
}
public override bool HandleMouse(MouseEvent MouseEvent)
public override bool HandleMouse(MouseEvent mouseEvent)
{
base.HandleMouse(MouseEvent);
base.HandleMouse(mouseEvent);
/*
//Check if LeftButton is hold and Select-Mode inactive
@@ -169,13 +164,13 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
}*/
//Check if LeftButton is hold and Select-Mode active
if (MouseEvent.LBH && SelectingMouseActive)
if (mouseEvent.LBH && SelectingMouseActive)
{
//Update coords for Drag/Drop-Texture
chooseAvatarStatic.Rect.X += (MouseEvent.X - OldMouseX);
chooseAvatarStatic.Rect.Y += (MouseEvent.Y - OldMouseY);
OldMouseX = MouseEvent.X;
OldMouseY = MouseEvent.Y;
chooseAvatarStatic.Rect.X += (mouseEvent.X - OldMouseX);
chooseAvatarStatic.Rect.Y += (mouseEvent.Y - OldMouseY);
OldMouseX = mouseEvent.X;
OldMouseY = mouseEvent.Y;
}
// LeftButton isn't hold anymore, but Selec-Mode is still active -> "Drop" of Avatar
else if (SelectingMouseActive)
@@ -190,7 +185,7 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
if (PlayerDestinationButtons[i].Visible)
{
//Check if Mouse is in area
if (CHelper.IsInBounds(PlayerDestinationButtons[i].Rect, MouseEvent))
if (CHelper.IsInBounds(PlayerDestinationButtons[i].Rect, mouseEvent))
{
int added = -1;
//Add Player-ID to list.
@@ -223,7 +218,7 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
chooseAvatarStatic.Visible = false;
}
if (MouseEvent.LB && IsMouseOver(MouseEvent))
if (mouseEvent.LB && IsMouseOver(mouseEvent))
{
if (Buttons[ButtonBack].Selected)
Back();
@@ -235,7 +230,7 @@ namespace VocaluxeLib.PartyModes.ChallengeMedley
OnRemove();
}
if (MouseEvent.RB)
if (mouseEvent.RB)
Back();
return true;
PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeConfig.cs
+8 -13
View File
@@ -46,11 +46,6 @@ namespace VocaluxeLib.PartyModes.TicTacToe
Data.ScreenConfig = config;
}
public override void LoadTheme(string XmlPath)
{
base.LoadTheme(XmlPath);
}
public override void DataToScreen(object ReceivedData)
{
DataToScreenConfig config = new DataToScreenConfig();
@@ -72,14 +67,14 @@ namespace VocaluxeLib.PartyModes.TicTacToe
}
}
public override bool HandleInput(KeyEvent KeyEvent)
public override bool HandleInput(KeyEvent keyEvent)
{
base.HandleInput(KeyEvent);
base.HandleInput(keyEvent);
if (KeyEvent.KeyPressed) {}
if (keyEvent.KeyPressed) {}
else
{
switch (KeyEvent.Key)
switch (keyEvent.Key)
{
case Keys.Back:
case Keys.Escape:
@@ -108,11 +103,11 @@ namespace VocaluxeLib.PartyModes.TicTacToe
return true;
}
public override bool HandleMouse(MouseEvent MouseEvent)
public override bool HandleMouse(MouseEvent mouseEvent)
{
base.HandleMouse(MouseEvent);
base.HandleMouse(mouseEvent);
if (MouseEvent.LB && IsMouseOver(MouseEvent))
if (mouseEvent.LB && IsMouseOver(mouseEvent))
{
UpdateSlides();
if (Buttons[ButtonBack].Selected)
@@ -122,7 +117,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
Next();
}
if (MouseEvent.RB)
if (mouseEvent.RB)
Back();
return true;
PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeMain.cs
+9 -9
View File
@@ -120,14 +120,14 @@ namespace VocaluxeLib.PartyModes.TicTacToe
}
}
public override bool HandleInput(KeyEvent KeyEvent)
public override bool HandleInput(KeyEvent keyEvent)
{
base.HandleInput(KeyEvent);
base.HandleInput(keyEvent);
if (KeyEvent.KeyPressed) {}
if (keyEvent.KeyPressed) {}
else
{
switch (KeyEvent.Key)
switch (keyEvent.Key)
{
case Keys.Back:
case Keys.Escape:
@@ -201,11 +201,11 @@ namespace VocaluxeLib.PartyModes.TicTacToe
return true;
}
public override bool HandleMouse(MouseEvent MouseEvent)
public override bool HandleMouse(MouseEvent mouseEvent)
{
base.HandleMouse(MouseEvent);
base.HandleMouse(mouseEvent);
if (MouseEvent.LB && IsMouseOver(MouseEvent))
if (mouseEvent.LB && IsMouseOver(mouseEvent))
{
if (!ExitPopupVisible)
{
@@ -262,7 +262,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
}
}
if (MouseEvent.RB)
if (mouseEvent.RB)
{
if (!ExitPopupVisible)
{
@@ -277,7 +277,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
ShowPopup(false);
}
if (MouseEvent.Wheel != 0) {}
if (mouseEvent.Wheel != 0) {}
return true;
}
PartyModes/PartyModeTicTacToe/PartyScreenTicTacToeNames.cs
+18 -23
View File
@@ -81,11 +81,6 @@ namespace VocaluxeLib.PartyModes.TicTacToe
Data.ScreenNames = names;
}
public override void LoadTheme(string XmlPath)
{
base.LoadTheme(XmlPath);
}
public override void DataToScreen(object ReceivedData)
{
DataToScreenNames config = new DataToScreenNames();
@@ -114,14 +109,14 @@ namespace VocaluxeLib.PartyModes.TicTacToe
}
}
public override bool HandleInput(KeyEvent KeyEvent)
public override bool HandleInput(KeyEvent keyEvent)
{
base.HandleInput(KeyEvent);
base.HandleInput(keyEvent);
if (KeyEvent.KeyPressed) {}
if (keyEvent.KeyPressed) {}
else
{
switch (KeyEvent.Key)
switch (keyEvent.Key)
{
case Keys.Back:
case Keys.Escape:
@@ -153,16 +148,16 @@ namespace VocaluxeLib.PartyModes.TicTacToe
return true;
}
public override bool HandleMouse(MouseEvent MouseEvent)
public override bool HandleMouse(MouseEvent mouseEvent)
{
base.HandleMouse(MouseEvent);
base.HandleMouse(mouseEvent);
//Check if LeftButton is hold and Select-Mode inactive
if (MouseEvent.LBH && !SelectingMouseActive)
if (mouseEvent.LBH && !SelectingMouseActive)
{
//Save mouse-coords
OldMouseX = MouseEvent.X;
OldMouseY = MouseEvent.Y;
OldMouseX = mouseEvent.X;
OldMouseY = mouseEvent.Y;
//Check if mouse if over tile
for (int i = 0; i < PlayerChooseButtons.Count; i++)
{
@@ -186,13 +181,13 @@ namespace VocaluxeLib.PartyModes.TicTacToe
}
//Check if LeftButton is hold and Select-Mode active
if (MouseEvent.LBH && SelectingMouseActive)
if (mouseEvent.LBH && SelectingMouseActive)
{
//Update coords for Drag/Drop-Texture
chooseAvatarStatic.Rect.X += (MouseEvent.X - OldMouseX);
chooseAvatarStatic.Rect.Y += (MouseEvent.Y - OldMouseY);
OldMouseX = MouseEvent.X;
OldMouseY = MouseEvent.Y;
chooseAvatarStatic.Rect.X += (mouseEvent.X - OldMouseX);
chooseAvatarStatic.Rect.Y += (mouseEvent.Y - OldMouseY);
OldMouseX = mouseEvent.X;
OldMouseY = mouseEvent.Y;
return true;
}
@@ -209,7 +204,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
if (PlayerDestinationButtons[i].Visible)
{
//Check if Mouse is in area
if (CHelper.IsInBounds(PlayerDestinationButtons[i].Rect, MouseEvent))
if (CHelper.IsInBounds(PlayerDestinationButtons[i].Rect, mouseEvent))
{
int added = -1;
//Add Player-ID to list.
@@ -260,7 +255,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
return true;
}
if (MouseEvent.LB && IsMouseOver(MouseEvent))
if (mouseEvent.LB && IsMouseOver(mouseEvent))
{
if (Buttons[ButtonBack].Selected)
Back();
@@ -275,13 +270,13 @@ namespace VocaluxeLib.PartyModes.TicTacToe
Scroll(1);
}
if (MouseEvent.LD && IsMouseOver(MouseEvent))
if (mouseEvent.LD && IsMouseOver(mouseEvent))
{
if (!OnAdd())
OnRemove();
}
if (MouseEvent.RB)
if (mouseEvent.RB)
Back();
return true;
Vocaluxe/Screens/CPopupScreenPlayerControl.cs
+9 -9
View File
@@ -91,13 +91,13 @@ namespace Vocaluxe.Screens
_ScreenArea = Statics[StaticBG].Rect;
}
public override bool HandleInput(KeyEvent KeyEvent)
public override bool HandleInput(KeyEvent keyEvent)
{
base.HandleInput(KeyEvent);
if (KeyEvent.KeyPressed && !Char.IsControl(KeyEvent.Unicode)) {}
base.HandleInput(keyEvent);
if (keyEvent.KeyPressed && !Char.IsControl(keyEvent.Unicode)) {}
else
{
switch (KeyEvent.Key)
switch (keyEvent.Key)
{
case Keys.Escape:
case Keys.Back:
@@ -128,10 +128,10 @@ namespace Vocaluxe.Screens
return true;
}
public override bool HandleMouse(MouseEvent MouseEvent)
public override bool HandleMouse(MouseEvent mouseEvent)
{
base.HandleMouse(MouseEvent);
if (MouseEvent.LB && IsMouseOver(MouseEvent))
base.HandleMouse(mouseEvent);
if (mouseEvent.LB && IsMouseOver(mouseEvent))
{
if (Buttons[ButtonNext].Selected)
CBackgroundMusic.Next();
@@ -150,12 +150,12 @@ namespace Vocaluxe.Screens
if (Buttons[ButtonToBackgroundVideo].Selected)
VideoBackground = !VideoBackground;
}
else if (MouseEvent.LB)
else if (mouseEvent.LB)
{
//CGraphics.HidePopup(EPopupScreens.PopupPlayerControl);
return false;
}
else if (MouseEvent.RB)
else if (mouseEvent.RB)
{
//CGraphics.HidePopup(EPopupScreens.PopupPlayerControl);
return false;
Vocaluxe/Screens/CPopupScreenVolumeControl.cs
+13 -13
View File
@@ -32,39 +32,39 @@ namespace Vocaluxe.Screens
{"0", "5", "10", "15", "20", "25", "30", "35", "40", "45", "50", "55", "60", "65", "70", "75", "80", "85", "90", "95", "100"});
}
public override bool HandleInput(KeyEvent KeyEvent)
public override bool HandleInput(KeyEvent keyEvent)
{
UpdateSlides();
return true;
}
public override bool HandleMouse(MouseEvent MouseEvent)
public override bool HandleMouse(MouseEvent mouseEvent)
{
base.HandleMouse(MouseEvent);
if (MouseEvent.LB)
base.HandleMouse(mouseEvent);
if (mouseEvent.LB)
{
SaveConfig();
return true;
}
else if (MouseEvent.Wheel > 0 && CHelper.IsInBounds(_ScreenArea, MouseEvent))
else if (mouseEvent.Wheel > 0 && CHelper.IsInBounds(_ScreenArea, mouseEvent))
{
if (SelectSlides[SelectSlideVolume].Selection - MouseEvent.Wheel >= 0)
SelectSlides[SelectSlideVolume].Selection = SelectSlides[SelectSlideVolume].Selection - MouseEvent.Wheel;
else if (SelectSlides[SelectSlideVolume].Selection - MouseEvent.Wheel < 0)
if (SelectSlides[SelectSlideVolume].Selection - mouseEvent.Wheel >= 0)
SelectSlides[SelectSlideVolume].Selection = SelectSlides[SelectSlideVolume].Selection - mouseEvent.Wheel;
else if (SelectSlides[SelectSlideVolume].Selection - mouseEvent.Wheel < 0)
SelectSlides[SelectSlideVolume].Selection = 0;
SaveConfig();
return true;
}
else if (MouseEvent.Wheel < 0 && CHelper.IsInBounds(_ScreenArea, MouseEvent))
else if (mouseEvent.Wheel < 0 && CHelper.IsInBounds(_ScreenArea, mouseEvent))
{
if (SelectSlides[SelectSlideVolume].Selection - MouseEvent.Wheel < SelectSlides[SelectSlideVolume].NumValues)
SelectSlides[SelectSlideVolume].Selection = SelectSlides[SelectSlideVolume].Selection - MouseEvent.Wheel;
else if (SelectSlides[SelectSlideVolume].Selection - MouseEvent.Wheel >= SelectSlides[SelectSlideVolume].NumValues)
if (SelectSlides[SelectSlideVolume].Selection - mouseEvent.Wheel < SelectSlides[SelectSlideVolume].NumValues)
SelectSlides[SelectSlideVolume].Selection = SelectSlides[SelectSlideVolume].Selection - mouseEvent.Wheel;
else if (SelectSlides[SelectSlideVolume].Selection - mouseEvent.Wheel >= SelectSlides[SelectSlideVolume].NumValues)
SelectSlides[SelectSlideVolume].Selection = SelectSlides[SelectSlideVolume].NumValues - 1;
SaveConfig();
return true;
}
else if (MouseEvent.RB)
else if (mouseEvent.RB)
return false;
return true;
}
Vocaluxe/Screens/CScreenCredits.cs
+5 -5
View File
@@ -226,11 +226,11 @@ namespace Vocaluxe.Screens
public override void ReloadTextures() {}
public override bool HandleInput(KeyEvent KeyEvent)
public override bool HandleInput(KeyEvent keyEvent)
{
if (!KeyEvent.KeyPressed || Char.IsControl(KeyEvent.Unicode))
if (!keyEvent.KeyPressed || Char.IsControl(keyEvent.Unicode))
{
switch (KeyEvent.Key)
switch (keyEvent.Key)
{
case Keys.Escape:
case Keys.Back:
@@ -243,9 +243,9 @@ namespace Vocaluxe.Screens
return true;
}
public override bool HandleMouse(MouseEvent MouseEvent)
public override bool HandleMouse(MouseEvent mouseEvent)
{
if (MouseEvent.LB || MouseEvent.RB)
if (mouseEvent.LB || mouseEvent.RB)
CGraphics.FadeTo(EScreens.ScreenMain);
return true;
}
Vocaluxe/Screens/CScreenHighscore.cs
+9 -14
View File
@@ -76,12 +76,12 @@ namespace Vocaluxe.Screens
_NewEntryIDs = new List<int>();
}
public override bool HandleInput(KeyEvent KeyEvent)
public override bool HandleInput(KeyEvent keyEvent)
{
if (KeyEvent.KeyPressed && !Char.IsControl(KeyEvent.Unicode)) {}
if (keyEvent.KeyPressed && !Char.IsControl(keyEvent.Unicode)) {}
else
{
switch (KeyEvent.Key)
switch (keyEvent.Key)
{
case Keys.Escape:
case Keys.Back:
@@ -110,17 +110,17 @@ namespace Vocaluxe.Screens
return true;
}
public override bool HandleMouse(MouseEvent MouseEvent)
public override bool HandleMouse(MouseEvent mouseEvent)
{
if (MouseEvent.LB && IsMouseOver(MouseEvent)) {}
if (mouseEvent.LB && IsMouseOver(mouseEvent)) {}
if (MouseEvent.LB)
if (mouseEvent.LB)
LeaveScreen();
if (MouseEvent.RB)
if (mouseEvent.RB)
LeaveScreen();
if (MouseEvent.MB)
if (mouseEvent.MB)
{
int LastRound = _Round;
ChangeRound(1);
@@ -131,7 +131,7 @@ namespace Vocaluxe.Screens
}
}
ChangePos(MouseEvent.Wheel);
ChangePos(mouseEvent.Wheel);
return true;
}
@@ -191,11 +191,6 @@ namespace Vocaluxe.Screens
UpdateGame();
}
public override bool Draw()
{
return base.Draw();
}
private bool isNewEntry(int id)
{
for (int i = 0; i < _NewEntryIDs.Count; i++)
Vocaluxe/Screens/CScreenLoad.cs
+7 -7
View File
@@ -39,14 +39,14 @@ namespace Vocaluxe.Screens
_timer = new Stopwatch();
}
public override bool HandleInput(KeyEvent KeyEvent)
public override bool HandleInput(KeyEvent keyEvent)
{
base.HandleInput(KeyEvent);
base.HandleInput(keyEvent);
if (KeyEvent.KeyPressed) {}
if (keyEvent.KeyPressed) {}
else
{
switch (KeyEvent.Key)
switch (keyEvent.Key)
{
case Keys.Enter:
case Keys.Escape:
@@ -59,11 +59,11 @@ namespace Vocaluxe.Screens
return true;
}
public override bool HandleMouse(MouseEvent MouseEvent)
public override bool HandleMouse(MouseEvent mouseEvent)
{
base.HandleMouse(MouseEvent);
base.HandleMouse(mouseEvent);
if (MouseEvent.LB || MouseEvent.RB)
if (mouseEvent.LB || mouseEvent.RB)
_SkipIntro = true;
return true;
Vocaluxe/Screens/CScreenMain.cs
+7 -12
View File
@@ -28,19 +28,14 @@ namespace Vocaluxe.Screens
_ThemeButtons = new[] {ButtonSing, ButtonParty, ButtonOptions, ButtonProfiles, ButtonExit};
}
public override void LoadTheme(string XmlPath)
public override bool HandleInput(KeyEvent keyEvent)
{
base.LoadTheme(XmlPath);
}
base.HandleInput(keyEvent);
public override bool HandleInput(KeyEvent KeyEvent)
{
base.HandleInput(KeyEvent);
if (KeyEvent.KeyPressed) {}
if (keyEvent.KeyPressed) {}
else
{
switch (KeyEvent.Key)
switch (keyEvent.Key)
{
case Keys.O:
CGraphics.FadeTo(EScreens.ScreenOptions);
@@ -83,11 +78,11 @@ namespace Vocaluxe.Screens
return true;
}
public override bool HandleMouse(MouseEvent MouseEvent)
public override bool HandleMouse(MouseEvent mouseEvent)
{
base.HandleMouse(MouseEvent);
base.HandleMouse(mouseEvent);
if (MouseEvent.LB && IsMouseOver(MouseEvent))
if (mouseEvent.LB && IsMouseOver(mouseEvent))
{
if (Buttons[ButtonSing].Selected)
{
Vocaluxe/Screens/CScreenNames.cs
+27 -27
View File
@@ -101,9 +101,9 @@ namespace Vocaluxe.Screens
Equalizers["EqualizerPlayer" + i].ScreenHandles = true;
}
public override bool HandleInput(KeyEvent KeyEvent)
public override bool HandleInput(KeyEvent keyEvent)
{
switch (KeyEvent.Key)
switch (keyEvent.Key)
{
case Keys.Add:
if (CConfig.NumPlayer + 1 <= CSettings.MaxNumPlayer)
@@ -145,8 +145,8 @@ namespace Vocaluxe.Screens
if (selectingKeyboardActive)
{
//Handle left/right/up/down
NameSelections[NameSelection].HandleInput(KeyEvent);
switch (KeyEvent.Key)
NameSelections[NameSelection].HandleInput(keyEvent);
switch (keyEvent.Key)
{
case Keys.Enter:
//Check, if a player is selected
@@ -340,9 +340,9 @@ namespace Vocaluxe.Screens
//Normal Keyboard handling
else
{
base.HandleInput(KeyEvent);
base.HandleInput(keyEvent);
bool processed = false;
switch (KeyEvent.Key)
switch (keyEvent.Key)
{
case Keys.Escape:
case Keys.Back:
@@ -409,28 +409,28 @@ namespace Vocaluxe.Screens
return true;
}
public override bool HandleMouse(MouseEvent MouseEvent)
public override bool HandleMouse(MouseEvent mouseEvent)
{
base.HandleMouse(MouseEvent);
base.HandleMouse(mouseEvent);
//Check if LeftButton is hold and Select-Mode inactive
if (MouseEvent.LBH && !selectingMouseActive)
if (mouseEvent.LBH && !selectingMouseActive)
{
//Save mouse-coords
OldMouseX = MouseEvent.X;
OldMouseY = MouseEvent.Y;
OldMouseX = mouseEvent.X;
OldMouseY = mouseEvent.Y;
//Check if mouse if over tile
if (NameSelections[NameSelection].isOverTile(MouseEvent))
if (NameSelections[NameSelection].isOverTile(mouseEvent))
{
//Get player-number of tile
SelectedPlayerNr = NameSelections[NameSelection].TilePlayerNr(MouseEvent);
SelectedPlayerNr = NameSelections[NameSelection].TilePlayerNr(mouseEvent);
if (SelectedPlayerNr != -1)
{
//Activate mouse-selecting
selectingMouseActive = true;
//Update of Drag/Drop-Texture
CStatic SelectedPlayer = NameSelections[NameSelection].TilePlayerAvatar(MouseEvent);
CStatic SelectedPlayer = NameSelections[NameSelection].TilePlayerAvatar(mouseEvent);
chooseAvatarStatic.Visible = true;
chooseAvatarStatic.Rect = SelectedPlayer.Rect;
chooseAvatarStatic.Rect.Z = CSettings.zNear;
@@ -441,13 +441,13 @@ namespace Vocaluxe.Screens
}
//Check if LeftButton is hold and Select-Mode active
if (MouseEvent.LBH && selectingMouseActive)
if (mouseEvent.LBH && selectingMouseActive)
{
//Update coords for Drag/Drop-Texture
chooseAvatarStatic.Rect.X += (MouseEvent.X - OldMouseX);
chooseAvatarStatic.Rect.Y += (MouseEvent.Y - OldMouseY);
OldMouseX = MouseEvent.X;
OldMouseY = MouseEvent.Y;
chooseAvatarStatic.Rect.X += (mouseEvent.X - OldMouseX);
chooseAvatarStatic.Rect.Y += (mouseEvent.Y - OldMouseY);
OldMouseX = mouseEvent.X;
OldMouseY = mouseEvent.Y;
}
// LeftButton isn't hold anymore, but Selec-Mode is still active -> "Drop" of Avatar
else if (selectingMouseActive)
@@ -462,7 +462,7 @@ namespace Vocaluxe.Screens
if (Statics[StaticPlayer[i]].Visible)
{
//Check if Mouse is in area
if (CHelper.IsInBounds(Statics[StaticPlayer[i]].Rect, MouseEvent))
if (CHelper.IsInBounds(Statics[StaticPlayer[i]].Rect, mouseEvent))
{
//Update Game-infos with new player
CGame.Player[i].Name = CProfiles.Profiles[SelectedPlayerNr].PlayerName;
@@ -488,9 +488,9 @@ namespace Vocaluxe.Screens
chooseAvatarStatic.Visible = false;
}
if (MouseEvent.LB && IsMouseOver(MouseEvent)) {}
if (mouseEvent.LB && IsMouseOver(mouseEvent)) {}
if (MouseEvent.LB && IsMouseOver(MouseEvent))
if (mouseEvent.LB && IsMouseOver(mouseEvent))
{
bool processed = false;
@@ -512,13 +512,13 @@ namespace Vocaluxe.Screens
NameSelections[NameSelection].UpdateList();
}
if (MouseEvent.RB)
if (mouseEvent.RB)
{
bool exit = true;
//Remove profile-selection
for (int i = 0; i < CConfig.NumPlayer; i++)
{
if (CHelper.IsInBounds(Statics[StaticPlayer[i]].Rect, MouseEvent))
if (CHelper.IsInBounds(Statics[StaticPlayer[i]].Rect, mouseEvent))
{
CGame.Player[i].ProfileID = -1;
CGame.Player[i].Name = String.Empty;
@@ -541,11 +541,11 @@ namespace Vocaluxe.Screens
}
//Check mouse-wheel for scrolling
if (MouseEvent.Wheel != 0)
if (mouseEvent.Wheel != 0)
{
if (CHelper.IsInBounds(NameSelections[NameSelection].Rect, MouseEvent))
if (CHelper.IsInBounds(NameSelections[NameSelection].Rect, mouseEvent))
{
int offset = NameSelections[NameSelection]._Offset + MouseEvent.Wheel;
int offset = NameSelections[NameSelection]._Offset + mouseEvent.Wheel;
NameSelections[NameSelection].UpdateList(offset);
}
}
Vocaluxe/Screens/CScreenOptions.cs
+8 -8
View File
@@ -26,14 +26,14 @@ namespace Vocaluxe.Screens
_ThemeButtons = new[] {ButtonOptionsGame, ButtonOptionsSound, ButtonOptionsRecord, ButtonOptionsVideo, ButtonOptionsLyrics, ButtonOptionsTheme};
}
public override bool HandleInput(KeyEvent KeyEvent)
public override bool HandleInput(KeyEvent keyEvent)
{
base.HandleInput(KeyEvent);
base.HandleInput(keyEvent);
if (KeyEvent.KeyPressed) {}
if (keyEvent.KeyPressed) {}
else
{
switch (KeyEvent.Key)
switch (keyEvent.Key)
{
case Keys.Escape:
case Keys.Back:
@@ -70,11 +70,11 @@ namespace Vocaluxe.Screens
return true;
}
public override bool HandleMouse(MouseEvent MouseEvent)
public override bool HandleMouse(MouseEvent mouseEvent)
{
base.HandleMouse(MouseEvent);
base.HandleMouse(mouseEvent);
if (MouseEvent.LB && IsMouseOver(MouseEvent))
if (mouseEvent.LB && IsMouseOver(mouseEvent))
{
if (Buttons[ButtonOptionsGame].Selected)
CGraphics.FadeTo(EScreens.ScreenOptionsGame);
@@ -95,7 +95,7 @@ namespace Vocaluxe.Screens
CGraphics.FadeTo(EScreens.ScreenOptionsTheme);
}
if (MouseEvent.RB)
if (mouseEvent.RB)
CGraphics.FadeTo(EScreens.ScreenMain);
return true;
}
Vocaluxe/Screens/CScreenOptionsGame.cs
+8 -8
View File
@@ -43,13 +43,13 @@ namespace Vocaluxe.Screens
SelectSlides[SelectSlideTimerMode].SetValues<ETimerMode>((int)CConfig.TimerMode);
}
public override bool HandleInput(KeyEvent KeyEvent)
public override bool HandleInput(KeyEvent keyEvent)
{
base.HandleInput(KeyEvent);
base.HandleInput(keyEvent);
if (!KeyEvent.KeyPressed)
if (!keyEvent.KeyPressed)
{
switch (KeyEvent.Key)
switch (keyEvent.Key)
{
case Keys.Escape:
case Keys.Back:
@@ -82,17 +82,17 @@ namespace Vocaluxe.Screens
return true;
}
public override bool HandleMouse(MouseEvent MouseEvent)
public override bool HandleMouse(MouseEvent mouseEvent)
{
base.HandleMouse(MouseEvent);
base.HandleMouse(mouseEvent);
if (MouseEvent.RB)
if (mouseEvent.RB)
{
SaveConfig();
CGraphics.FadeTo(EScreens.ScreenOptions);
}
if (MouseEvent.LB && IsMouseOver(MouseEvent))
if (mouseEvent.LB && IsMouseOver(mouseEvent))
{
SaveConfig();
if (Buttons[ButtonExit].Selected)
Vocaluxe/Screens/CScreenOptionsLyrics.cs
+8 -8
View File
@@ -32,14 +32,14 @@ namespace Vocaluxe.Screens
SelectSlides[SelectSlideLyricsOnTop].SetValues<EOffOn>((int)CConfig.LyricsOnTop);
}
public override bool HandleInput(KeyEvent KeyEvent)
public override bool HandleInput(KeyEvent keyEvent)
{
base.HandleInput(KeyEvent);
base.HandleInput(keyEvent);
if (KeyEvent.KeyPressed) {}
if (keyEvent.KeyPressed) {}
else
{
switch (KeyEvent.Key)
switch (keyEvent.Key)
{
case Keys.Escape:
case Keys.Back:
@@ -72,16 +72,16 @@ namespace Vocaluxe.Screens
return true;
}
public override bool HandleMouse(MouseEvent MouseEvent)
public override bool HandleMouse(MouseEvent mouseEvent)
{
base.HandleMouse(MouseEvent);
base.HandleMouse(mouseEvent);
if (MouseEvent.RB)
if (mouseEvent.RB)
{
SaveConfig();
CGraphics.FadeTo(EScreens.ScreenOptions);
}
if (MouseEvent.LB && IsMouseOver(MouseEvent))
if (mouseEvent.LB && IsMouseOver(mouseEvent))
{
SaveConfig();
if (Buttons[ButtonExit].Selected)
Vocaluxe/Screens/CScreenOptionsRecord.cs
+8 -8
View File
@@ -102,14 +102,14 @@ namespace Vocaluxe.Screens
Equalizers[EqualizerChannel2].ScreenHandles = true;
}
public override bool HandleInput(KeyEvent KeyEvent)
public override bool HandleInput(KeyEvent keyEvent)
{
base.HandleInput(KeyEvent);
base.HandleInput(keyEvent);
if (KeyEvent.KeyPressed) {}
if (keyEvent.KeyPressed) {}
else
{
switch (KeyEvent.Key)
switch (keyEvent.Key)
{
case Keys.Escape:
case Keys.Back:
@@ -172,17 +172,17 @@ namespace Vocaluxe.Screens
return true;
}
public override bool HandleMouse(MouseEvent MouseEvent)
public override bool HandleMouse(MouseEvent mouseEvent)
{
base.HandleMouse(MouseEvent);
base.HandleMouse(mouseEvent);
if (MouseEvent.RB)
if (mouseEvent.RB)
{
SaveMicConfig();
CGraphics.FadeTo(EScreens.ScreenOptions);
}
if (MouseEvent.LB && IsMouseOver(MouseEvent))
if (mouseEvent.LB && IsMouseOver(mouseEvent))
{
if (SelectSlides[SelectSlideRecordDevices].Selected)
OnDeviceEvent();
Vocaluxe/Screens/CScreenOptionsSound.cs
+8 -8
View File
@@ -49,14 +49,14 @@ namespace Vocaluxe.Screens
SelectSlides[SelectSlideGameMusicVolume].Selection = CConfig.GameMusicVolume / 5;
}
public override bool HandleInput(KeyEvent KeyEvent)
public override bool HandleInput(KeyEvent keyEvent)
{
base.HandleInput(KeyEvent);
base.HandleInput(keyEvent);
if (KeyEvent.KeyPressed) {}
if (keyEvent.KeyPressed) {}
else
{
switch (KeyEvent.Key)
switch (keyEvent.Key)
{
case Keys.Escape:
case Keys.Back:
@@ -89,16 +89,16 @@ namespace Vocaluxe.Screens
return true;
}
public override bool HandleMouse(MouseEvent MouseEvent)
public override bool HandleMouse(MouseEvent mouseEvent)
{
base.HandleMouse(MouseEvent);
base.HandleMouse(mouseEvent);
if (MouseEvent.RB)
if (mouseEvent.RB)
{
SaveConfig();
CGraphics.FadeTo(EScreens.ScreenOptions);
}
if (MouseEvent.LB && IsMouseOver(MouseEvent))
if (mouseEvent.LB && IsMouseOver(mouseEvent))
{
SaveConfig();
if (Buttons[ButtonExit].Selected)
Vocaluxe/Screens/CScreenOptionsTheme.cs
+8 -8
View File
@@ -67,14 +67,14 @@ namespace Vocaluxe.Screens
SelectSlides[SelectSlideCoverLoading].SetValues<ECoverLoading>((int)CConfig.CoverLoading);
}
public override bool HandleInput(KeyEvent KeyEvent)
public override bool HandleInput(KeyEvent keyEvent)
{
base.HandleInput(KeyEvent);
base.HandleInput(keyEvent);
if (KeyEvent.KeyPressed) {}
if (keyEvent.KeyPressed) {}
else
{
switch (KeyEvent.Key)
switch (keyEvent.Key)
{
case Keys.Escape:
case Keys.Back:
@@ -103,14 +103,14 @@ namespace Vocaluxe.Screens
return true;
}
public override bool HandleMouse(MouseEvent MouseEvent)
public override bool HandleMouse(MouseEvent mouseEvent)
{
base.HandleMouse(MouseEvent);
base.HandleMouse(mouseEvent);
if (MouseEvent.RB)
if (mouseEvent.RB)
Close();
if (MouseEvent.LB && IsMouseOver(MouseEvent))
if (mouseEvent.LB && IsMouseOver(mouseEvent))
{
if (Buttons[ButtonExit].Selected)
Close();
Vocaluxe/Screens/CScreenOptionsVideo.cs
+8 -8
View File
@@ -53,14 +53,14 @@ namespace Vocaluxe.Screens
SelectSlides[SelectSlideVideosToBackground].SetValues<EOffOn>((int)CConfig.VideosToBackground);
}
public override bool HandleInput(KeyEvent KeyEvent)
public override bool HandleInput(KeyEvent keyEvent)
{
base.HandleInput(KeyEvent);
base.HandleInput(keyEvent);
if (KeyEvent.KeyPressed) {}
if (keyEvent.KeyPressed) {}
else
{
switch (KeyEvent.Key)
switch (keyEvent.Key)
{
case Keys.Escape:
case Keys.Back:
@@ -101,17 +101,17 @@ namespace Vocaluxe.Screens
return true;
}
public override bool HandleMouse(MouseEvent MouseEvent)
public override bool HandleMouse(MouseEvent mouseEvent)
{
base.HandleMouse(MouseEvent);
base.HandleMouse(mouseEvent);
if (MouseEvent.RB)
if (mouseEvent.RB)
{
SaveConfig();
CGraphics.FadeTo(EScreens.ScreenOptions);
}
if (MouseEvent.LB && IsMouseOver(MouseEvent))
if (mouseEvent.LB && IsMouseOver(mouseEvent))
{
if (SelectSlides[SelectSlideWebcamDevices].Selected)
OnDeviceEvent();
Vocaluxe/Screens/CScreenParty.cs
+8 -13
View File
@@ -35,19 +35,14 @@ namespace Vocaluxe.Screens
_ThemeSelectSlides = new[] {SelectSlideModes};
}
public override void LoadTheme(string XmlPath)
public override bool HandleInput(KeyEvent keyEvent)
{
base.LoadTheme(XmlPath);
}
base.HandleInput(keyEvent);
public override bool HandleInput(KeyEvent KeyEvent)
{
base.HandleInput(KeyEvent);
if (KeyEvent.KeyPressed) {}
if (keyEvent.KeyPressed) {}
else
{
switch (KeyEvent.Key)
switch (keyEvent.Key)
{
case Keys.Back:
case Keys.Escape:
@@ -72,11 +67,11 @@ namespace Vocaluxe.Screens
return true;
}
public override bool HandleMouse(MouseEvent MouseEvent)
public override bool HandleMouse(MouseEvent mouseEvent)
{
base.HandleMouse(MouseEvent);
base.HandleMouse(mouseEvent);
if (MouseEvent.LB && IsMouseOver(MouseEvent))
if (mouseEvent.LB && IsMouseOver(mouseEvent))
{
if (Buttons[ButtonStart].Selected)
StartPartyMode();
@@ -88,7 +83,7 @@ namespace Vocaluxe.Screens
UpdateSelection();
}
if (MouseEvent.RB)
if (mouseEvent.RB)
CGraphics.FadeTo(EScreens.ScreenMain);
return true;
Vocaluxe/Screens/CScreenProfiles.cs
+9 -14
View File
@@ -71,12 +71,12 @@ namespace Vocaluxe.Screens
SelectSlides[SelectSlideActive].SetValues<EOffOn>(0);
}
public override bool HandleInput(KeyEvent KeyEvent)
public override bool HandleInput(KeyEvent keyEvent)
{
if (_EditMode == EEditMode.None)
base.HandleInput(KeyEvent);
base.HandleInput(keyEvent);
if (KeyEvent.KeyPressed && !Char.IsControl(KeyEvent.Unicode))
if (keyEvent.KeyPressed && !Char.IsControl(keyEvent.Unicode))
{
switch (_EditMode)
{
@@ -84,13 +84,13 @@ namespace Vocaluxe.Screens
break;
case EEditMode.PlayerName:
SelectSlides[SelectSlideProfiles].RenameValue(
CProfiles.AddGetPlayerName(SelectSlides[SelectSlideProfiles].Selection, KeyEvent.Unicode));
CProfiles.AddGetPlayerName(SelectSlides[SelectSlideProfiles].Selection, keyEvent.Unicode));
break;
}
}
else
{
switch (KeyEvent.Key)
switch (keyEvent.Key)
{
case Keys.Escape:
CGraphics.FadeTo(EScreens.ScreenMain);
@@ -161,12 +161,12 @@ namespace Vocaluxe.Screens
return true;
}
public override bool HandleMouse(MouseEvent MouseEvent)
public override bool HandleMouse(MouseEvent mouseEvent)
{
if (_EditMode == EEditMode.None)
base.HandleMouse(MouseEvent);
base.HandleMouse(mouseEvent);
if (MouseEvent.LB && IsMouseOver(MouseEvent))
if (mouseEvent.LB && IsMouseOver(mouseEvent))
{
if (Buttons[ButtonExit].Selected)
CGraphics.FadeTo(EScreens.ScreenMain);
@@ -215,7 +215,7 @@ namespace Vocaluxe.Screens
OnTakeSnapshot();
}
if (MouseEvent.RB)
if (mouseEvent.RB)
CGraphics.FadeTo(EScreens.ScreenMain);
return true;
}
@@ -327,11 +327,6 @@ namespace Vocaluxe.Screens
OnDiscardSnapshot();
}
public override bool Draw()
{
return base.Draw();
}
private void SaveProfiles()
{
_EditMode = EEditMode.None;
Vocaluxe/Screens/CScreenScore.cs
+9 -9
View File
@@ -56,12 +56,12 @@ namespace Vocaluxe.Screens
StaticPointsBarDrawnPoints = new double[CSettings.MaxNumPlayer];
}
public override bool HandleInput(KeyEvent KeyEvent)
public override bool HandleInput(KeyEvent keyEvent)
{
if (KeyEvent.KeyPressed) {}
if (keyEvent.KeyPressed) {}
else
{
switch (KeyEvent.Key)
switch (keyEvent.Key)
{
case Keys.Escape:
case Keys.Back:
@@ -81,17 +81,17 @@ namespace Vocaluxe.Screens
return true;
}
public override bool HandleMouse(MouseEvent MouseEvent)
public override bool HandleMouse(MouseEvent mouseEvent)
{
base.HandleMouse(MouseEvent);
base.HandleMouse(mouseEvent);
if (MouseEvent.Wheel != 0)
ChangeRound(MouseEvent.Wheel);
if (mouseEvent.Wheel != 0)
ChangeRound(mouseEvent.Wheel);
if (MouseEvent.LB)
if (mouseEvent.LB)
LeaveScreen();
if (MouseEvent.RB)
if (mouseEvent.RB)
LeaveScreen();
return true;
Vocaluxe/Screens/CScreenSing.cs
+11 -11
View File
@@ -157,17 +157,17 @@ namespace Vocaluxe.Screens
Buttons[ButtonContinue].Visible = false;
}
public override bool HandleInput(KeyEvent KeyEvent)
public override bool HandleInput(KeyEvent keyEvent)
{
base.HandleInput(KeyEvent);
base.HandleInput(keyEvent);
if (KeyEvent.KeyPressed)
if (keyEvent.KeyPressed)
{
//
}
else
{
switch (KeyEvent.Key)
switch (keyEvent.Key)
{
case Keys.Escape:
TogglePause();
@@ -206,7 +206,7 @@ namespace Vocaluxe.Screens
case Keys.S:
if (CGame.NumRounds > CGame.RoundNr)
{
if (KeyEvent.ModCTRL)
if (keyEvent.ModCTRL)
LoadNextSong();
}
break;
@@ -234,7 +234,7 @@ namespace Vocaluxe.Screens
case Keys.Add:
case Keys.PageUp:
if (KeyEvent.ModSHIFT)
if (keyEvent.ModSHIFT)
{
CConfig.GameMusicVolume = CConfig.GameMusicVolume + 5;
if (CConfig.GameMusicVolume > 100)
@@ -246,7 +246,7 @@ namespace Vocaluxe.Screens
case Keys.Subtract:
case Keys.PageDown:
if (KeyEvent.ModSHIFT)
if (keyEvent.ModSHIFT)
{
CConfig.GameMusicVolume = CConfig.GameMusicVolume - 5;
if (CConfig.GameMusicVolume < 0)
@@ -261,18 +261,18 @@ namespace Vocaluxe.Screens
return true;
}
public override bool HandleMouse(MouseEvent MouseEvent)
public override bool HandleMouse(MouseEvent mouseEvent)
{
base.HandleMouse(MouseEvent);
base.HandleMouse(mouseEvent);
if (MouseEvent.RB)
if (mouseEvent.RB)
{
TogglePause();
if (_Pause)
SetInteractionToButton(Buttons[ButtonContinue]);
}
if (MouseEvent.LB && IsMouseOver(MouseEvent) && _Pause)
if (mouseEvent.LB && IsMouseOver(mouseEvent) && _Pause)
{
if (Buttons[ButtonContinue].Selected && _Pause)
TogglePause();
Vocaluxe/Screens/CScreenSong.cs
+36 -36
View File
@@ -132,39 +132,39 @@ namespace Vocaluxe.Screens
ApplyVolume();
}
public override bool HandleInput(KeyEvent KeyEvent)
public override bool HandleInput(KeyEvent keyEvent)
{
base.HandleInput(KeyEvent);
if (KeyEvent.Handled)
base.HandleInput(keyEvent);
if (keyEvent.Handled)
return true;
if (_PlaylistActive)
{
Playlists[Playlist].HandleInput(KeyEvent);
Playlists[Playlist].HandleInput(keyEvent);
return true;
}
if (!_SongOptionsActive)
{
if (KeyEvent.KeyPressed && !Char.IsControl(KeyEvent.Unicode) && KeyEvent.Mod != EModifier.Ctrl)
if (keyEvent.KeyPressed && !Char.IsControl(keyEvent.Unicode) && keyEvent.Mod != EModifier.Ctrl)
{
if (_SearchActive)
ApplyNewSearchFilter(_SearchText + KeyEvent.Unicode);
ApplyNewSearchFilter(_SearchText + keyEvent.Unicode);
else
{
JumpTo(KeyEvent.Unicode);
JumpTo(keyEvent.Unicode);
return true;
}
}
else
{
SongMenus[SongMenu].HandleInput(ref KeyEvent, _sso);
SongMenus[SongMenu].HandleInput(ref keyEvent, _sso);
UpdatePartyModeOptions();
if (KeyEvent.Handled)
if (keyEvent.Handled)
return true;
switch (KeyEvent.Key)
switch (keyEvent.Key)
{
case Keys.Escape:
if ((CSongs.Category < 0 || _sso.Sorting.Tabs == EOffOn.TR_CONFIG_OFF) && !_sso.Selection.PartyMode && !_SearchActive)
@@ -235,7 +235,7 @@ namespace Vocaluxe.Screens
}
if (!_SearchActive)
{
switch (KeyEvent.Key)
switch (keyEvent.Key)
{
case Keys.Space:
if (!_sso.Selection.PartyMode)
@@ -243,21 +243,21 @@ namespace Vocaluxe.Screens
break;
case Keys.A:
if (KeyEvent.Mod == EModifier.Ctrl && !_sso.Selection.PartyMode)
if (keyEvent.Mod == EModifier.Ctrl && !_sso.Selection.PartyMode)
StartRandomAllSongs();
break;
case Keys.V:
if (KeyEvent.Mod == EModifier.Ctrl && !_sso.Selection.PartyMode)
if (keyEvent.Mod == EModifier.Ctrl && !_sso.Selection.PartyMode)
StartRandomVisibleSongs();
break;
case Keys.R:
if (KeyEvent.Mod == EModifier.Ctrl && !_sso.Selection.RandomOnly)
if (keyEvent.Mod == EModifier.Ctrl && !_sso.Selection.RandomOnly)
SelectNextRandom(-1);
break;
case Keys.S:
if (KeyEvent.Mod == EModifier.Ctrl && CSongs.NumVisibleSongs > 0 && !_sso.Selection.PartyMode)
if (keyEvent.Mod == EModifier.Ctrl && CSongs.NumVisibleSongs > 0 && !_sso.Selection.PartyMode)
StartMedleySong(SongMenus[SongMenu].GetSelectedSong());
break;
@@ -290,7 +290,7 @@ namespace Vocaluxe.Screens
}
else
{
switch (KeyEvent.Key)
switch (keyEvent.Key)
{
case Keys.Enter:
if (Buttons[ButtonOptionsClose].Selected)
@@ -337,7 +337,7 @@ namespace Vocaluxe.Screens
}
}
if (KeyEvent.ModSHIFT && (KeyEvent.Key == Keys.Add || KeyEvent.Key == Keys.PageUp))
if (keyEvent.ModSHIFT && (keyEvent.Key == Keys.Add || keyEvent.Key == Keys.PageUp))
{
CConfig.PreviewMusicVolume = CConfig.PreviewMusicVolume + 5;
if (CConfig.PreviewMusicVolume > 100)
@@ -345,7 +345,7 @@ namespace Vocaluxe.Screens
CConfig.SaveConfig();
ApplyVolume();
}
else if (KeyEvent.ModSHIFT && (KeyEvent.Key == Keys.Subtract || KeyEvent.Key == Keys.PageDown))
else if (keyEvent.ModSHIFT && (keyEvent.Key == Keys.Subtract || keyEvent.Key == Keys.PageDown))
{
CConfig.PreviewMusicVolume = CConfig.PreviewMusicVolume - 5;
if (CConfig.PreviewMusicVolume < 0)
@@ -357,26 +357,26 @@ namespace Vocaluxe.Screens
return true;
}
public override bool HandleMouse(MouseEvent MouseEvent)
public override bool HandleMouse(MouseEvent mouseEvent)
{
base.HandleMouse(MouseEvent);
base.HandleMouse(mouseEvent);
if (DragAndDropActive)
{
DragAndDropCover.Rect.X += MouseEvent.X - OldMousePosX;
DragAndDropCover.Rect.Y += MouseEvent.Y - OldMousePosY;
DragAndDropCover.Rect.X += mouseEvent.X - OldMousePosX;
DragAndDropCover.Rect.Y += mouseEvent.Y - OldMousePosY;
}
OldMousePosX = MouseEvent.X;
OldMousePosY = MouseEvent.Y;
OldMousePosX = mouseEvent.X;
OldMousePosY = mouseEvent.Y;
if (Playlists[Playlist].Visible && Playlists[Playlist].IsMouseOver(MouseEvent))
if (Playlists[Playlist].Visible && Playlists[Playlist].IsMouseOver(mouseEvent))
{
_PlaylistActive = true;
Playlists[Playlist].Selected = _PlaylistActive;
SongMenus[SongMenu].SetActive(!_PlaylistActive);
ToggleSongOptions(ESongOptionsView.None);
}
else if (CHelper.IsInBounds(SongMenus[SongMenu].Rect, MouseEvent.X, MouseEvent.Y))
else if (CHelper.IsInBounds(SongMenus[SongMenu].Rect, mouseEvent.X, mouseEvent.Y))
{
_PlaylistActive = false;
Playlists[Playlist].Selected = _PlaylistActive;
@@ -386,12 +386,12 @@ namespace Vocaluxe.Screens
if (Playlists[Playlist].Visible && _PlaylistActive)
{
if (Playlists[Playlist].HandleMouse(MouseEvent))
if (Playlists[Playlist].HandleMouse(mouseEvent))
return true;
}
if (MouseEvent.RB)
if (mouseEvent.RB)
{
if (_SongOptionsActive)
{
@@ -414,10 +414,10 @@ namespace Vocaluxe.Screens
}
}
if (MouseEvent.MB && !_sso.Selection.PartyMode)
if (mouseEvent.MB && !_sso.Selection.PartyMode)
return SelectNextRandom(-1);
if (MouseEvent.LD && !_sso.Selection.PartyMode)
if (mouseEvent.LD && !_sso.Selection.PartyMode)
{
//TODO: Causes Bug if you select a song (e.g. with Select random song) and double click a normal button.
//E.g. clicking to fast on Select random song starts the next random song. is this OK?
@@ -429,15 +429,15 @@ namespace Vocaluxe.Screens
}
}
SongMenus[SongMenu].HandleMouse(ref MouseEvent, _sso);
SongMenus[SongMenu].HandleMouse(ref mouseEvent, _sso);
UpdatePartyModeOptions();
if (MouseEvent.Handled)
if (mouseEvent.Handled)
return true;
if (MouseEvent.LB)
if (mouseEvent.LB)
{
if (IsMouseOver(MouseEvent))
if (IsMouseOver(mouseEvent))
{
if (Buttons[ButtonOpenOptions].Selected)
{
@@ -547,7 +547,7 @@ namespace Vocaluxe.Screens
}
}
if (MouseEvent.LBH)
if (mouseEvent.LBH)
{
if (!DragAndDropActive && Playlists[Playlist].Visible && CSongs.NumVisibleSongs > 0 && SongMenus[SongMenu].GetActualSelection() != -1)
{
@@ -560,7 +560,7 @@ namespace Vocaluxe.Screens
}
if (!MouseEvent.LBH && DragAndDropActive)
if (!mouseEvent.LBH && DragAndDropActive)
{
DragAndDropActive = false;
Playlists[Playlist].DragAndDropSongID = -1;
Vocaluxe/Screens/CScreenTest.cs
+7 -12
View File
@@ -16,12 +16,12 @@ namespace Vocaluxe.Screens
private int _TestMusic = -1;
public override bool HandleInput(KeyEvent KeyEvent)
public override bool HandleInput(KeyEvent keyEvent)
{
if (KeyEvent.KeyPressed && !Char.IsControl(KeyEvent.Unicode)) {}
if (keyEvent.KeyPressed && !Char.IsControl(keyEvent.Unicode)) {}
else
{
switch (KeyEvent.Key)
switch (keyEvent.Key)
{
case Keys.Escape:
case Keys.Back:
@@ -49,14 +49,14 @@ namespace Vocaluxe.Screens
return true;
}
public override bool HandleMouse(MouseEvent MouseEvent)
public override bool HandleMouse(MouseEvent mouseEvent)
{
if (MouseEvent.LB && IsMouseOver(MouseEvent)) {}
if (mouseEvent.LB && IsMouseOver(mouseEvent)) {}
if (MouseEvent.LB)
if (mouseEvent.LB)
CGraphics.FadeTo(EScreens.ScreenMain);
if (MouseEvent.RB)
if (mouseEvent.RB)
CGraphics.FadeTo(EScreens.ScreenMain);
return true;
}
@@ -66,11 +66,6 @@ namespace Vocaluxe.Screens
return true;
}
public override bool Draw()
{
return base.Draw();
}
private void PlayFile()
{
if (_TestMusic == -1)
VocaluxeLib/Menu/CMenu.cs
+21 -21
View File
@@ -589,64 +589,64 @@ namespace VocaluxeLib.Menu
#endregion ElementHandler
#region MenuHandler
public virtual bool HandleInput(KeyEvent KeyEvent)
public virtual bool HandleInput(KeyEvent keyEvent)
{
if (!CBase.Settings.IsTabNavigation())
{
if (KeyEvent.Key == Keys.Left)
if (keyEvent.Key == Keys.Left)
{
if (_Interactions.Count > 0 && _Interactions[_Selection].Type == EType.TSelectSlide && KeyEvent.Mod != EModifier.Shift)
KeyEvent.Handled = PrevElement();
if (_Interactions.Count > 0 && _Interactions[_Selection].Type == EType.TSelectSlide && keyEvent.Mod != EModifier.Shift)
keyEvent.Handled = PrevElement();
else
KeyEvent.Handled = _NextInteraction(KeyEvent);
keyEvent.Handled = _NextInteraction(keyEvent);
}
if (KeyEvent.Key == Keys.Right)
if (keyEvent.Key == Keys.Right)
{
if (_Interactions.Count > 0 && _Interactions[_Selection].Type == EType.TSelectSlide && KeyEvent.Mod != EModifier.Shift)
KeyEvent.Handled = NextElement();
if (_Interactions.Count > 0 && _Interactions[_Selection].Type == EType.TSelectSlide && keyEvent.Mod != EModifier.Shift)
keyEvent.Handled = NextElement();
else
KeyEvent.Handled = _NextInteraction(KeyEvent);
keyEvent.Handled = _NextInteraction(keyEvent);
}
if (KeyEvent.Key == Keys.Up || KeyEvent.Key == Keys.Down)
KeyEvent.Handled = _NextInteraction(KeyEvent);
if (keyEvent.Key == Keys.Up || keyEvent.Key == Keys.Down)
keyEvent.Handled = _NextInteraction(keyEvent);
}
else
{
if (KeyEvent.Key == Keys.Tab)
if (keyEvent.Key == Keys.Tab)
{
if (KeyEvent.Mod == EModifier.Shift)
if (keyEvent.Mod == EModifier.Shift)
PrevInteraction();
else
NextInteraction();
}
if (KeyEvent.Key == Keys.Left)
if (keyEvent.Key == Keys.Left)
PrevElement();
if (KeyEvent.Key == Keys.Right)
if (keyEvent.Key == Keys.Right)
NextElement();
}
return true;
}
public virtual bool HandleMouse(MouseEvent MouseEvent)
public virtual bool HandleMouse(MouseEvent mouseEvent)
{
int selection = _Selection;
ProcessMouseMove(MouseEvent.X, MouseEvent.Y);
ProcessMouseMove(mouseEvent.X, mouseEvent.Y);
if (selection != _Selection)
{
_UnsetHighlighted(selection);
_SetHighlighted(_Selection);
}
if (MouseEvent.LB)
ProcessMouseClick(MouseEvent.X, MouseEvent.Y);
if (mouseEvent.LB)
ProcessMouseClick(mouseEvent.X, mouseEvent.Y);
_PrevMouseX = MouseEvent.X;
_PrevMouseY = MouseEvent.Y;
_PrevMouseX = mouseEvent.X;
_PrevMouseY = mouseEvent.Y;
return true;
}
VocaluxeLib/Menu/IMenu.cs
+2 -2
View File
@@ -18,8 +18,8 @@ namespace VocaluxeLib.Menu
void UnloadTextures();
void ReloadTheme(string XmlPath);
bool HandleInput(KeyEvent KeyEvent);
bool HandleMouse(MouseEvent MouseEvent);
bool HandleInput(KeyEvent keyEvent);
bool HandleMouse(MouseEvent mouseEvent);
bool HandleInputThemeEditor(KeyEvent KeyEvent);
bool HandleMouseThemeEditor(MouseEvent MouseEvent);
VocaluxeLib/PartyModes/CScreenPartyDummy.cs
+8 -8
View File
@@ -34,14 +34,14 @@ namespace VocaluxeLib.PartyModes
public override void UnloadTextures() {}
public override bool HandleInput(KeyEvent KeyEvent)
public override bool HandleInput(KeyEvent keyEvent)
{
base.HandleInput(KeyEvent);
base.HandleInput(keyEvent);
if (KeyEvent.KeyPressed) {}
if (keyEvent.KeyPressed) {}
else
{
switch (KeyEvent.Key)
switch (keyEvent.Key)
{
case Keys.Back:
case Keys.Escape:
@@ -52,13 +52,13 @@ namespace VocaluxeLib.PartyModes
return true;
}
public override bool HandleMouse(MouseEvent MouseEvent)
public override bool HandleMouse(MouseEvent mouseEvent)
{
base.HandleMouse(MouseEvent);
base.HandleMouse(mouseEvent);
if (MouseEvent.LB && IsMouseOver(MouseEvent)) {}
if (mouseEvent.LB && IsMouseOver(mouseEvent)) {}
if (MouseEvent.RB)
if (mouseEvent.RB)
FadeTo(EScreens.ScreenParty);
return true;