message box events ok cancel

diff --git a/Crow.csproj b/Crow.csproj
index 6c98dc1208ad58483119f66b9fbb01a301a4a642..366d2ee8d00be2dd00f03975749f61adcc5d2e9a 100644 (file)
--- a/Crow.csproj
+++ b/Crow.csproj
@@ -242,6 +242,7 @@
     <EmbeddedResource Include="Styles\ComboBox.style" />
     <EmbeddedResource Include="Styles\Label.style" />
     <EmbeddedResource Include="Styles\Spinner.style" />
+    <EmbeddedResource Include="Styles\MessageBox.style" />
   </ItemGroup>
   <ItemGroup>
     <None Include="README.md" />

diff --git a/Styles/MessageBox.style b/Styles/MessageBox.style
new file mode 100644 (file)
index 0000000..046db0e
--- /dev/null
+++ b/Styles/MessageBox.style
@@ -0,0 +1,4 @@
+Width=260
+Title=MessageBox
+Focusable=true
+MinimumSize=150;80

diff --git a/Templates/MessageBox.goml b/Templates/MessageBox.goml
index fe6ce620e403f4b8d68b673a0f3f6cdc87fa4121..68d1fa823b978c113d37ac58e2d414b0bfbae9e0 100644 (file)
--- a/Templates/MessageBox.goml
+++ b/Templates/MessageBox.goml
@@ -23,8 +23,8 @@
                </HorizontalStack>
                <HorizontalStack Height="-1" Width="{../../../WidthPolicy}" Margin="3">
                        <GraphicObject Height="5"/>
-                       <Button Caption="Ok"/>
-                       <Button Caption="Cancel"/>
+                       <Button Caption="Ok" MouseClick="onOkButtonClick"/>
+                       <Button Caption="Cancel" MouseClick="onCancelButtonClick"/>
                </HorizontalStack>
        </VerticalStack>
 </Border>

diff --git a/src/GraphicObjects/MessageBox.cs b/src/GraphicObjects/MessageBox.cs
index 18c4afb3a89013588486a1c599c50d873decbdbe..cae43d9f134a4dbb4878cd2335d1935726b948b9 100644 (file)
--- a/src/GraphicObjects/MessageBox.cs
+++ b/src/GraphicObjects/MessageBox.cs
@@ -23,25 +23,17 @@ using System.ComponentModel;
 
 namespace Crow
 {
+       [DefaultStyle("#Crow.Styles.MessageBox.style")]
        [DefaultTemplate("#Crow.Templates.MessageBox.goml")]
        public class MessageBox : Window
        {
                public MessageBox ():base(){}
 
-               string title;
                string message;
 
-               [XmlAttributeAttribute][DefaultValue("Message box")]
-               public virtual string Title
-               {
-                       get { return title; }
-                       set {
-                               if (title == value)
-                                       return;
-                               title = value;
-                               NotifyValueChanged ("Title", title);
-                       }
-               }
+               public event EventHandler Ok;
+               public event EventHandler Cancel;
+
                [XmlAttributeAttribute][DefaultValue("Informations")]
                public virtual string Message
                {
@@ -53,30 +45,16 @@ namespace Crow
                                NotifyValueChanged ("Message", message);
                        }
                }
-               #region GraphicObject overrides
-               [XmlAttributeAttribute][DefaultValue(250)]
-               public override int Width {
-                       get { return base.Width; }
-                       set { base.Width = value; }
-               }
-//             [XmlAttributeAttribute][DefaultValue(80)]
-//             public override int Height {
-//                     get { return base.Height; }
-//                     set { base.Height = value; }
-//             }
-               [XmlAttributeAttribute()][DefaultValue(true)]
-               public override bool Focusable
+
+               void onOkButtonClick (object sender, EventArgs e)
                {
-                       get { return base.Focusable; }
-                       set { base.Focusable = value; }
+                       Ok.Raise (this, null);
                }
-               [XmlAttributeAttribute()][DefaultValue("150;80")]
-               public override Size MinimumSize
+               void onCancelButtonClick (object sender, EventArgs e)
                {
-                       get { return base.MinimumSize; }
-                       set { base.MinimumSize = value; }
+                       Ok.Raise (this, null);
                }
-               #endregion
+
        }
 }