[gbrainy: 17/17] Merge branch 'gbrainy-17x'
- From: Jordi Mas <jmas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gbrainy: 17/17] Merge branch 'gbrainy-17x'
- Date: Sat, 12 Feb 2011 13:50:03 +0000 (UTC)
commit 23a24810f9415320b27f9165005508f646e92cbb
Merge: cc7fc0d b5504b1
Author: Jordi Mas <jmas softcatala org>
Date: Sat Feb 12 14:51:38 2011 +0100
Merge branch 'gbrainy-17x'
data/Makefile.am | 16 +-
data/app-graphics/gbrainy.ico | Bin 0 -> 91750 bytes
data/themes/blackboard_background.svg | 248 +++++++++++++
.../classic_background.svg} | 0
data/themes/themes.xml | 17 +
gbrainy.csproj | 4 +-
help/C/export.page | 2 +-
help/C/score.page | 2 +-
help/C/times.page | 2 +-
po/POTFILES.in | 2 +
src/Clients/Classical/Dialogs/CustomGameDialog.cs | 58 +---
src/Clients/Classical/Dialogs/PreferencesDialog.cs | 38 ++
.../Classical/Dialogs/ui/CustomGameDialog.ui | 48 +--
.../Classical/Dialogs/ui/PreferencesDialog.ui | 35 ++-
src/Clients/Classical/Makefile.am | 2 +-
src/Clients/Classical/Widgets/GameDrawingArea.cs | 157 ++++++++
src/Clients/Classical/Widgets/SimpleLabel.cs | 100 -----
src/Clients/Classical/gbrainy.cs | 210 +++++++----
src/Clients/Classical/gbrainy.ui | 383 +++++++++++---------
src/Clients/WebForms/Default.aspx | 36 +-
src/Clients/WebForms/Default.aspx.cs | 43 +--
src/Clients/WebForms/Default.aspx.designer.cs | 12 +-
src/Clients/WebForms/Defines.cs | 34 ++
src/Clients/WebForms/Download.aspx | 2 +-
src/Clients/WebForms/Download.aspx.cs | 2 +-
src/Clients/WebForms/Download.aspx.designer.cs | 6 +-
src/Clients/WebForms/Game.aspx | 11 +-
src/Clients/WebForms/Game.aspx.cs | 169 ++++++---
src/Clients/WebForms/Game.aspx.designer.cs | 10 +-
src/Clients/WebForms/Global.asax | 2 +-
src/Clients/WebForms/Global.asax.cs | 20 +-
src/Clients/WebForms/LanguageSupport.cs | 70 +++--
src/Clients/WebForms/Logger.cs | 2 +-
src/Clients/WebForms/MasterPage.master | 22 +-
src/Clients/WebForms/MasterPage.master.cs | 3 +-
src/Clients/WebForms/MasterPage.master.designer.cs | 4 +-
src/Clients/WebForms/Status.aspx | 10 +-
src/Clients/WebForms/Status.aspx.cs | 47 ++-
src/Clients/WebForms/Status.aspx.designer.cs | 4 +-
src/Clients/WebForms/TranslationsWeb.cs | 74 ++++
src/Clients/WebForms/WebForms.csproj | 32 +--
src/Clients/WebForms/WebSession.cs | 6 +-
src/Clients/WebForms/images/allgames-32.png | Bin 445 -> 0 bytes
src/Clients/WebForms/images/endgame-32.png | Bin 474 -> 0 bytes
src/Clients/WebForms/images/logic-games-32.png | Bin 1811 -> 0 bytes
src/Clients/WebForms/images/math-games-32.png | Bin 1191 -> 0 bytes
src/Clients/WebForms/images/memory-games-32.png | Bin 1146 -> 0 bytes
src/Clients/WebForms/images/pause-32.png | Bin 457 -> 0 bytes
src/Clients/WebForms/images/resume-32.png | Bin 559 -> 0 bytes
src/Clients/WebForms/images/verbal-games-32.png | Bin 1762 -> 0 bytes
src/Clients/WebForms/package.sh | 42 +++
src/Clients/WebForms/web.config | 8 +-
src/Core/Core.csproj | 14 +-
src/Core/Libraries/CairoContext.cs | 20 +-
src/Core/Libraries/TranslationsCatalog.cs | 42 +++
src/Core/Main/CairoContextEx.cs | 25 +-
src/Core/Main/ColorPalette.cs | 18 +-
src/Core/Main/Game.cs | 26 +-
src/Core/Main/GameManager.cs | 14 +-
src/Core/Main/GameSession.cs | 24 +-
src/Core/Main/GameTips.cs | 33 +-
src/Core/Main/GameTypes.cs | 11 +-
src/Core/Main/Memory.cs | 7 +-
src/Core/Main/PdfExporter.cs | 12 +-
src/Core/Main/Preferences.cs | 18 +-
src/Core/Main/Theme.cs | 98 +++++
src/Core/Main/ThemeManager.cs | 86 +++++
src/Core/Main/Verbal/Analogies.cs | 18 +-
src/Core/Main/Verbal/AnalogiesFactory.cs | 4 +-
src/Core/Main/Verbal/AnalogiesMultipleOptions.cs | 12 +-
.../Main/Verbal/AnalogiesPairOfWordsCompare.cs | 9 +-
.../Main/Verbal/AnalogiesPairOfWordsOptions.cs | 14 +-
src/Core/Main/Verbal/AnalogiesQuestionAnswer.cs | 4 +-
src/Core/Main/Xml/GameXml.cs | 21 +-
src/Core/Makefile.am | 17 +-
src/Core/Services/IConfiguration.cs | 35 ++
src/Core/Services/IService.cs | 27 ++
src/Core/Services/ITranslations.cs | 29 ++
src/Core/Services/MemoryConfiguration.cs | 51 +++
src/Core/Services/ServiceLocator.cs | 78 ++++
src/Core/Views/CountDownView.cs | 4 +-
src/Core/Views/FinishView.cs | 35 +-
src/Core/Views/PlayerHistoryView.cs | 8 +-
src/Core/Views/WelcomeView.cs | 17 +-
src/Games/Calculation/CalculationArithmetical.cs | 7 +-
src/Games/Calculation/CalculationAverage.cs | 10 +-
src/Games/Calculation/CalculationCloserFraction.cs | 10 +-
src/Games/Calculation/CalculationFractions.cs | 6 +-
.../Calculation/CalculationGreatestDivisor.cs | 12 +-
src/Games/Calculation/CalculationOperator.cs | 10 +-
src/Games/Calculation/CalculationPrimes.cs | 12 +-
src/Games/Calculation/CalculationProportions.cs | 6 +-
src/Games/Calculation/CalculationRatio.cs | 16 +-
src/Games/Calculation/CalculationTwoNumbers.cs | 16 +-
src/Games/Logic/Puzzle3DCube.cs | 8 +-
src/Games/Logic/PuzzleBalance.cs | 10 +-
src/Games/Logic/PuzzleBuildTriangle.cs | 10 +-
src/Games/Logic/PuzzleCirclesSquare.cs | 18 +-
src/Games/Logic/PuzzleClocks.cs | 10 +-
src/Games/Logic/PuzzleCountCircles.cs | 8 +-
src/Games/Logic/PuzzleCountSeries.cs | 18 +-
src/Games/Logic/PuzzleCounting.cs | 18 +-
src/Games/Logic/PuzzleCoverPercentage.cs | 6 +-
src/Games/Logic/PuzzleCube.cs | 6 +-
src/Games/Logic/PuzzleDice.cs | 20 +-
src/Games/Logic/PuzzleDivideCircle.cs | 8 +-
src/Games/Logic/PuzzleEquation.cs | 8 +-
src/Games/Logic/PuzzleExtraCircle.cs | 10 +-
src/Games/Logic/PuzzleFigureLetter.cs | 10 +-
src/Games/Logic/PuzzleFigurePattern.cs | 12 +-
src/Games/Logic/PuzzleFigures.cs | 18 +-
src/Games/Logic/PuzzleFourSided.cs | 10 +-
src/Games/Logic/PuzzleHandshakes.cs | 8 +-
src/Games/Logic/PuzzleLargerShape.cs | 8 +-
src/Games/Logic/PuzzleLines.cs | 10 +-
src/Games/Logic/PuzzleMatrixGroups.cs | 10 +-
src/Games/Logic/PuzzleMatrixNumbers.cs | 22 +-
src/Games/Logic/PuzzleMissingPiece.cs | 12 +-
src/Games/Logic/PuzzleMissingSlice.cs | 12 +-
src/Games/Logic/PuzzleMostInCommon.cs | 14 +-
src/Games/Logic/PuzzleMoveFigure.cs | 10 +-
src/Games/Logic/PuzzleNextFigure.cs | 10 +-
src/Games/Logic/PuzzleNumericRelation.cs | 14 +-
src/Games/Logic/PuzzleNumericSequence.cs | 14 +-
src/Games/Logic/PuzzleOstracism.cs | 16 +-
src/Games/Logic/PuzzlePencil.cs | 6 +-
src/Games/Logic/PuzzlePeopleTable.cs | 22 +-
src/Games/Logic/PuzzlePercentage.cs | 12 +-
src/Games/Logic/PuzzlePredicateLogic.cs | 98 +++---
src/Games/Logic/PuzzleQuadrilaterals.cs | 8 +-
src/Games/Logic/PuzzleRelatedNumbers.cs | 14 +-
src/Games/Logic/PuzzleSquareDots.cs | 8 +-
src/Games/Logic/PuzzleSquareSheets.cs | 11 +-
src/Games/Logic/PuzzleSquares.cs | 13 +-
src/Games/Logic/PuzzleSquaresAndLetters.cs | 8 +-
src/Games/Logic/PuzzleTetris.cs | 10 +-
src/Games/Logic/PuzzleTimeNow.cs | 12 +-
src/Games/Logic/PuzzleTrains.cs | 18 +-
src/Games/Logic/PuzzleTriangles.cs | 10 +-
src/Games/Logic/PuzzleTrianglesWithNumbers.cs | 10 +-
src/Games/Memory/MemoryColouredFigures.cs | 6 +-
src/Games/Memory/MemoryColouredText.cs | 6 +-
src/Games/Memory/MemoryCountDots.cs | 6 +-
src/Games/Memory/MemoryFacts.cs | 26 +-
src/Games/Memory/MemoryFigures.cs | 6 +-
src/Games/Memory/MemoryFiguresAndText.cs | 14 +-
src/Games/Memory/MemoryFiguresNumbers.cs | 6 +-
src/Games/Memory/MemoryIndications.cs | 18 +-
src/Games/Memory/MemoryNumbers.cs | 10 +-
src/Games/Memory/MemoryWords.cs | 76 ++--
150 files changed, 2451 insertions(+), 1282 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
