[gbrainy: 15/15] Merge branch 'gbrainy_15x'

[Jordi Mas <jmas src gnome org>]

commit f0c954d4a56bd208c84b39943f17d78c1304b161
Merge: ab117b0 a175bf8
Author: Jordi Mas <jmas softcatala org>
Date:   Mon May 24 17:50:44 2010 +0200

    Merge branch 'gbrainy_15x'

 Makefile.am                                        |    1 +
 configure.ac                                       |   34 +++-
 data/Makefile.am                                   |    6 +-
 data/game-graphics/train_left.svg                  |  167 +++++++++++
 data/game-graphics/train_right.svg                 |  167 +++++++++++
 data/verbal_analogies.xml                          |   42 +++
 po/POTFILES.in                                     |    2 +
 src/Clients/Classical/Dialogs/CustomGameDialog.cs  |    2 +-
 .../Classical/Dialogs/PlayerHistoryDialog.cs       |    8 +-
 src/Clients/Classical/gbrainy.cs                   |   16 +-
 src/Core/Main/Game.cs                              |  239 ++++++++++------
 src/Core/Main/GameManager.cs                       |   12 +-
 src/Core/Main/GameSession.cs                       |  242 +++--------------
 src/Core/Main/GameSessionHistory.cs                |   78 +++++
 src/Core/Main/GameSessionHistoryExtended.cs        |   64 ++++
 src/Core/Main/GameTips.cs                          |    8 +-
 src/Core/Main/GameTypes.cs                         |   56 ++++
 src/Core/Main/Memory.cs                            |    4 +-
 src/Core/Main/PlayerHistory.cs                     |  118 ++------
 src/Core/Main/PlayerPersonalRecord.cs              |   87 ++++++
 src/Core/Main/Preferences.cs                       |    3 +-
 src/Core/Main/Score.cs                             |  240 ++++++++++++++++
 src/Core/Main/Verbal/Analogies.cs                  |   76 +++---
 src/Core/Main/Verbal/AnalogiesFactory.cs           |   16 +-
 src/Core/Makefile.am                               |    7 +-
 src/Core/Views/FinishView.cs                       |   32 +-
 src/Core/Views/PlayerHistoryView.cs                |   38 ++--
 src/Games/Calculation/CalculationArithmetical.cs   |    4 +-
 src/Games/Calculation/CalculationAverage.cs        |   13 +-
 src/Games/Calculation/CalculationCloserFraction.cs |   12 +-
 src/Games/Calculation/CalculationFractions.cs      |    4 +-
 .../Calculation/CalculationGreatestDivisor.cs      |    4 +-
 src/Games/Calculation/CalculationOperator.cs       |   49 ++--
 src/Games/Calculation/CalculationPrimes.cs         |    4 +-
 src/Games/Calculation/CalculationProportions.cs    |    4 +-
 src/Games/Calculation/CalculationRatio.cs          |   57 ++---
 src/Games/Calculation/CalculationTwoNumbers.cs     |   68 ++---
 src/Games/GameList.cs                              |    1 +
 src/Games/Logic/PuzzleBalance.cs                   |    8 +-
 src/Games/Logic/PuzzleBuildTriangle.cs             |   35 +--
 src/Games/Logic/PuzzleCirclesRectangle.cs          |    8 +-
 src/Games/Logic/PuzzleClocks.cs                    |    8 +-
 src/Games/Logic/PuzzleCountSeries.cs               |    7 -
 src/Games/Logic/PuzzleCounting.cs                  |    4 +-
 src/Games/Logic/PuzzleCoverPercentage.cs           |   15 +-
 src/Games/Logic/PuzzleDice.cs                      |    4 +-
 src/Games/Logic/PuzzleEquation.cs                  |    8 +-
 src/Games/Logic/PuzzleExtraCircle.cs               |    8 +-
 src/Games/Logic/PuzzleFigureLetter.cs              |   79 ++---
 src/Games/Logic/PuzzleFigurePattern.cs             |    8 +-
 src/Games/Logic/PuzzleFigures.cs                   |   16 +-
 src/Games/Logic/PuzzleFourSided.cs                 |    8 +-
 src/Games/Logic/PuzzleLines.cs                     |    8 +-
 src/Games/Logic/PuzzleMatrixGroups.cs              |    8 +-
 src/Games/Logic/PuzzleMatrixNumbers.cs             |   20 +-
 src/Games/Logic/PuzzleMissingPiece.cs              |    8 +-
 src/Games/Logic/PuzzleMissingSlice.cs              |    8 +-
 src/Games/Logic/PuzzleMostInCommon.cs              |   12 +-
 src/Games/Logic/PuzzleMoveFigure.cs                |   15 +-
 src/Games/Logic/PuzzleNextFigure.cs                |    9 +-
 src/Games/Logic/PuzzleNumericRelation.cs           |   19 +-
 src/Games/Logic/PuzzleNumericSequence.cs           |   16 +-
 src/Games/Logic/PuzzleOstracism.cs                 |   14 +-
 src/Games/Logic/PuzzlePeopleTable.cs               |    8 +-
 src/Games/Logic/PuzzlePercentage.cs                |   25 +--
 src/Games/Logic/PuzzlePredicateLogic.cs            |    7 -
 src/Games/Logic/PuzzleQuadrilaterals.cs            |    8 +-
 src/Games/Logic/PuzzleSquareSheets.cs              |    8 +-
 src/Games/Logic/PuzzleSquares.cs                   |   15 +-
 src/Games/Logic/PuzzleSquaresAndLetters.cs         |    9 +-
 src/Games/Logic/PuzzleTetris.cs                    |    8 +-
 src/Games/Logic/PuzzleTimeNow.cs                   |   34 +--
 src/Games/Logic/PuzzleTrains.cs                    |  202 +++++++++++++
 src/Games/Logic/PuzzleTriangles.cs                 |   10 +-
 src/Games/Logic/PuzzleTrianglesWithNumbers.cs      |    8 +-
 src/Games/Makefile.am                              |    6 +-
 src/Games/Memory/MemoryFacts.cs                    |   15 +-
 tests/Core/AnalogiesFactoryTest.cs                 |   74 +++++
 tests/Core/GameManagerTest.cs                      |   77 +++++
 tests/Core/GameSessionTest.cs                      |   82 ++++++
 tests/Core/GameTest.cs                             |  302 ++++++++++++++++++++
 tests/Core/PlayerHistoryTest.cs                    |   75 +++++
 tests/Core/PlayerPersonalRecordTest.cs             |   74 +++++
 tests/Makefile.am                                  |   39 +++
 tests/README                                       |    7 +
 tests/test_analogies.xml                           |   66 +++++
 86 files changed, 2517 insertions(+), 980 deletions(-)
---