[gbrainy] Remove some unused code
- From: Jordi Mas <jmas src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gbrainy] Remove some unused code
- Date: Fri, 27 Nov 2009 16:50:48 +0000 (UTC)
commit 589f3aaed29a67d2c364f3c08cbdff1426f852da
Author: Jordi Mas <jmas softcatala org>
Date: Fri Nov 27 15:53:45 2009 +0100
Remove some unused code
src/Clients/Classical/gbrainy.cs | 47 +++++++++----------------------------
src/Core/Main/Memory.cs | 5 +---
src/Core/Views/FinishView.cs | 2 -
src/Core/Views/WelcomeView.cs | 2 -
4 files changed, 13 insertions(+), 43 deletions(-)
---
diff --git a/src/Clients/Classical/gbrainy.cs b/src/Clients/Classical/gbrainy.cs
index 284b0c8..f781b33 100644
--- a/src/Clients/Classical/gbrainy.cs
+++ b/src/Clients/Classical/gbrainy.cs
@@ -18,16 +18,10 @@
*/
using System;
-using System.Reflection;
-using System.Runtime.InteropServices;
using Cairo;
using Gtk;
-using Gdk;
using Gnome;
using Mono.Unix;
-using System.Text;
-using System.Globalization;
-using System.Threading;
using System.Diagnostics;
using gbrainy.Core.Main;
@@ -309,11 +303,8 @@ namespace gbrainy.Clients.Classical
//Toolbar buttons and menu items that are sensitive when the user is playing
bool playing;
- if (session.Status == GameSession.SessionStatus.Playing)
- playing = true;
- else
- playing = false;
-
+ playing = (session.Status == GameSession.SessionStatus.Playing);
+
finish_tbbutton.Sensitive = pause_tbbutton.Sensitive = playing;
all_tbbutton.Sensitive = calculation_tbbutton.Sensitive = memory_tbbutton.Sensitive = logic_tbbutton.Sensitive = verbal_tbbutton.Sensitive = !playing;
pause_menuitem.Sensitive = finish_menuitem.Sensitive = playing;
@@ -395,8 +386,9 @@ namespace gbrainy.Clients.Classical
UpdateSolution (session.CurrentGame.TipString);
}
- void OnNewGame ()
+ void OnNewGame (GameSession.Types type)
{
+ session.Type = type;
session.NewSession ();
GetNextGame ();
GameSensitiveUI ();
@@ -406,28 +398,18 @@ namespace gbrainy.Clients.Classical
void OnMathOnly (object sender, EventArgs args)
{
- session.Type = GameSession.Types.CalculationTrainers;
- OnNewGame ();
+ OnNewGame (GameSession.Types.CalculationTrainers);
}
-
void OnVerbalOnly (object sender, EventArgs args)
{
- session.Type = GameSession.Types.VerbalAnalogies;
- OnNewGame ();
- }
-
- void OnMemoryOnlyAfterCountDown (object source, EventArgs e)
- {
- OnNewGame ();
+ OnNewGame (GameSession.Types.VerbalAnalogies);
}
void OnMemoryOnly (object sender, EventArgs args)
{
session.Type = GameSession.Types.MemoryTrainers;
- UpdateSolution (String.Empty);
- UpdateQuestion (String.Empty);
- OnNewGame ();
+ OnNewGame (GameSession.Types.MemoryTrainers);
}
void OnPreferences (object sender, EventArgs args)
@@ -450,28 +432,23 @@ namespace gbrainy.Clients.Classical
rslt = dialog.Run ();
dialog.Dialog.Destroy ();
- if (rslt == ResponseType.Ok && dialog.NumOfGames > 0) {
- session.Type = GameSession.Types.Custom;
- OnNewGame ();
- }
+ if (rslt == ResponseType.Ok && dialog.NumOfGames > 0)
+ OnNewGame (session.Type = GameSession.Types.Custom);
}
void OnLogicOnly (object sender, EventArgs args)
{
- session.Type = GameSession.Types.LogicPuzzles;
- OnNewGame ();
+ OnNewGame (GameSession.Types.LogicPuzzles);
}
void OnAllGames (object sender, EventArgs args)
{
- session.Type = GameSession.Types.AllGames;
- OnNewGame ();
+ OnNewGame (GameSession.Types.AllGames);
}
void OnTrainersOnly (object sender, EventArgs args)
{
- session.Type = GameSession.Types.TrainersOnly;
- OnNewGame ();
+ OnNewGame (GameSession.Types.TrainersOnly);
}
void OnAnswerActivate (object sender, EventArgs args)
diff --git a/src/Core/Main/Memory.cs b/src/Core/Main/Memory.cs
index 6aafcf0..949b4ad 100644
--- a/src/Core/Main/Memory.cs
+++ b/src/Core/Main/Memory.cs
@@ -94,10 +94,7 @@ namespace gbrainy.Core.Main
void OnCountDownFinish (object source, EventArgs e)
{
- downview.EndDrawCountDown ();
- downview.DrawRequest -= OnCountDownRedraw;
- downview = null;
-
+ FinishCountDown ();
InitializeGame ();
}
diff --git a/src/Core/Views/FinishView.cs b/src/Core/Views/FinishView.cs
index 1da1412..c2ca1c7 100644
--- a/src/Core/Views/FinishView.cs
+++ b/src/Core/Views/FinishView.cs
@@ -31,8 +31,6 @@ namespace gbrainy.Core.Views
GameSession session;
const int tips_shown = 4;
- public event EventHandler RequestRedraw; // Not used in this view
-
public FinishView (GameSession session)
{
this.session = session;
diff --git a/src/Core/Views/WelcomeView.cs b/src/Core/Views/WelcomeView.cs
index 6f8741f..29e18e7 100644
--- a/src/Core/Views/WelcomeView.cs
+++ b/src/Core/Views/WelcomeView.cs
@@ -29,8 +29,6 @@ namespace gbrainy.Core.Views
{
public class WelcomeView : IDrawable
{
- public event EventHandler RequestRedraw; // Not used in this view
-
public WelcomeView ()
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]