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;