[longomatch] Rename TaggerObject to DashboardButtonObject



commit 6f9ad3f316f2252fdc26e1d67cb4f932cfed44ae
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date:   Fri Apr 10 14:21:47 2015 +0200

    Rename TaggerObject to DashboardButtonObject

 LongoMatch.Drawing/CanvasObjects/CategoryObject.cs |    4 +-
 .../{TaggerObject.cs => DashboardButtonObject.cs}  |   36 ++++++++++----------
 LongoMatch.Drawing/CanvasObjects/TagObject.cs      |    2 +-
 LongoMatch.Drawing/CanvasObjects/TimerObject.cs    |    2 +-
 LongoMatch.Drawing/LongoMatch.Drawing.csproj       |    2 +-
 LongoMatch.Drawing/Makefile.am                     |    2 +-
 LongoMatch.Drawing/Widgets/DashboardCanvas.cs      |   30 ++++++++--------
 7 files changed, 39 insertions(+), 39 deletions(-)
---
diff --git a/LongoMatch.Drawing/CanvasObjects/CategoryObject.cs 
b/LongoMatch.Drawing/CanvasObjects/CategoryObject.cs
index 5170f20..93e982c 100644
--- a/LongoMatch.Drawing/CanvasObjects/CategoryObject.cs
+++ b/LongoMatch.Drawing/CanvasObjects/CategoryObject.cs
@@ -103,7 +103,7 @@ namespace LongoMatch.Drawing.CanvasObjects
 
                public override Color BackgroundColor {
                        get {
-                               return Tagger.BackgroundColor;
+                               return Button.BackgroundColor;
                        }
                }
 
