diff options
| -rw-r--r-- | Crow.csproj | 8 | ||||
| -rw-r--r-- | Default.style | 14 | ||||
| -rw-r--r-- | Templates/Menu.template | 3 | ||||
| -rw-r--r-- | Templates/MenuItem.template | 17 | ||||
| -rwxr-xr-x | Tests/Interfaces/TemplatedGroup/0.crow | 22 | ||||
| -rwxr-xr-x | Tests/Interfaces/TemplatedGroup/1.crow | 7 | ||||
| -rwxr-xr-x | Tests/Interfaces/TemplatedGroup/2.crow | 25 | ||||
| -rw-r--r-- | Tests/Tests.csproj | 6 | ||||
| -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 |
12 files changed, 244 insertions, 2 deletions
diff --git a/Crow.csproj b/Crow.csproj index 570a8941..5c6cb9e3 100644 --- a/Crow.csproj +++ b/Crow.csproj @@ -141,6 +141,8 @@ <Compile Include="src\Style.cs" /> <Compile Include="src\GraphicObjects\Wrapper.cs" /> <Compile Include="src\GraphicObjects\TemplatedGroup.cs" /> + <Compile Include="src\GraphicObjects\MenuItem.cs" /> + <Compile Include="src\GraphicObjects\Menu.cs" /> </ItemGroup> <ItemGroup> <Reference Include="System" /> @@ -266,6 +268,12 @@ </EmbeddedResource> <EmbeddedResource Include="Images\Icons\Cursors\ibeam" /> <EmbeddedResource Include="Templates\treeList.crow" /> + <EmbeddedResource Include="Templates\MenuItem.template"> + <LogicalName>Crow.MenuItem.template</LogicalName> + </EmbeddedResource> + <EmbeddedResource Include="Templates\Menu.template"> + <LogicalName>Crow.Menu.template</LogicalName> + </EmbeddedResource> </ItemGroup> <ItemGroup> <None Include="README.md" /> diff --git a/Default.style b/Default.style index 8a63a276..9ddac6a9 100644 --- a/Default.style +++ b/Default.style @@ -14,6 +14,20 @@ Label { Width = Fit; Margin = 0; } +Menu { + Margin = 1; + Background = vgradient|0:DimGray|1:Onyx; + Height = Fit; + Width = Stretched; + VerticalAlignment = Top; +} +MenuItem { + Height = Fit; + Width = Fit; + Background = Transparent; + MouseEnter = {Background = Mantis;Foreground=Jet;} + MouseLeave = {Background=Transparent;Foreground=LightGray;}; +} MessageBox { Width=200; Title=MessageBox; diff --git a/Templates/Menu.template b/Templates/Menu.template new file mode 100644 index 00000000..facc1892 --- /dev/null +++ b/Templates/Menu.template @@ -0,0 +1,3 @@ +<?xml version="1.0"?> +<HorizontalStack Name="ItemsContainer" Margin="2" Background="{./Background}" + Width="{./WidthPolicy}" Height="{./HeightPolicy}"/> diff --git a/Templates/MenuItem.template b/Templates/MenuItem.template new file mode 100644 index 00000000..86b05be6 --- /dev/null +++ b/Templates/MenuItem.template @@ -0,0 +1,17 @@ +<?xml version="1.0"?> +<Popper Caption="{./Caption}" Background="{./Background}" PopDirection="{./Orientation}" + Foreground = "{./Foreground}" + Unpop = "{Foreground=LightGray;Background=Transparent}"> + <Template> + <Label Text="{./Caption}" + MinimumSize = "120,0" + Margin="3" TextAlignment="Left" + Height="{./HeightPolicy}" Width="{./WidthPolicy}" + Font="{./Font}" + Background="{./Background}" + Foreground="{./Foreground}"/> + </Template> + <Border Foreground="LightGray" Fit="true"> + <VerticalStack Name="ItemsContainer" Margin="2" Fit="true" Background="Onyx"/> + </Border> +</Popper> diff --git a/Tests/Interfaces/TemplatedGroup/0.crow b/Tests/Interfaces/TemplatedGroup/0.crow index 9c7bb705..09b4bd49 100755 --- a/Tests/Interfaces/TemplatedGroup/0.crow +++ b/Tests/Interfaces/TemplatedGroup/0.crow @@ -1 +1,23 @@ <?xml version="1.0"?> +<Menu> + <MenuItem Caption="File"> + <MenuItem Caption="New"/> + <MenuItem Caption="Open"/> + <MenuItem Caption="Save"/> + <MenuItem Caption="Quit"/> + </MenuItem> + <MenuItem Caption="Edit"> + <MenuItem Caption="Cut"/> + <MenuItem Caption="Copy"/> + <MenuItem Caption="Paste"/> + <MenuItem Caption="Special"> + <MenuItem Caption="Cut"/> + <MenuItem Caption="Copy"/> + <MenuItem Caption="Paste"/> + </MenuItem> + </MenuItem> + <MenuItem Caption="Help"> + <MenuItem Caption="About"/> + <MenuItem Caption="Help"/> + </MenuItem> +</Menu>
\ No newline at end of file diff --git a/Tests/Interfaces/TemplatedGroup/1.crow b/Tests/Interfaces/TemplatedGroup/1.crow new file mode 100755 index 00000000..eb857f98 --- /dev/null +++ b/Tests/Interfaces/TemplatedGroup/1.crow @@ -0,0 +1,7 @@ +<?xml version="1.0"?> +<MenuItem Caption="File"> + <MenuItem Caption="New"/> + <MenuItem Caption="Open"/> + <MenuItem Caption="Save"/> + <MenuItem Caption="Quit"/> +</MenuItem> diff --git a/Tests/Interfaces/TemplatedGroup/2.crow b/Tests/Interfaces/TemplatedGroup/2.crow new file mode 100755 index 00000000..5e5d8940 --- /dev/null +++ b/Tests/Interfaces/TemplatedGroup/2.crow @@ -0,0 +1,25 @@ +<?xml version="1.0"?> +<Container> +<MenuItem Caption="Menu"> + <MenuItem Caption="File"> + <MenuItem Caption="New"></MenuItem> + <MenuItem Caption="Open"></MenuItem> + <MenuItem Caption="Save"></MenuItem> + <MenuItem Caption="Quit"></MenuItem> + </MenuItem> + <MenuItem Caption="Edit"> + <MenuItem Caption="Cut"/> + <MenuItem Caption="Copy"/> + <MenuItem Caption="Paste"/> + <MenuItem Caption="Special"> + <MenuItem Caption="Cut"/> + <MenuItem Caption="Copy"/> + <MenuItem Caption="Paste"/> + </MenuItem> + </MenuItem> + <MenuItem Caption="Help"> + <MenuItem Caption="About"/> + <MenuItem Caption="Help"/> + </MenuItem> +</MenuItem> +</Container>
\ No newline at end of file diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj index 566abf23..1095bd6a 100644 --- a/Tests/Tests.csproj +++ b/Tests/Tests.csproj @@ -295,6 +295,12 @@ <None Include="Interfaces\TemplatedGroup\0.crow"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </None> + <None Include="Interfaces\TemplatedGroup\1.crow"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="Interfaces\TemplatedGroup\2.crow"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> </ItemGroup> <ItemGroup> <Folder Include="Interfaces\" /> 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() { } |