diff options
| author | jpbruyere <jp.bruyere@hotmail.com> | 2016-08-19 22:44:48 +0200 |
|---|---|---|
| committer | jpbruyere <jp.bruyere@hotmail.com> | 2016-09-01 12:44:38 +0200 |
| commit | befffb69eaebf2e607d88cd3ffc956a708d5734e (patch) | |
| tree | 5b28b58db0171f026e1ea3681fb86b005b4f8c81 /src | |
| parent | 9c3fd3b6b218de51177bef7d481e411e365b6ef3 (diff) | |
Menu and MenuItem classes, templates, styles and tests
modifié : Crow.csproj
modifié : Default.style
modifié : Style.cs
nouveau fichier : Templates/Menu.template
nouveau fichier : Templates/MenuItem.template
modifié : Tests/Interfaces/TemplatedGroup/0.crow
nouveau fichier : Tests/Interfaces/TemplatedGroup/1.crow
nouveau fichier : Tests/Interfaces/TemplatedGroup/2.crow
modifié : Tests/Tests.csproj
nouveau fichier : src/GraphicObjects/Menu.cs
nouveau fichier : src/GraphicObjects/MenuItem.cs
modifié : src/GraphicObjects/TemplatedGroup.cs
Diffstat (limited to 'src')
| -rw-r--r-- | src/GraphicObjects/Menu.cs | 56 | ||||
| -rw-r--r-- | src/GraphicObjects/MenuItem.cs | 71 | ||||
| -rw-r--r-- | src/GraphicObjects/TemplatedGroup.cs | 15 | ||||
| -rw-r--r-- | src/Style.cs | 2 |
4 files changed, 142 insertions, 2 deletions
diff --git a/src/GraphicObjects/Menu.cs b/src/GraphicObjects/Menu.cs new file mode 100644 index 00000000..561db65c --- /dev/null +++ b/src/GraphicObjects/Menu.cs @@ -0,0 +1,56 @@ +// +// Menu.cs +// +// Author: +// Jean-Philippe Bruyère <jp.bruyere@hotmail.com> +// +// Copyright (c) 2016 jp +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +using System; +using System.Xml.Serialization; +using System.ComponentModel; + +namespace Crow +{ + public class Menu : TemplatedGroup + { + Orientation orientation; + + [XmlAttributeAttribute()][DefaultValue(Orientation.Horizontal)] + public virtual Orientation Orientation { + get { return orientation; } + set { + if (orientation == value) + return; + orientation = value; + NotifyValueChanged ("Orientation", orientation); + } + } + + public Menu () : base() + { + } + + public override void AddItem (GraphicObject g) + { + base.AddItem (g); + + if (orientation == Orientation.Horizontal) + g.NotifyValueChanged ("Orientation", Alignment.Bottom); + else + g.NotifyValueChanged ("Orientation", Alignment.Right); + } + } +} diff --git a/src/GraphicObjects/MenuItem.cs b/src/GraphicObjects/MenuItem.cs new file mode 100644 index 00000000..591be2b0 --- /dev/null +++ b/src/GraphicObjects/MenuItem.cs @@ -0,0 +1,71 @@ +// +// MenuItem.cs +// +// Author: +// Jean-Philippe Bruyère <jp.bruyere@hotmail.com> +// +// Copyright (c) 2016 jp +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +using System; +using System.Xml.Serialization; +using System.ComponentModel; + +namespace Crow +{ + public class MenuItem : TemplatedGroup + { + #region CTOR + public MenuItem () : base() {} + #endregion + +// public event EventHandler Pop; +// public event EventHandler Unpop; + + string caption; + + [XmlAttributeAttribute][DefaultValue("MenuItem")] + public string Caption { + get { return caption; } + set { + if (caption == value) + return; + caption = value; + NotifyValueChanged ("Caption", caption); + } + } +// [XmlIgnore] +// public virtual Alignment Orientation { +// get { return Parent is Menu ? (Parent as Menu).Orientation : (Parent as MenuItem); } +// } + + Menu MenuRoot { + get { + ILayoutable tmp = Parent; + while (tmp != null) { + if (tmp is Menu) + return tmp as Menu; + tmp = tmp.Parent; + } + return null; + } + } + + public override void AddItem (GraphicObject g) + { + base.AddItem (g); + g.NotifyValueChanged ("Orientation", Alignment.Right); + } + } +} diff --git a/src/GraphicObjects/TemplatedGroup.cs b/src/GraphicObjects/TemplatedGroup.cs index 12448b82..cee4adea 100644 --- a/src/GraphicObjects/TemplatedGroup.cs +++ b/src/GraphicObjects/TemplatedGroup.cs @@ -38,7 +38,7 @@ namespace Crow public virtual void AddItem(GraphicObject g){ items.AddChild (g); - g.LogicalParent = this; + //g.LogicalParent = this; } public virtual void RemoveItem(GraphicObject g) { @@ -82,6 +82,19 @@ namespace Crow } return false; } +// public override void ClearBinding () +// { +// if (items != null) +// items.ClearBinding (); +// +// base.ClearBinding (); +// } +// public override void ResolveBindings () +// { +// base.ResolveBindings (); +// if (items != null) +// items.ResolveBindings (); +// } #endregion #region IXmlSerialisation Overrides diff --git a/src/Style.cs b/src/Style.cs index 5824e735..0ca56499 100644 --- a/src/Style.cs +++ b/src/Style.cs @@ -25,7 +25,7 @@ namespace Crow { public class Style : Dictionary<string, object> { - public Dictionary<string, Style> SubStyles; + public Dictionary<string, Style> SubStyles;//TODO:implement substyles for all tags inside a style public Style () : base() { } |