@@ -288,7 +288,7 @@ namespace LongoMatch.Drawing.CanvasObjects
                public override void ClickReleased ()
                {
                        if (editClicked && !moved && EditButtonTagsEvent != null) {
-                               EditButtonTagsEvent (Tagger);
+                               EditButtonTagsEvent (Button);
                        } else if (cancelClicked) {
                                Clear ();
                        } else if (emitEvent) {
diff --git a/LongoMatch.Drawing/CanvasObjects/TaggerObject.cs 
b/LongoMatch.Drawing/CanvasObjects/DashboardButtonObject.cs
similarity index 81%
rename from LongoMatch.Drawing/CanvasObjects/TaggerObject.cs
rename to LongoMatch.Drawing/CanvasObjects/DashboardButtonObject.cs
index 8b51064..1920430 100644
--- a/LongoMatch.Drawing/CanvasObjects/TaggerObject.cs
+++ b/LongoMatch.Drawing/CanvasObjects/DashboardButtonObject.cs
@@ -25,43 +25,43 @@ using LongoMatch.Core.Handlers;
 
 namespace LongoMatch.Drawing.CanvasObjects
 {
-       public class TaggerObject: ButtonObject, ICanvasSelectableObject
+       public class DashboardButtonObject: ButtonObject, ICanvasSelectableObject
        {
 
-               public TaggerObject (DashboardButton tagger)
+               public DashboardButtonObject (DashboardButton tagger)
                {
-                       Tagger = tagger;
+                       Button = tagger;
                }
 
-               public DashboardButton Tagger {
+               public DashboardButton Button {
                        get;
                        set;
                }
 
                public override Point Position {
                        get {
-                               return Tagger.Position;
+                               return Button.Position;
                        }
                        set {
-                               Tagger.Position = value;
+                               Button.Position = value;
                        }
                }
 
                public override double Width {
                        get {
-                               return Tagger.Width;
+                               return Button.Width;
                        }
                        set {
-                               Tagger.Width = (int)value;
+                               Button.Width = (int)value;
                        }
                }
 
                public override double Height {
                        get {
-                               return Tagger.Height;
+                               return Button.Height;
                        }
                        set {
-                               Tagger.Height = (int)value;
+                               Button.Height = (int)value;
                        }
                }
 
@@ -72,37 +72,37 @@ namespace LongoMatch.Drawing.CanvasObjects
 
                public override Color BackgroundColor {
                        get {
-                               return Tagger.BackgroundColor;
+                               return Button.BackgroundColor;
                        }
                }
 
                public override Color BackgroundColorActive {
                        get {
-                               return Tagger.DarkColor;
+                               return Button.DarkColor;
                        }
                }
 
                public override Color BorderColor {
                        get {
-                               return Tagger.BackgroundColor;
+                               return Button.BackgroundColor;
                        }
                }
 
                public override Color TextColor {
                        get {
-                               return Tagger.TextColor;
+                               return Button.TextColor;
                        }
                }
 
                public override Image BackgroundImage {
                        get {
-                               return Tagger.BackgroundImage;
+                               return Button.BackgroundImage;
                        }
                }
 
                public override Image BackgroundImageActive {
                        get {
-                               return Tagger.BackgroundImage;
+                               return Button.BackgroundImage;
                        }
                }
 
@@ -124,11 +124,11 @@ namespace LongoMatch.Drawing.CanvasObjects
                }
        }
 
-       public class TimedTaggerObject: TaggerObject
+       public class TimedTaggerObject: DashboardButtonObject
        {
                Time currentTime;
 
-               public TimedTaggerObject (TimedDashboardButton button): base (button)
+               public TimedTaggerObject (TimedDashboardButton button) : base (button)
                {
                        TimedButton = button;
                        currentTime = new Time (0);
diff --git a/LongoMatch.Drawing/CanvasObjects/TagObject.cs b/LongoMatch.Drawing/CanvasObjects/TagObject.cs
index 37b2407..59b6195 100644
--- a/LongoMatch.Drawing/CanvasObjects/TagObject.cs
+++ b/LongoMatch.Drawing/CanvasObjects/TagObject.cs
@@ -23,7 +23,7 @@ using LongoMatch.Core.Store;
 
 namespace LongoMatch.Drawing.CanvasObjects
 {
-       public class TagObject: TaggerObject
+       public class TagObject: DashboardButtonObject
        {
                static Image iconImage;
 
diff --git a/LongoMatch.Drawing/CanvasObjects/TimerObject.cs b/LongoMatch.Drawing/CanvasObjects/TimerObject.cs
index d939d70..493b88e 100644
--- a/LongoMatch.Drawing/CanvasObjects/TimerObject.cs
+++ b/LongoMatch.Drawing/CanvasObjects/TimerObject.cs
@@ -21,7 +21,7 @@ using LongoMatch.Core.Store;
 
 namespace LongoMatch.Drawing.CanvasObjects
 {
-       public class TimerObject: TaggerObject
+       public class TimerObject: DashboardButtonObject
        {
                Time currentTime;
                static Image iconImage;
diff --git a/LongoMatch.Drawing/LongoMatch.Drawing.csproj b/LongoMatch.Drawing/LongoMatch.Drawing.csproj
index 5905d62..5d83107 100644
--- a/LongoMatch.Drawing/LongoMatch.Drawing.csproj
+++ b/LongoMatch.Drawing/LongoMatch.Drawing.csproj
@@ -53,7 +53,6 @@
     <Compile Include="CanvasObjects\CounterObject.cs" />
     <Compile Include="Utils.cs" />
     <Compile Include="CanvasObjects\CategoryObject.cs" />
-    <Compile Include="CanvasObjects\TaggerObject.cs" />
     <Compile Include="CanvasObjects\ScoreObject.cs" />
     <Compile Include="CanvasObjects\CardObject.cs" />
     <Compile Include="CanvasObjects\TimerObject.cs" />
@@ -73,6 +72,7 @@
     <Compile Include="..\AssemblyInfo\AssemblyInfo.cs">
       <Link>AssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="CanvasObjects\DashboardButtonObject.cs" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
diff --git a/LongoMatch.Drawing/Makefile.am b/LongoMatch.Drawing/Makefile.am
index 4e131e3..eb259e0 100644
--- a/LongoMatch.Drawing/Makefile.am
+++ b/LongoMatch.Drawing/Makefile.am
@@ -14,6 +14,7 @@ SOURCES = ../AssemblyInfo/AssemblyInfo.cs \
        CanvasObjects/CategoryObject.cs \
        CanvasObjects/CounterObject.cs \
        CanvasObjects/CrossObject.cs \
+       CanvasObjects/DashboardButtonObject.cs \
        CanvasObjects/EllipseObject.cs \
        CanvasObjects/FieldObject.cs \
        CanvasObjects/LabelObject.cs \
@@ -27,7 +28,6 @@ SOURCES = ../AssemblyInfo/AssemblyInfo.cs \
        CanvasObjects/RectangleObject.cs \
        CanvasObjects/ScoreObject.cs \
        CanvasObjects/TagObject.cs \
-       CanvasObjects/TaggerObject.cs \
        CanvasObjects/TextObject.cs \
        CanvasObjects/TimeNodeObject.cs \
        CanvasObjects/TimelineObject.cs \
diff --git a/LongoMatch.Drawing/Widgets/DashboardCanvas.cs b/LongoMatch.Drawing/Widgets/DashboardCanvas.cs
index 3e4b7e2..d623287 100644
--- a/LongoMatch.Drawing/Widgets/DashboardCanvas.cs
+++ b/LongoMatch.Drawing/Widgets/DashboardCanvas.cs
@@ -101,7 +101,7 @@ namespace LongoMatch.Drawing.Widgets
                                modeChanged = true;
                                tagMode = value;
                                ObjectsCanMove = tagMode == TagMode.Edit;
-                               foreach (TaggerObject to in Objects) {
+                               foreach (DashboardButtonObject to in Objects) {
                                        to.Mode = value;
                                }
                                ClearSelection ();
@@ -124,7 +124,7 @@ namespace LongoMatch.Drawing.Widgets
 
                public void Click (DashboardButton b, Tag tag = null)
                {
-                       TaggerObject co = Objects.OfType<TaggerObject> ().FirstOrDefault (o => o.Tagger == b);
+                       DashboardButtonObject co = Objects.OfType<DashboardButtonObject> ().FirstOrDefault (o 
=> o.Button == b);
                        if (tag != null && co is CategoryObject) {
                                (co as CategoryObject).ClickTag (tag);
                        } else {
@@ -134,7 +134,7 @@ namespace LongoMatch.Drawing.Widgets
 
                public void RedrawButton (DashboardButton b)
                {
-                       TaggerObject co = Objects.OfType<TaggerObject>().FirstOrDefault (o => o.Tagger == b);
+                       DashboardButtonObject co = Objects.OfType<DashboardButtonObject> ().FirstOrDefault (o 
=> o.Button == b);
                        if (co != null) {
                                co.ReDraw ();
                        }
@@ -142,14 +142,14 @@ namespace LongoMatch.Drawing.Widgets
 
                public void Refresh (DashboardButton b = null)
                {
-                       TaggerObject to;
+                       DashboardButtonObject to;
                        
                        if (Template == null) {
                                return;
                        }
                        
                        LoadTemplate ();
-                       to = (TaggerObject)Objects.FirstOrDefault (o => (o as TaggerObject).Tagger == b);
+                       to = (DashboardButtonObject)Objects.FirstOrDefault (o => (o as 
DashboardButtonObject).Button == b);
                        if (to != null) {
                                UpdateSelection (new Selection (to, SelectionPosition.All, 0));
                        }
@@ -163,8 +163,8 @@ namespace LongoMatch.Drawing.Widgets
                        
                        sel = Selections.LastOrDefault ();
                        if (sel != null) {
-                               TaggerObject to = sel.Drawable as TaggerObject;
-                               ShowMenuEvent (to.Tagger, null);
+                               DashboardButtonObject to = sel.Drawable as DashboardButtonObject;
+                               ShowMenuEvent (to.Button, null);
                        }
                }
 
@@ -179,7 +179,7 @@ namespace LongoMatch.Drawing.Widgets
                {
                        List<DashboardButton> taggers;
                        
-                       taggers = sel.Select (s => (s.Drawable as TaggerObject).Tagger).ToList ();
+                       taggers = sel.Select (s => (s.Drawable as DashboardButtonObject).Button).ToList ();
                        if (TagMode == TagMode.Edit) {
                                if (TaggersSelectedEvent != null) {
                                        TaggersSelectedEvent (taggers);
@@ -194,12 +194,12 @@ namespace LongoMatch.Drawing.Widgets
                        
                        if (sel != null && moved) {
                                int i = Constants.CATEGORY_TPL_GRID;
-                               DashboardButton tb = (sel.Drawable as TaggerObject).Tagger;
+                               DashboardButton tb = (sel.Drawable as DashboardButtonObject).Button;
                                tb.Position.X = Utils.Round (tb.Position.X, i);
                                tb.Position.Y = Utils.Round (tb.Position.Y, i);
                                tb.Width = (int)Utils.Round (tb.Width, i);
                                tb.Height = (int)Utils.Round (tb.Height, i);
-                               (sel.Drawable as TaggerObject).ResetDrawArea ();
+                               (sel.Drawable as DashboardButtonObject).ResetDrawArea ();
                                widget.ReDraw ();
                        }
 
@@ -305,7 +305,7 @@ namespace LongoMatch.Drawing.Widgets
                        }
                        if (modeChanged) {
                                modeChanged = false;
-                               foreach (TaggerObject to in Objects) {
+                               foreach (DashboardButtonObject to in Objects) {
                                        to.ResetDrawArea ();
                                }
                        }
@@ -314,14 +314,14 @@ namespace LongoMatch.Drawing.Widgets
 
                void HandleTaggerClickedEvent (ICanvasObject co)
                {
-                       TaggerObject tagger;
+                       DashboardButtonObject tagger;
                        EventButton button;
                        Time start = null, stop = null, eventTime = null;
                        List<Tag> tags = null;
                        PenaltyCard card = null;
                        Score score = null;
                        
-                       tagger = co as TaggerObject;
+                       tagger = co as DashboardButtonObject;
                        
                        if (tagger is TagObject) {
                                TagObject tag = tagger as TagObject;
@@ -336,11 +336,11 @@ namespace LongoMatch.Drawing.Widgets
                                return;
                        }
 
-                       if (NewTagEvent == null || !(tagger.Tagger is EventButton)) {
+                       if (NewTagEvent == null || !(tagger.Button is EventButton)) {
                                return;
                        }
 
-                       button = tagger.Tagger as EventButton;
+                       button = tagger.Button as EventButton;
                        
                        if (TagMode == TagMode.Edit) {
                                return;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]