[gbrainy/stable: 3/4] Fixes spelling mistakes in code
- From: Jordi Mas <jmas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gbrainy/stable: 3/4] Fixes spelling mistakes in code
- Date: Mon, 17 Oct 2011 21:17:30 +0000 (UTC)
commit 3b37468c99c3672baa5579e5b5c809508873ca3f
Author: Jordi Mas <jmas softcatala org>
Date: Wed Sep 28 22:50:06 2011 +0200
Fixes spelling mistakes in code
src/Core/Core.csproj | 7 +----
src/Core/Main/Game.cs | 2 +-
src/Core/Makefile.am | 2 +-
src/Core/Toolkit/Container.cs | 2 +-
src/Core/Toolkit/DrawableArea.cs | 2 +-
...SeletectedEventArgs.cs => SelectedEventArgs.cs} | 4 +-
src/Core/Toolkit/Widget.cs | 4 +-
src/Games/Logic/PuzzleFigureLetter.cs | 12 +++++-----
src/Games/Logic/PuzzleNextFigure.cs | 24 ++++++++++----------
src/Games/Memory/MemoryFigures.cs | 8 +++---
10 files changed, 32 insertions(+), 35 deletions(-)
---
diff --git a/src/Core/Core.csproj b/src/Core/Core.csproj
index 556b8f0..0bc8f5f 100644
--- a/src/Core/Core.csproj
+++ b/src/Core/Core.csproj
@@ -35,16 +35,13 @@
<Reference Include="Mono.Posix" />
<Reference Include="System.Xml" />
<Reference Include="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
- <Package>gtk-sharp-2.0</Package>
</Reference>
<Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
- <Package>gtk-sharp-2.0</Package>
</Reference>
<Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
- <Package>gtk-sharp-2.0</Package>
</Reference>
<Reference Include="Mono.CSharp" />
- <Reference Include="Mono.Cairo, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
+ <Reference Include="Mono.Cairo" />
</ItemGroup>
<ItemGroup>
<Compile Include="Main\ArrayListIndicesRandom.cs" />
@@ -81,7 +78,6 @@
<Compile Include="Toolkit\DrawableArea.cs" />
<Compile Include="Toolkit\DrawEventArgs.cs" />
<Compile Include="Toolkit\HorizontalContainer.cs" />
- <Compile Include="Toolkit\SeletectedEventArgs.cs" />
<Compile Include="Toolkit\Widget.cs" />
<Compile Include="Views\CountDownView.cs" />
<Compile Include="Views\FinishView.cs" />
@@ -118,6 +114,7 @@
<Compile Include="Services\DefaultServices.cs" />
<Compile Include="Services\ICSharpCompiler.cs" />
<Compile Include="Main\PreferencesStorage.cs" />
+ <Compile Include="Toolkit\SelectedEventArgs.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ProjectExtensions>
diff --git a/src/Core/Main/Game.cs b/src/Core/Main/Game.cs
index 3b84f69..5b39b0c 100644
--- a/src/Core/Main/Game.cs
+++ b/src/Core/Main/Game.cs
@@ -255,7 +255,7 @@ namespace gbrainy.Core.Main
};
// If the user has selected an item we should propagate an answer
- container.SelectedEvent += delegate (object sender, SeletectedEventArgs e)
+ container.SelectedEvent += delegate (object sender, SelectedEventArgs e)
{
if (AnswerEvent != null)
AnswerEvent (this, new GameAnswerEventArgs ((string) e.DataEx));
diff --git a/src/Core/Makefile.am b/src/Core/Makefile.am
index fb0cb29..3dbb442 100644
--- a/src/Core/Makefile.am
+++ b/src/Core/Makefile.am
@@ -56,7 +56,7 @@ CSDISTFILES = \
$(srcdir)/Toolkit/DrawableArea.cs \
$(srcdir)/Toolkit/DrawEventArgs.cs \
$(srcdir)/Toolkit/HorizontalContainer.cs \
- $(srcdir)/Toolkit/SeletectedEventArgs.cs \
+ $(srcdir)/Toolkit/SelectedEventArgs.cs \
$(srcdir)/Toolkit/Widget.cs \
$(srcdir)/Views/PlayerHistoryView.cs \
$(srcdir)/Views/ViewsControler.cs \
diff --git a/src/Core/Toolkit/Container.cs b/src/Core/Toolkit/Container.cs
index e6ca04d..9d6006a 100644
--- a/src/Core/Toolkit/Container.cs
+++ b/src/Core/Toolkit/Container.cs
@@ -66,7 +66,7 @@ namespace gbrainy.Core.Toolkit
OnDrawRequest ();
};
- widget.SelectedEvent += delegate (object sender, SeletectedEventArgs e)
+ widget.SelectedEvent += delegate (object sender, SelectedEventArgs e)
{
OnSelected (e);
};
diff --git a/src/Core/Toolkit/DrawableArea.cs b/src/Core/Toolkit/DrawableArea.cs
index f7139d3..3ff0f83 100644
--- a/src/Core/Toolkit/DrawableArea.cs
+++ b/src/Core/Toolkit/DrawableArea.cs
@@ -98,7 +98,7 @@ namespace gbrainy.Core.Toolkit
} else {
if (args.EventType == MouseEventType.ButtonPress) {
- OnSelected (new SeletectedEventArgs (Data, DataEx));
+ OnSelected (new SelectedEventArgs (Data, DataEx));
} else {
if (hoover == false) {
hoover = true;
diff --git a/src/Core/Toolkit/SeletectedEventArgs.cs b/src/Core/Toolkit/SelectedEventArgs.cs
similarity index 90%
rename from src/Core/Toolkit/SeletectedEventArgs.cs
rename to src/Core/Toolkit/SelectedEventArgs.cs
index f0a7bc2..a274d31 100644
--- a/src/Core/Toolkit/SeletectedEventArgs.cs
+++ b/src/Core/Toolkit/SelectedEventArgs.cs
@@ -21,9 +21,9 @@ using System;
namespace gbrainy.Core.Toolkit
{
- public class SeletectedEventArgs: EventArgs
+ public class SelectedEventArgs: EventArgs
{
- public SeletectedEventArgs (object data, object data_ex)
+ public SelectedEventArgs (object data, object data_ex)
{
Data = data;
DataEx = data_ex;
diff --git a/src/Core/Toolkit/Widget.cs b/src/Core/Toolkit/Widget.cs
index 21a8645..30af889 100644
--- a/src/Core/Toolkit/Widget.cs
+++ b/src/Core/Toolkit/Widget.cs
@@ -34,7 +34,7 @@ namespace gbrainy.Core.Toolkit
public delegate void WidgetDrawEventHandler (object sender, DrawEventArgs e);
public event EventHandler DrawRequest;
- public event EventHandler <SeletectedEventArgs> SelectedEvent;
+ public event EventHandler <SelectedEventArgs> SelectedEvent;
ISynchronizeInvoke synchronize;
bool sensitive;
@@ -79,7 +79,7 @@ namespace gbrainy.Core.Toolkit
DrawRequest (this, EventArgs.Empty);
}
- protected void OnSelected (SeletectedEventArgs e)
+ protected void OnSelected (SelectedEventArgs e)
{
if (SelectedEvent == null)
return;
diff --git a/src/Games/Logic/PuzzleFigureLetter.cs b/src/Games/Logic/PuzzleFigureLetter.cs
index f3a7042..9411184 100644
--- a/src/Games/Logic/PuzzleFigureLetter.cs
+++ b/src/Games/Logic/PuzzleFigureLetter.cs
@@ -31,8 +31,8 @@ namespace gbrainy.Games.Logic
enum QuestionType
{
TwoSquares = 0,
- TwoCercles,
- ThreeCercles,
+ TwoCircles,
+ ThreeCircles,
Length
}
@@ -63,11 +63,11 @@ namespace gbrainy.Games.Logic
Answer.Correct = "A | B | F";
Answer.CorrectShow = "ABF";
break;
- case QuestionType.TwoCercles:
+ case QuestionType.TwoCircles:
Answer.Correct = "C | D | F";
Answer.CorrectShow = "CDF";
break;
- case QuestionType.ThreeCercles:
+ case QuestionType.ThreeCircles:
Answer.Correct = "A | C | E";
Answer.CorrectShow = "ACE";
break;
@@ -133,14 +133,14 @@ namespace gbrainy.Games.Logic
gr.Stroke ();
gr.MoveTo (x + 0.05, y + 0.18);
break;
- case QuestionType.TwoCercles:
+ case QuestionType.TwoCircles:
gr.Arc (x + 0.05, y + 0.05, 0.05, 0, 2 * Math.PI);
gr.Stroke ();
gr.Arc (x + 0.12 + 0.05, y + 0.05, 0.05, 0, 2 * Math.PI);
gr.Stroke ();
gr.MoveTo (x + 0.1, y + 0.18);
break;
- case QuestionType.ThreeCercles:
+ case QuestionType.ThreeCircles:
gr.Arc (x + 0.05 + 0.06, y + 0.04, 0.05, 0, 2 * Math.PI);
gr.Stroke ();
gr.Arc (x + 0.05, y + 0.06 + 0.04, 0.05, 0, 2 * Math.PI);
diff --git a/src/Games/Logic/PuzzleNextFigure.cs b/src/Games/Logic/PuzzleNextFigure.cs
index 4b278ff..b37c32c 100644
--- a/src/Games/Logic/PuzzleNextFigure.cs
+++ b/src/Games/Logic/PuzzleNextFigure.cs
@@ -32,7 +32,7 @@ namespace gbrainy.Games.Logic
const double space_figures = figure_size + 0.066;
ArrayListIndicesRandom random_indices;
- public enum CerclePosition
+ public enum CirclePosition
{
None = 0,
Top = 2,
@@ -99,13 +99,13 @@ namespace gbrainy.Games.Logic
switch ((Figures) random_indices[n]) {
case Figures.First:
- DrawDiamon (e.Context, 0, 0, CerclePosition.Right | CerclePosition.Left);
+ DrawDiamon (e.Context, 0, 0, CirclePosition.Right | CirclePosition.Left);
break;
case Figures.Second:
- DrawDiamon (e.Context, 0, 0, CerclePosition.Top | CerclePosition.Right);
+ DrawDiamon (e.Context, 0, 0, CirclePosition.Top | CirclePosition.Right);
break;
case Figures.Third:
- DrawDiamon (e.Context, 0, 0, CerclePosition.Bottom | CerclePosition.Top);
+ DrawDiamon (e.Context, 0, 0, CirclePosition.Bottom | CirclePosition.Top);
break;
default:
throw new InvalidOperationException ();
@@ -118,7 +118,7 @@ namespace gbrainy.Games.Logic
}
}
- static private void DrawDiamon (CairoContextEx gr, double x, double y, CerclePosition cercles)
+ static private void DrawDiamon (CairoContextEx gr, double x, double y, CirclePosition circles)
{
double distance = 0.04;
@@ -129,22 +129,22 @@ namespace gbrainy.Games.Logic
gr.LineTo (x + figure_size / 2, y);
gr.Stroke ();
- if ((cercles & CerclePosition.Top) == CerclePosition.Top) {
+ if ((circles & CirclePosition.Top) == CirclePosition.Top) {
gr.Arc (x + figure_size / 2, y + distance, 0.01, 0, 2 * Math.PI);
gr.Stroke ();
}
- if ((cercles & CerclePosition.Right) == CerclePosition.Right) {
+ if ((circles & CirclePosition.Right) == CirclePosition.Right) {
gr.Arc (x + figure_size - distance, y + figure_size / 2, 0.01, 0, 2 * Math.PI);
gr.Stroke ();
}
- if ((cercles & CerclePosition.Bottom) == CerclePosition.Bottom) {
+ if ((circles & CirclePosition.Bottom) == CirclePosition.Bottom) {
gr.Arc (x + figure_size / 2, y + figure_size - distance, 0.01, 0, 2 * Math.PI);
gr.Stroke ();
}
- if ((cercles & CerclePosition.Left) == CerclePosition.Left) {
+ if ((circles & CirclePosition.Left) == CirclePosition.Left) {
gr.Arc (x + distance, y + figure_size / 2, 0.01, 0, 2 * Math.PI);
gr.Stroke ();
}
@@ -157,9 +157,9 @@ namespace gbrainy.Games.Logic
base.Draw (gr, area_width, area_height, rtl);
- DrawDiamon (gr, x, y, CerclePosition.Top | CerclePosition.Left);
- DrawDiamon (gr, x + space_figures , y, CerclePosition.Bottom);
- DrawDiamon (gr, x + space_figures * 2, y, CerclePosition.Top | CerclePosition.Right);
+ DrawDiamon (gr, x, y, CirclePosition.Top | CirclePosition.Left);
+ DrawDiamon (gr, x + space_figures , y, CirclePosition.Bottom);
+ DrawDiamon (gr, x + space_figures * 2, y, CirclePosition.Top | CirclePosition.Right);
y += figure_size + 0.06;
gr.MoveTo (x, y);
diff --git a/src/Games/Memory/MemoryFigures.cs b/src/Games/Memory/MemoryFigures.cs
index 8c4bc1a..3755688 100644
--- a/src/Games/Memory/MemoryFigures.cs
+++ b/src/Games/Memory/MemoryFigures.cs
@@ -44,11 +44,11 @@ namespace gbrainy.Games.Memory
Triangle,
Rectangle,
Diamond,
- Cercle,
+ Circle,
TriangleWithLine,
RectangleWithLine,
DiamondWithLine,
- CercleWithLine,
+ CircleWithLine,
}
public override string Name {
@@ -213,7 +213,7 @@ namespace gbrainy.Games.Memory
case FigureType.Diamond:
gr.DrawDiamond (x + space_x, y + space_y, figure_size);
break;
- case FigureType.Cercle:
+ case FigureType.Circle:
gr.Arc (x + space_x + figure_size / 2, y + space_y + figure_size / 2, figure_size / 2, 0, 2 * Math.PI);
gr.Stroke ();
break;
@@ -237,7 +237,7 @@ namespace gbrainy.Games.Memory
gr.LineTo (x + space_x + figure_size / 2, y + space_y + figure_size);
gr.Stroke ();
break;
- case FigureType.CercleWithLine:
+ case FigureType.CircleWithLine:
gr.Arc (x + space_x + figure_size / 2, y + space_y + figure_size / 2, figure_size / 2, 0, 2 * Math.PI);
gr.Stroke ();
gr.MoveTo (x + space_x + figure_size / 2, y + space_y);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]