Renamed SimpleDialog to CustomDialog

MahApps · Oct 27, 2014 · d1abc0b · d1abc0b
1 parent 69e2c12
commit d1abc0b
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 30 deletions.
diff --git a/MahApps.Metro/Controls/Dialogs/BaseMetroDialog.cs b/MahApps.Metro/Controls/Dialogs/BaseMetroDialog.cs
@@ -14,7 +14,7 @@ namespace MahApps.Metro.Controls.Dialogs
     /// The base class for dialogs.
     ///
     /// You probably don't want to use this class, if you want to add arbitrary content to your dialog, 
-    /// use the <see cref="SimpleDialog"/> class.
+    /// use the <see cref="CustomDialog"/> class.
     /// </summary>
     public abstract class BaseMetroDialog : ContentControl
     {

diff --git a/MahApps.Metro/Controls/Dialogs/CustomDialog.cs b/MahApps.Metro/Controls/Dialogs/CustomDialog.cs
@@ -0,0 +1,8 @@
+namespace MahApps.Metro.Controls.Dialogs
+{
+    /// <summary>
+    /// An implementation of BaseMetroDialog allowing arbitrary content.
+    /// </summary>
+    public class CustomDialog : BaseMetroDialog
+    { }
+}
diff --git a/MahApps.Metro/Controls/Dialogs/SimpleDialog.cs b/MahApps.Metro/Controls/Dialogs/SimpleDialog.cs
diff --git a/MahApps.Metro/MahApps.Metro.NET45.csproj b/MahApps.Metro/MahApps.Metro.NET45.csproj
@@ -92,14 +92,14 @@
     <Compile Include="Controls\CustomValidationPopup.cs" />
     <Compile Include="Controls\DataGridNumericUpDownColumn.cs" />
     <Compile Include="Controls\Dialogs\BaseMetroDialog.cs" />
+    <Compile Include="Controls\Dialogs\CustomDialog.cs" />
     <Compile Include="Controls\Dialogs\DialogManager.cs" />
     <Compile Include="Controls\Dialogs\DialogStateChangedEventArgs.cs" />
     <Compile Include="Controls\Dialogs\InputDialog.cs" />
     <Compile Include="Controls\Dialogs\LoginDialog.cs" />
     <Compile Include="Controls\Dialogs\MessageDialog.cs" />
     <Compile Include="Controls\Dialogs\ProgressDialog.cs" />
     <Compile Include="Controls\Dialogs\ProgressDialogController.cs" />
-    <Compile Include="Controls\Dialogs\SimpleDialog.cs" />
     <Compile Include="Controls\DropDownButton.cs" />
     <Compile Include="Controls\FlipView.cs" />
     <Compile Include="Controls\Flyout.cs" />

diff --git a/MahApps.Metro/MahApps.Metro.csproj b/MahApps.Metro/MahApps.Metro.csproj
@@ -100,7 +100,7 @@
     <Compile Include="Controls\Dialogs\LoginDialog.cs" />
     <Compile Include="Controls\Dialogs\ProgressDialog.cs" />
     <Compile Include="Controls\Dialogs\ProgressDialogController.cs" />
-    <Compile Include="Controls\Dialogs\SimpleDialog.cs" />
+    <Compile Include="Controls\Dialogs\CustomDialog.cs" />
     <Compile Include="Controls\DropDownButton.cs" />
     <Compile Include="Controls\FlipView.cs" />
     <Compile Include="Controls\Flyout.cs" />

diff --git a/Mahapps.Metro.Tests/CustomDialogTest.cs b/Mahapps.Metro.Tests/CustomDialogTest.cs
@@ -16,7 +16,7 @@ public async Task ReceivesDataContext()
 
             var window = await WindowHelpers.CreateInvisibleWindowAsync<DialogWindow>();
             var vm = new TheViewModel();
-            var dialog = (SimpleDialog) window.Resources["CustomDialog"];
+            var dialog = (CustomDialog) window.Resources["CustomDialog"];
 
             await window.ShowMetroDialogAsync(dialog);
 

diff --git a/Mahapps.Metro.Tests/DialogWindow.xaml b/Mahapps.Metro.Tests/DialogWindow.xaml
@@ -8,8 +8,8 @@
              mc:Ignorable="d"
              d:DesignHeight="300" d:DesignWidth="300">
     <controls:MetroWindow.Resources>
-        <dialogs:SimpleDialog x:Key="CustomDialog">
+        <dialogs:CustomDialog x:Key="CustomDialog">
             <TextBlock x:Name="TheDialogBody" Text="{Binding Path=Text}" />
-        </dialogs:SimpleDialog>
+        </dialogs:CustomDialog>
     </controls:MetroWindow.Resources>
 </controls:MetroWindow>
diff --git a/samples/MetroDemo/MainWindow.xaml b/samples/MetroDemo/MainWindow.xaml
@@ -64,11 +64,11 @@
                         Value="{Binding Name, Mode=OneWay}" />
             </Style>
 
-            <Dialog:SimpleDialog x:Key="SimpleDialogTest"
+            <Dialog:CustomDialog x:Key="CustomDialogTest"
                                  Title="This dialog allows arbitrary content. It will close in 5 seconds."
-                                 x:Name="SimpleTestDialog">
+                                 x:Name="CustomTestDialog">
                 <TextBlock Height="30" Text="{Binding Artists[0].Name}" Foreground="{DynamicResource AccentBrush}" />
-            </Dialog:SimpleDialog>
+            </Dialog:CustomDialog>
 
         </ResourceDictionary>
     </Window.Resources>
@@ -154,10 +154,10 @@
                               Header="Show MessageDialog" />
                     <MenuItem Click="ShowProgressDialog"
                               Header="Show ProgressDialog" />
-                    <MenuItem Click="ShowSimpleDialog"
-                              Header="Show SimpleDialog" />
+                    <MenuItem Click="ShowCustomDialog"
+                              Header="Show CustomDialog" />
                     <MenuItem Click="ShowDialogOutside"
-                              Header="Show SimpleDialog Externally" />
+                              Header="Show CustomDialog Externally" />
                 </MenuItem>
                 <MenuItem Header="Window">
                     <MenuItem IsCheckable="True" Header="Ignore taskbar on maximize" Click="IgnoreTaskBar_Click"/>

diff --git a/samples/MetroDemo/MainWindow.xaml.cs b/samples/MetroDemo/MainWindow.xaml.cs
@@ -78,7 +78,7 @@ private void LaunchRibbonDemo(object sender, RoutedEventArgs e)
 
         private async void ShowDialogOutside(object sender, RoutedEventArgs e)
         {
-            var dialog = (BaseMetroDialog)this.Resources["SimpleDialogTest"];
+            var dialog = (BaseMetroDialog)this.Resources["CustomDialogTest"];
             dialog = dialog.ShowDialogExternally();
 
             await TaskEx.Delay(5000);
@@ -108,11 +108,11 @@ await this.ShowMessageAsync("Result", "You said: " + (result == MessageDialogRes
                     Environment.NewLine + Environment.NewLine + "This dialog will follow the Use Accent setting."));
         }
 
-        private async void ShowSimpleDialog(object sender, RoutedEventArgs e)
+        private async void ShowCustomDialog(object sender, RoutedEventArgs e)
         {
             this.MetroDialogOptions.ColorScheme = UseAccentForDialogsMenuItem.IsChecked ? MetroDialogColorScheme.Accented : MetroDialogColorScheme.Theme;
 
-            var dialog = (BaseMetroDialog)this.Resources["SimpleDialogTest"];
+            var dialog = (BaseMetroDialog)this.Resources["CustomDialogTest"];
 
             await this.ShowMetroDialogAsync(dialog);