Continue for last commit.

1 files changed, 7 insertions, 35 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DialogWindow.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DialogWindow.xaml.cs
index 31dd3d644..d1bc0564b 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DialogWindow.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Notifications/DialogWindow.xaml.cs
@@ -20,51 +20,23 @@ namespace Tango.MachineStudio.UI.Windows
     /// <summary>
     /// Interaction logic for DialogWindow.xaml
     /// </summary>
-    public partial class DialogWindow : MetroWindow
+    public partial class DialogWindow : Window
     {
         public DialogWindow()
         {
             InitializeComponent();
         }
 
-
-
-        public String InnerTitle
-        {
-            get { return (String)GetValue(InnerTitleProperty); }
-            set { SetValue(InnerTitleProperty, value); }
-        }
-        public static readonly DependencyProperty InnerTitleProperty =
-            DependencyProperty.Register("InnerTitle", typeof(String), typeof(DialogWindow), new PropertyMetadata(null));
-
-
-
-        public PackIconKind IconKind
+        public FrameworkElement InnerContent
         {
-            get { return (PackIconKind)GetValue(IconKindProperty); }
-            set { SetValue(IconKindProperty, value); }
+            get { return (FrameworkElement)GetValue(InnerContentProperty); }
+            set { SetValue(InnerContentProperty, value); }
         }
-        public static readonly DependencyProperty IconKindProperty =
-            DependencyProperty.Register("IconKind", typeof(PackIconKind), typeof(DialogWindow), new PropertyMetadata(PackIconKind.Information));
-
 
+        // Using a DependencyProperty as the backing store for InnerContent.  This enables animation, styling, binding, etc...
+        public static readonly DependencyProperty InnerContentProperty =
+            DependencyProperty.Register("InnerContent", typeof(FrameworkElement), typeof(DialogWindow), new PropertyMetadata(null));
 
 
-        public DialogWindow(FrameworkElement content) : this()
-        {
-            presenter.Content = content;
-        }
-
-        private void OnOKClicked(object sender, RoutedEventArgs e)
-        {
-            DialogResult = true;
-            Close();
-        }
-
-        private void OnCancelClicked(object sender, RoutedEventArgs e)
-        {
-            DialogResult = false;
-            Close();
-        }
     }
 }