[gbrainy] Use Grid instead of Matrix to refer to grid areas
- From: Jordi Mas <jmas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gbrainy] Use Grid instead of Matrix to refer to grid areas
- Date: Wed, 27 Apr 2011 17:56:53 +0000 (UTC)
commit badfe2680412fe495a4226575dec73c30bdd03f3
Author: Jordi Mas <jmas softcatala org>
Date: Wed Apr 27 11:32:05 2011 +0200
Use Grid instead of Matrix to refer to grid areas
po/POTFILES.in | 4 ++--
src/Games/GameList.cs | 4 ++--
src/Games/Games.csproj | 4 ++--
...{PuzzleMatrixGroups.cs => PuzzleGridCircles.cs} | 6 +++---
...PuzzleMatrixNumbers.cs => PuzzleGridNumbers.cs} | 6 +++---
src/Games/Logic/PuzzleRelatedNumbers.cs | 2 +-
src/Games/Makefile.am | 4 ++--
7 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4fa2a8a..c2ab1aa 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -63,8 +63,8 @@ src/Games/Logic/PuzzleFourSided.cs
src/Games/Logic/PuzzleHandshakes.cs
src/Games/Logic/PuzzleLargerShape.cs
src/Games/Logic/PuzzleLines.cs
-src/Games/Logic/PuzzleMatrixGroups.cs
-src/Games/Logic/PuzzleMatrixNumbers.cs
+src/Games/Logic/PuzzleGridCircles.cs
+src/Games/Logic/PuzzleGridNumbers.cs
src/Games/Logic/PuzzleMissingPiece.cs
src/Games/Logic/PuzzleMissingSlice.cs
src/Games/Logic/PuzzleMostInCommon.cs
diff --git a/src/Games/GameList.cs b/src/Games/GameList.cs
index 6e102d2..53bfead 100644
--- a/src/Games/GameList.cs
+++ b/src/Games/GameList.cs
@@ -29,7 +29,7 @@ namespace gbrainy.Games
{
static Type[] LogicPuzzlesInternal = new Type[]
{
- typeof (PuzzleMatrixNumbers),
+ typeof (PuzzleGridNumbers),
typeof (PuzzleSquares),
typeof (PuzzleFigures),
typeof (PuzzleMoveFigure),
@@ -46,7 +46,7 @@ namespace gbrainy.Games
typeof (PuzzleCube),
typeof (PuzzleFigureLetter),
typeof (PuzzleDivideCircle),
- typeof (PuzzleMatrixGroups),
+ typeof (PuzzleGridCircles),
typeof (PuzzleBalance),
typeof (PuzzleTrianglesWithNumbers),
typeof (PuzzleOstracism),
diff --git a/src/Games/Games.csproj b/src/Games/Games.csproj
index 5d93bf2..657ff69 100644
--- a/src/Games/Games.csproj
+++ b/src/Games/Games.csproj
@@ -67,8 +67,8 @@
<Compile Include="Logic\PuzzleHandshakes.cs" />
<Compile Include="Logic\PuzzleLargerShape.cs" />
<Compile Include="Logic\PuzzleLines.cs" />
- <Compile Include="Logic\PuzzleMatrixGroups.cs" />
- <Compile Include="Logic\PuzzleMatrixNumbers.cs" />
+ <Compile Include="Logic\PuzzleGridCircles.cs" />
+ <Compile Include="Logic\PuzzleGridNumbers.cs" />
<Compile Include="Logic\PuzzleMissingPiece.cs" />
<Compile Include="Logic\PuzzleMissingSlice.cs" />
<Compile Include="Logic\PuzzleMostInCommon.cs" />
diff --git a/src/Games/Logic/PuzzleMatrixGroups.cs b/src/Games/Logic/PuzzleGridCircles.cs
similarity index 95%
rename from src/Games/Logic/PuzzleMatrixGroups.cs
rename to src/Games/Logic/PuzzleGridCircles.cs
index ac75f23..6ec8c15 100644
--- a/src/Games/Logic/PuzzleMatrixGroups.cs
+++ b/src/Games/Logic/PuzzleGridCircles.cs
@@ -24,7 +24,7 @@ using gbrainy.Core.Services;
namespace gbrainy.Games.Logic
{
- public class PuzzleMatrixGroups : Game
+ public class PuzzleGridCircles : Game
{
private int [] numbers;
private int good_pos;
@@ -32,11 +32,11 @@ namespace gbrainy.Games.Logic
private int divisor;
public override string Name {
- get {return ServiceLocator.Instance.GetService <ITranslations> ().GetString ("Matrix groups");}
+ get {return ServiceLocator.Instance.GetService <ITranslations> ().GetString ("Circles in a grid");}
}
public override string Question {
- get {return ServiceLocator.Instance.GetService <ITranslations> ().GetString ("One of the numbers in the matrix must be circled. Which one?");}
+ get {return ServiceLocator.Instance.GetService <ITranslations> ().GetString ("One of the numbers in the grid must be circled. Which one?");}
}
public override string Tip {
diff --git a/src/Games/Logic/PuzzleMatrixNumbers.cs b/src/Games/Logic/PuzzleGridNumbers.cs
similarity index 96%
rename from src/Games/Logic/PuzzleMatrixNumbers.cs
rename to src/Games/Logic/PuzzleGridNumbers.cs
index b9abb6b..82f1495 100644
--- a/src/Games/Logic/PuzzleMatrixNumbers.cs
+++ b/src/Games/Logic/PuzzleGridNumbers.cs
@@ -25,7 +25,7 @@ using gbrainy.Core.Services;
namespace gbrainy.Games.Logic
{
- public class PuzzleMatrixNumbers : Game
+ public class PuzzleGridNumbers : Game
{
public enum Operation
{
@@ -41,11 +41,11 @@ namespace gbrainy.Games.Logic
private const int rows = 4, columns = 4;
public override string Name {
- get {return ServiceLocator.Instance.GetService <ITranslations> ().GetString ("Matrix numbers");}
+ get {return ServiceLocator.Instance.GetService <ITranslations> ().GetString ("Numbers in a grid");}
}
public override string Question {
- get {return ServiceLocator.Instance.GetService <ITranslations> ().GetString ("The numbers in the matrix follow a pattern. Which number should replace the question mark?");}
+ get {return ServiceLocator.Instance.GetService <ITranslations> ().GetString ("The numbers in the grid below follow a pattern. Which number should replace the question mark?");}
}
public override string Tip {
diff --git a/src/Games/Logic/PuzzleRelatedNumbers.cs b/src/Games/Logic/PuzzleRelatedNumbers.cs
index 8966cc3..ea3a20e 100644
--- a/src/Games/Logic/PuzzleRelatedNumbers.cs
+++ b/src/Games/Logic/PuzzleRelatedNumbers.cs
@@ -160,7 +160,7 @@ namespace gbrainy.Games.Logic
}
public override string Question {
- get {return ServiceLocator.Instance.GetService <ITranslations> ().GetString ("In the matrix below, which number should replace the question mark?");}
+ get {return ServiceLocator.Instance.GetService <ITranslations> ().GetString ("In the grid below, which number should replace the question mark?");}
}
public override string Tip {
diff --git a/src/Games/Makefile.am b/src/Games/Makefile.am
index 137c2d2..e01d704 100644
--- a/src/Games/Makefile.am
+++ b/src/Games/Makefile.am
@@ -25,8 +25,8 @@ CSDISTFILES = \
$(srcdir)/Logic/PuzzleHandshakes.cs \
$(srcdir)/Logic/PuzzleLargerShape.cs \
$(srcdir)/Logic/PuzzleLines.cs \
- $(srcdir)/Logic/PuzzleMatrixGroups.cs \
- $(srcdir)/Logic/PuzzleMatrixNumbers.cs \
+ $(srcdir)/Logic/PuzzleGridCircles.cs \
+ $(srcdir)/Logic/PuzzleGridNumbers.cs \
$(srcdir)/Logic/PuzzleMissingPiece.cs \
$(srcdir)/Logic/PuzzleMissingSlice.cs \
$(srcdir)/Logic/PuzzleMostInCommon.cs \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]