[gbrainy] Standarize game types names
- From: Jordi Mas <jmas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gbrainy] Standarize game types names
- Date: Sun, 28 Nov 2010 14:23:57 +0000 (UTC)
commit 9cc822e7b1de7aeff3a434310c0a5490146c33d3
Author: Jordi Mas <jmas softcatala org>
Date: Sun Nov 28 15:26:10 2010 +0100
Standarize game types names
sample_extensions/Calculation/CalculationSample.cs | 2 +-
src/Clients/Classical/Dialogs/PdfExportDialog.cs | 2 +-
.../Classical/Dialogs/PlayerHistoryDialog.cs | 4 ++--
src/Clients/Classical/gbrainy.cs | 8 ++++----
src/Clients/WebForms/Game.aspx.cs | 2 +-
src/Core/Main/GameManager.cs | 18 +++++++++---------
src/Core/Main/GameSession.cs | 6 +++---
src/Core/Main/GameTypes.cs | 12 ++++++------
src/Core/Main/Memory.cs | 2 +-
src/Core/Main/PlayerPersonalRecord.cs | 4 ++--
src/Core/Main/Score.cs | 12 ++++++------
src/Core/Views/FinishView.cs | 4 ++--
src/Core/Views/PlayerHistoryView.cs | 4 ++--
src/Games/Calculation/CalculationArithmetical.cs | 2 +-
src/Games/Calculation/CalculationAverage.cs | 2 +-
src/Games/Calculation/CalculationCloserFraction.cs | 2 +-
src/Games/Calculation/CalculationFractions.cs | 2 +-
.../Calculation/CalculationGreatestDivisor.cs | 2 +-
src/Games/Calculation/CalculationOperator.cs | 2 +-
src/Games/Calculation/CalculationPrimes.cs | 2 +-
src/Games/Calculation/CalculationProportions.cs | 2 +-
src/Games/Calculation/CalculationRatio.cs | 2 +-
src/Games/Calculation/CalculationTwoNumbers.cs | 2 +-
src/Games/GameList.cs | 12 ++++++------
24 files changed, 56 insertions(+), 56 deletions(-)
---
diff --git a/sample_extensions/Calculation/CalculationSample.cs b/sample_extensions/Calculation/CalculationSample.cs
index 12197f4..0adfa59 100644
--- a/sample_extensions/Calculation/CalculationSample.cs
+++ b/sample_extensions/Calculation/CalculationSample.cs
@@ -35,7 +35,7 @@ public class CalculationSample : Game
}
public override GameTypes Type {
- get { return GameTypes.MathTrainer;}
+ get { return GameTypes.Calculation;}
}
public override string Question {
diff --git a/src/Clients/Classical/Dialogs/PdfExportDialog.cs b/src/Clients/Classical/Dialogs/PdfExportDialog.cs
index 57d7f70..dba30db 100644
--- a/src/Clients/Classical/Dialogs/PdfExportDialog.cs
+++ b/src/Clients/Classical/Dialogs/PdfExportDialog.cs
@@ -124,7 +124,7 @@ namespace gbrainy.Clients.Classical.Dialogs
types |= GameSession.Types.LogicPuzzles;
if (checkbox_calculation.Active)
- types |= GameSession.Types.CalculationTrainers;
+ types |= GameSession.Types.Calculation;
if (checkbox_verbal.Active)
types |= GameSession.Types.VerbalAnalogies;
diff --git a/src/Clients/Classical/Dialogs/PlayerHistoryDialog.cs b/src/Clients/Classical/Dialogs/PlayerHistoryDialog.cs
index 7edaf3e..36dfd1e 100644
--- a/src/Clients/Classical/Dialogs/PlayerHistoryDialog.cs
+++ b/src/Clients/Classical/Dialogs/PlayerHistoryDialog.cs
@@ -65,8 +65,8 @@ namespace gbrainy.Clients.Classical.Dialogs
checkbutton_total.Label = Catalog.GetString ("Total");
checkbutton_logic.Label = GameTypesDescription.GetLocalized (GameTypes.LogicPuzzle);
- checkbutton_calculation.Label = GameTypesDescription.GetLocalized (GameTypes.MathTrainer);
- checkbutton_memory.Label = GameTypesDescription.GetLocalized (GameTypes.MemoryTrainer);
+ checkbutton_calculation.Label = GameTypesDescription.GetLocalized (GameTypes.Calculation);
+ checkbutton_memory.Label = GameTypesDescription.GetLocalized (GameTypes.Memory);
checkbutton_verbal.Label = GameTypesDescription.GetLocalized (GameTypes.VerbalAnalogy);
checkbutton_total.Active = checkbutton_memory.Active = checkbutton_logic.Active = checkbutton_calculation.Active = checkbutton_verbal.Active = true;
diff --git a/src/Clients/Classical/gbrainy.cs b/src/Clients/Classical/gbrainy.cs
index 0e22ba4..1825b7f 100755
--- a/src/Clients/Classical/gbrainy.cs
+++ b/src/Clients/Classical/gbrainy.cs
@@ -417,12 +417,12 @@ namespace gbrainy.Clients.Classical
else
logic_menuitem.Sensitive = logic_tbbutton.Sensitive = false;
- if (playing == false && ((available & GameTypes.MemoryTrainer) == GameTypes.MemoryTrainer))
+ if (playing == false && ((available & GameTypes.Calculation) == GameTypes.Calculation))
memory_menuitem.Sensitive = memory_tbbutton.Sensitive = true;
else
memory_menuitem.Sensitive = memory_tbbutton.Sensitive = false;
- if (playing == false && ((available & GameTypes.MathTrainer) == GameTypes.MathTrainer))
+ if (playing == false && ((available & GameTypes.Calculation) == GameTypes.Calculation))
calculation_menuitem.Sensitive = calculation_tbbutton.Sensitive = true;
else
calculation_menuitem.Sensitive = calculation_tbbutton.Sensitive = false;
@@ -551,7 +551,7 @@ namespace gbrainy.Clients.Classical
void OnMathOnly (object sender, EventArgs args)
{
- OnNewGame (GameSession.Types.CalculationTrainers);
+ OnNewGame (GameSession.Types.Calculation);
}
void OnVerbalOnly (object sender, EventArgs args)
@@ -561,7 +561,7 @@ namespace gbrainy.Clients.Classical
void OnMemoryOnly (object sender, EventArgs args)
{
- OnNewGame (GameSession.Types.MemoryTrainers);
+ OnNewGame (GameSession.Types.Memory);
}
void OnPdfExport (object sender, EventArgs args)
diff --git a/src/Clients/WebForms/Game.aspx.cs b/src/Clients/WebForms/Game.aspx.cs
index f8f70dd..9a7ffed 100644
--- a/src/Clients/WebForms/Game.aspx.cs
+++ b/src/Clients/WebForms/Game.aspx.cs
@@ -43,7 +43,7 @@ namespace WebForms
manager.Difficulty = gbrainy.Core.Main.GameDifficulty.Medium;
manager.GameType = gbrainy.Core.Main.GameSession.Types.LogicPuzzles |
- gbrainy.Core.Main.GameSession.Types.CalculationTrainers |
+ gbrainy.Core.Main.GameSession.Types.Calculation |
gbrainy.Core.Main.GameSession.Types.VerbalAnalogies;
return manager;
}
diff --git a/src/Core/Main/GameManager.cs b/src/Core/Main/GameManager.cs
index 8c68e54..b66d849 100644
--- a/src/Core/Main/GameManager.cs
+++ b/src/Core/Main/GameManager.cs
@@ -87,10 +87,10 @@ namespace gbrainy.Core.Main
types |= GameTypes.LogicPuzzle;
if (cnt_calculation > 0)
- types |= GameTypes.MathTrainer;
+ types |= GameTypes.Calculation;
if (cnt_memory > 0)
- types |= GameTypes.MemoryTrainer;
+ types |= GameTypes.Memory;
if (cnt_verbal > 0)
types |= GameTypes.VerbalAnalogy;
@@ -157,8 +157,8 @@ namespace gbrainy.Core.Main
{
const string CLASS = "gbrainy.Games.GameList";
const string LOGIC_METHOD = "LogicPuzzles";
- const string CALCULATION_METHOD = "CalculationTrainers";
- const string MEMORY_METHOD = "MemoryTrainers";
+ const string CALCULATION_METHOD = "Calculation";
+ const string MEMORY_METHOD = "Memory";
Assembly asem;
Type type = null;
@@ -225,7 +225,7 @@ namespace gbrainy.Core.Main
case GameTypes.LogicPuzzle:
cnt_logic++;
break;
- case GameTypes.MathTrainer:
+ case GameTypes.Calculation:
cnt_calculation++;
break;
default:
@@ -385,8 +385,8 @@ namespace gbrainy.Core.Main
else
{
logic = (game_type & GameSession.Types.LogicPuzzles) == GameSession.Types.LogicPuzzles;
- calculation = (game_type & GameSession.Types.CalculationTrainers) == GameSession.Types.CalculationTrainers;
- memory = (game_type & GameSession.Types.MemoryTrainers) == GameSession.Types.MemoryTrainers;
+ calculation = (game_type & GameSession.Types.Calculation) == GameSession.Types.Calculation;
+ memory = (game_type & GameSession.Types.Memory) == GameSession.Types.Memory;
verbal = (game_type & GameSession.Types.VerbalAnalogies) == GameSession.Types.VerbalAnalogies;
}
@@ -398,11 +398,11 @@ namespace gbrainy.Core.Main
if (logic)
logic_indices.Add (indices [n]);
break;
- case GameTypes.MemoryTrainer:
+ case GameTypes.Memory:
if (memory)
memory_indices.Add (indices [n]);
break;
- case GameTypes.MathTrainer:
+ case GameTypes.Calculation:
if (calculation)
calculation_indices.Add (indices [n]);
break;
diff --git a/src/Core/Main/GameSession.cs b/src/Core/Main/GameSession.cs
index b0790a0..2ecc2c8 100644
--- a/src/Core/Main/GameSession.cs
+++ b/src/Core/Main/GameSession.cs
@@ -33,11 +33,11 @@ namespace gbrainy.Core.Main
{
None = 0,
LogicPuzzles = 2,
- MemoryTrainers = 4,
- CalculationTrainers = 8,
+ Memory = 4,
+ Calculation = 8,
VerbalAnalogies = 16,
Custom = 32,
- AllGames = MemoryTrainers | CalculationTrainers | LogicPuzzles | VerbalAnalogies
+ AllGames = Memory | Calculation | LogicPuzzles | VerbalAnalogies
}
public enum SessionStatus
diff --git a/src/Core/Main/GameTypes.cs b/src/Core/Main/GameTypes.cs
index 9216477..061701e 100644
--- a/src/Core/Main/GameTypes.cs
+++ b/src/Core/Main/GameTypes.cs
@@ -27,8 +27,8 @@ namespace gbrainy.Core.Main
{
None = 0,
LogicPuzzle = 2,
- MemoryTrainer = 4,
- MathTrainer = 8,
+ Memory = 4,
+ Calculation = 8,
VerbalAnalogy = 16,
}
@@ -42,9 +42,9 @@ namespace gbrainy.Core.Main
{
case GameTypes.LogicPuzzle:
return Catalog.GetString ("Logic");
- case GameTypes.MemoryTrainer:
+ case GameTypes.Memory:
return Catalog.GetString ("Memory");
- case GameTypes.MathTrainer:
+ case GameTypes.Calculation:
return Catalog.GetString ("Calculation");
case GameTypes.VerbalAnalogy:
return Catalog.GetString ("Verbal");
@@ -61,9 +61,9 @@ namespace gbrainy.Core.Main
case "Logic":
return GameTypes.LogicPuzzle;
case "Memory":
- return GameTypes.MemoryTrainer;
+ return GameTypes.Memory;
case "Calculation":
- return GameTypes.MathTrainer;
+ return GameTypes.Calculation;
case "Verbal":
return GameTypes.VerbalAnalogy;
default:
diff --git a/src/Core/Main/Memory.cs b/src/Core/Main/Memory.cs
index 6e727fe..3afb5c4 100644
--- a/src/Core/Main/Memory.cs
+++ b/src/Core/Main/Memory.cs
@@ -55,7 +55,7 @@ namespace gbrainy.Core.Main
}
public override GameTypes Type {
- get { return GameTypes.MemoryTrainer;}
+ get { return GameTypes.Memory;}
}
public int TotalTime {
diff --git a/src/Core/Main/PlayerPersonalRecord.cs b/src/Core/Main/PlayerPersonalRecord.cs
index 45e793d..3b59edc 100644
--- a/src/Core/Main/PlayerPersonalRecord.cs
+++ b/src/Core/Main/PlayerPersonalRecord.cs
@@ -69,10 +69,10 @@ namespace gbrainy.Core.Main
records.Add (new PlayerPersonalRecord (GameTypes.LogicPuzzle, higher.LogicScore, games[last_game].LogicScore));
if (games[last_game].MathScore > higher.MathScore)
- records.Add (new PlayerPersonalRecord (GameTypes.MathTrainer, higher.MathScore, games[last_game].MathScore));
+ records.Add (new PlayerPersonalRecord (GameTypes.Calculation, higher.MathScore, games[last_game].MathScore));
if (games[last_game].MemoryScore > higher.MemoryScore)
- records.Add (new PlayerPersonalRecord (GameTypes.MemoryTrainer, higher.MemoryScore, games[last_game].MemoryScore));
+ records.Add (new PlayerPersonalRecord (GameTypes.Memory, higher.MemoryScore, games[last_game].MemoryScore));
if (games[last_game].VerbalScore > higher.VerbalScore)
records.Add (new PlayerPersonalRecord (GameTypes.VerbalAnalogy, higher.VerbalScore, games[last_game].VerbalScore));
diff --git a/src/Core/Main/Score.cs b/src/Core/Main/Score.cs
index eeaf1eb..38c2a17 100644
--- a/src/Core/Main/Score.cs
+++ b/src/Core/Main/Score.cs
@@ -48,9 +48,9 @@ namespace gbrainy.Core.Main
}
switch (type) {
- case GameTypes.MemoryTrainer:
+ case GameTypes.Memory:
return (int) (30 * factor);
- case GameTypes.MathTrainer:
+ case GameTypes.Calculation:
return (int) (60 * factor);
case GameTypes.VerbalAnalogy:
return (int) (30 * factor);
@@ -122,13 +122,13 @@ namespace gbrainy.Core.Main
if (won) history.LogicWon++;
history.LogicScore = SessionScoreFormula (ref history, type, difficulty);
break;
- case GameTypes.MemoryTrainer:
+ case GameTypes.Memory:
history.MemoryRawScore += game_score;
history.MemoryPlayed++;
if (won) history.MemoryWon++;
history.MemoryScore = SessionScoreFormula (ref history, type, difficulty);
break;
- case GameTypes.MathTrainer:
+ case GameTypes.Calculation:
history.MathRawScore += game_score;
history.MathPlayed++;
if (won) history.MathWon++;
@@ -198,12 +198,12 @@ namespace gbrainy.Core.Main
played = history.LogicPlayed;
won = history.LogicWon;
break;
- case GameTypes.MemoryTrainer:
+ case GameTypes.Memory:
scored = history.MemoryRawScore;
played = history.MemoryPlayed;
won = history.MemoryWon;
break;
- case GameTypes.MathTrainer:
+ case GameTypes.Calculation:
scored = history.MathRawScore;
played = history.MathPlayed;
won = history.MathWon;
diff --git a/src/Core/Views/FinishView.cs b/src/Core/Views/FinishView.cs
index 5a914d9..563da37 100644
--- a/src/Core/Views/FinishView.cs
+++ b/src/Core/Views/FinishView.cs
@@ -215,13 +215,13 @@ namespace gbrainy.Core.Views
records[i].NewScore,
records[i].PreviousScore);
break;
- case GameTypes.MathTrainer:
+ case GameTypes.Calculation:
s = String.Format (Catalog.
GetString ("By scoring {0} in calculation games you have established a new personal record. Your previous record was {1}."),
records[i].NewScore,
records[i].PreviousScore);
break;
- case GameTypes.MemoryTrainer:
+ case GameTypes.Memory:
s = String.Format (Catalog.
GetString ("By scoring {0} in memory games you have established a new personal record. Your previous record was {1}."),
records[i].NewScore,
diff --git a/src/Core/Views/PlayerHistoryView.cs b/src/Core/Views/PlayerHistoryView.cs
index 0a249d4..f387d06 100644
--- a/src/Core/Views/PlayerHistoryView.cs
+++ b/src/Core/Views/PlayerHistoryView.cs
@@ -99,7 +99,7 @@ namespace gbrainy.Core.Views
cr.Stroke ();
cr.Color = text_color;
cr.MoveTo (x + line_size + offset_x, y - 0.01);
- cr.ShowPangoText (GameTypesDescription.GetLocalized (GameTypes.MemoryTrainer));
+ cr.ShowPangoText (GameTypesDescription.GetLocalized (GameTypes.Memory));
cr.Stroke ();
cr.Color = math_color;
@@ -108,7 +108,7 @@ namespace gbrainy.Core.Views
cr.Stroke ();
cr.Color = text_color;
cr.MoveTo (x + line_size + offset_x, y - 0.01 + second_row);
- cr.ShowPangoText (GameTypesDescription.GetLocalized (GameTypes.MathTrainer));
+ cr.ShowPangoText (GameTypesDescription.GetLocalized (GameTypes.Calculation));
cr.Stroke ();
x += space_hor;
diff --git a/src/Games/Calculation/CalculationArithmetical.cs b/src/Games/Calculation/CalculationArithmetical.cs
index e7212ef..99f1d0d 100644
--- a/src/Games/Calculation/CalculationArithmetical.cs
+++ b/src/Games/Calculation/CalculationArithmetical.cs
@@ -43,7 +43,7 @@ namespace gbrainy.Games.Calculation
}
public override GameTypes Type {
- get { return GameTypes.MathTrainer;}
+ get { return GameTypes.Calculation;}
}
public override string Question {
diff --git a/src/Games/Calculation/CalculationAverage.cs b/src/Games/Calculation/CalculationAverage.cs
index 6a6d356..6c13bc6 100644
--- a/src/Games/Calculation/CalculationAverage.cs
+++ b/src/Games/Calculation/CalculationAverage.cs
@@ -39,7 +39,7 @@ namespace gbrainy.Games.Calculation
}
public override GameTypes Type {
- get { return GameTypes.MathTrainer;}
+ get { return GameTypes.Calculation;}
}
public override string Question {
diff --git a/src/Games/Calculation/CalculationCloserFraction.cs b/src/Games/Calculation/CalculationCloserFraction.cs
index 92ba1d6..344f2e8 100644
--- a/src/Games/Calculation/CalculationCloserFraction.cs
+++ b/src/Games/Calculation/CalculationCloserFraction.cs
@@ -38,7 +38,7 @@ namespace gbrainy.Games.Calculation
}
public override GameTypes Type {
- get { return GameTypes.MathTrainer;}
+ get { return GameTypes.Calculation;}
}
public override string Question {
diff --git a/src/Games/Calculation/CalculationFractions.cs b/src/Games/Calculation/CalculationFractions.cs
index ae5fd86..4e60f70 100644
--- a/src/Games/Calculation/CalculationFractions.cs
+++ b/src/Games/Calculation/CalculationFractions.cs
@@ -61,7 +61,7 @@ namespace gbrainy.Games.Calculation
}
public override GameTypes Type {
- get { return GameTypes.MathTrainer;}
+ get { return GameTypes.Calculation;}
}
public override string Question {
diff --git a/src/Games/Calculation/CalculationGreatestDivisor.cs b/src/Games/Calculation/CalculationGreatestDivisor.cs
index c984c96..720dfa9 100644
--- a/src/Games/Calculation/CalculationGreatestDivisor.cs
+++ b/src/Games/Calculation/CalculationGreatestDivisor.cs
@@ -38,7 +38,7 @@ namespace gbrainy.Games.Calculation
}
public override GameTypes Type {
- get { return GameTypes.MathTrainer;}
+ get { return GameTypes.Calculation;}
}
public override string Question {
diff --git a/src/Games/Calculation/CalculationOperator.cs b/src/Games/Calculation/CalculationOperator.cs
index c5cb601..24fcb5f 100644
--- a/src/Games/Calculation/CalculationOperator.cs
+++ b/src/Games/Calculation/CalculationOperator.cs
@@ -40,7 +40,7 @@ namespace gbrainy.Games.Calculation
}
public override GameTypes Type {
- get { return GameTypes.MathTrainer;}
+ get { return GameTypes.Calculation;}
}
public override string Question {
diff --git a/src/Games/Calculation/CalculationPrimes.cs b/src/Games/Calculation/CalculationPrimes.cs
index 457c1b6..a5c1956 100644
--- a/src/Games/Calculation/CalculationPrimes.cs
+++ b/src/Games/Calculation/CalculationPrimes.cs
@@ -154,7 +154,7 @@ namespace gbrainy.Games.Calculation
}
public override GameTypes Type {
- get { return GameTypes.MathTrainer;}
+ get { return GameTypes.Calculation;}
}
public override string Question {
diff --git a/src/Games/Calculation/CalculationProportions.cs b/src/Games/Calculation/CalculationProportions.cs
index 3bc5ca7..d303f8f 100644
--- a/src/Games/Calculation/CalculationProportions.cs
+++ b/src/Games/Calculation/CalculationProportions.cs
@@ -38,7 +38,7 @@ namespace gbrainy.Games.Calculation
}
public override GameTypes Type {
- get { return GameTypes.MathTrainer;}
+ get { return GameTypes.Calculation;}
}
public override string Question {
diff --git a/src/Games/Calculation/CalculationRatio.cs b/src/Games/Calculation/CalculationRatio.cs
index 598aa6d..9bf878b 100644
--- a/src/Games/Calculation/CalculationRatio.cs
+++ b/src/Games/Calculation/CalculationRatio.cs
@@ -33,7 +33,7 @@ namespace gbrainy.Games.Calculation
}
public override GameTypes Type {
- get { return GameTypes.MathTrainer;}
+ get { return GameTypes.Calculation;}
}
public override string Question {
diff --git a/src/Games/Calculation/CalculationTwoNumbers.cs b/src/Games/Calculation/CalculationTwoNumbers.cs
index 24c3eed..a123910 100644
--- a/src/Games/Calculation/CalculationTwoNumbers.cs
+++ b/src/Games/Calculation/CalculationTwoNumbers.cs
@@ -43,7 +43,7 @@ namespace gbrainy.Games.Calculation
}
public override GameTypes Type {
- get { return GameTypes.MathTrainer;}
+ get { return GameTypes.Calculation;}
}
public override string Question {
diff --git a/src/Games/GameList.cs b/src/Games/GameList.cs
index 576091e..6e102d2 100644
--- a/src/Games/GameList.cs
+++ b/src/Games/GameList.cs
@@ -77,7 +77,7 @@ namespace gbrainy.Games
typeof (PuzzleRelatedNumbers),
};
- static Type[] CalculationTrainersInternal = new Type[]
+ static Type[] CalculationInternal = new Type[]
{
typeof (CalculationArithmetical),
typeof (CalculationGreatestDivisor),
@@ -91,7 +91,7 @@ namespace gbrainy.Games
typeof (CalculationRatio),
};
- static Type[] MemoryTrainersInternal = new Type[]
+ static Type[] MemoryInternal = new Type[]
{
typeof (MemoryColouredFigures),
typeof (MemoryFiguresNumbers),
@@ -112,17 +112,17 @@ namespace gbrainy.Games
}
}
- public static Type [] CalculationTrainers
+ public static Type [] Calculation
{
get {
- return CalculationTrainersInternal;
+ return CalculationInternal;
}
}
- public static Type [] MemoryTrainers
+ public static Type [] Memory
{
get {
- return MemoryTrainersInternal;
+ return MemoryInternal;
}
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]