From 0780d98b270c5a2b15d2c7e2a8f6a5624d6d3d81 Mon Sep 17 00:00:00 2001
From: Fernando <2480661+fernandreu@users.noreply.github.com>
Date: Fri, 21 Jun 2019 20:04:57 +0100
Subject: [PATCH] Finish implementing new dialog approach

---
 OfficeRibbonXEditor/App.xaml.cs               |   2 +-
 OfficeRibbonXEditor/Controls/DialogControl.cs |  77 +++++++++++++
 .../Interfaces/IContentDialog.cs              |   8 --
 .../Interfaces/IDialogService.cs              |  12 ---
 .../OfficeRibbonXEditor.csproj                |  15 ++-
 OfficeRibbonXEditor/Services/DialogService.cs |  13 ---
 .../ViewModels/AboutDialogViewModel.cs        |   5 -
 .../ViewModels/CallbackDialogViewModel.cs     |  46 ++++++++
 OfficeRibbonXEditor/ViewModels/DialogBase.cs  |  14 +--
 .../ViewModels/MainWindowViewModel.cs         |   4 +-
 .../ViewModels/SettingsDialogViewModel.cs     |   3 -
 OfficeRibbonXEditor/Views/AboutDialog.xaml    |  14 +--
 OfficeRibbonXEditor/Views/AboutDialog.xaml.cs |   4 +-
 ...allbackWindow.xaml => CallbackDialog.xaml} |  21 ++--
 ...kWindow.xaml.cs => CallbackDialog.xaml.cs} |  28 +++--
 OfficeRibbonXEditor/Views/DialogHost.xaml     |  28 ++---
 OfficeRibbonXEditor/Views/DialogHost.xaml.cs  |   2 +-
 OfficeRibbonXEditor/Views/DialogHostBase.cs   | 101 ++++++++++++++++++
 OfficeRibbonXEditor/Views/MainWindow.xaml.cs  |   6 --
 OfficeRibbonXEditor/Views/SettingsDialog.xaml |   7 +-
 .../Views/SettingsDialog.xaml.cs              |   4 +-
 .../ViewModels/MainWindowViewModelTests.cs    |  11 +-
 22 files changed, 300 insertions(+), 125 deletions(-)
 create mode 100644 OfficeRibbonXEditor/Controls/DialogControl.cs
 delete mode 100644 OfficeRibbonXEditor/Interfaces/IDialogService.cs
 delete mode 100644 OfficeRibbonXEditor/Services/DialogService.cs
 create mode 100644 OfficeRibbonXEditor/ViewModels/CallbackDialogViewModel.cs
 rename OfficeRibbonXEditor/Views/{CallbackWindow.xaml => CallbackDialog.xaml} (62%)
 rename OfficeRibbonXEditor/Views/{CallbackWindow.xaml.cs => CallbackDialog.xaml.cs} (51%)
 create mode 100644 OfficeRibbonXEditor/Views/DialogHostBase.cs

diff --git a/OfficeRibbonXEditor/App.xaml.cs b/OfficeRibbonXEditor/App.xaml.cs
index 339d0158..e3329289 100644
--- a/OfficeRibbonXEditor/App.xaml.cs
+++ b/OfficeRibbonXEditor/App.xaml.cs
@@ -34,13 +34,13 @@ public App()
             builder.RegisterType<MessageBoxService>().As<IMessageBoxService>();
             builder.RegisterType<FileDialogService>().As<IFileDialogService>();
             builder.RegisterType<VersionChecker>().As<IVersionChecker>();
-            builder.RegisterType<DialogService>().As<IDialogService>();
             builder.RegisterType<DialogProvider>().As<IDialogProvider>();
 
             builder.RegisterType<MainWindowViewModel>();
             builder.RegisterType<DialogHostViewModel>();
             builder.RegisterType<SettingsDialogViewModel>();
             builder.RegisterType<AboutDialogViewModel>();
+            builder.RegisterType<CallbackDialogViewModel>();
 
             this.container = builder.Build();
         }
diff --git a/OfficeRibbonXEditor/Controls/DialogControl.cs b/OfficeRibbonXEditor/Controls/DialogControl.cs
new file mode 100644
index 00000000..7b69a63d
--- /dev/null
+++ b/OfficeRibbonXEditor/Controls/DialogControl.cs
@@ -0,0 +1,77 @@
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+
+namespace OfficeRibbonXEditor.Controls
+{
+    public class DialogControl : UserControl
+    {
+        public static readonly DependencyProperty TitleProperty = DependencyProperty.Register(
+            nameof(Title),
+            typeof(string),
+            typeof(DialogControl));
+
+        public string Title
+        {
+            get => (string) this.GetValue(TitleProperty);
+            set => this.SetValue(TitleProperty, value);
+        }
+        
+        public static readonly DependencyProperty IconProperty = DependencyProperty.Register(
+            nameof(Icon),
+            typeof(ImageSource),
+            typeof(DialogControl));
+
+        public ImageSource Icon
+        {
+            get => (ImageSource) this.GetValue(IconProperty);
+            set => this.SetValue(IconProperty, value);
+        }
+
+        public static readonly DependencyProperty PreferredWidthProperty = DependencyProperty.Register(
+            nameof(PreferredWidth),
+            typeof(double),
+            typeof(DialogControl));
+
+        public double PreferredWidth
+        {
+            get => (double) this.GetValue(PreferredWidthProperty);
+            set => this.SetValue(PreferredWidthProperty, value);
+        }
+
+        public static readonly DependencyProperty PreferredHeightProperty = DependencyProperty.Register(
+            nameof(PreferredHeight),
+            typeof(double),
+            typeof(DialogControl));
+
+        public double PreferredHeight
+        {
+            get => (double) this.GetValue(PreferredHeightProperty);
+            set => this.SetValue(PreferredHeightProperty, value);
+        }
+
+        public static readonly DependencyProperty SizeToContentProperty = DependencyProperty.Register(
+            nameof(SizeToContent),
+            typeof(SizeToContent),
+            typeof(DialogControl),
+            new FrameworkPropertyMetadata(SizeToContent.WidthAndHeight));
+
+        public SizeToContent SizeToContent
+        {
+            get => (SizeToContent) this.GetValue(SizeToContentProperty);
+            set => this.SetValue(SizeToContentProperty, value);
+        }
+
+        public static readonly DependencyProperty ResizeModeProperty = DependencyProperty.Register(
+            nameof(ResizeMode),
+            typeof(ResizeMode),
+            typeof(DialogControl),
+            new FrameworkPropertyMetadata(ResizeMode.NoResize));
+
+        public ResizeMode ResizeMode
+        {
+            get => (ResizeMode) this.GetValue(ResizeModeProperty);
+            set => this.SetValue(ResizeModeProperty, value);
+        }
+    }
+}
diff --git a/OfficeRibbonXEditor/Interfaces/IContentDialog.cs b/OfficeRibbonXEditor/Interfaces/IContentDialog.cs
index b1ba7d4d..dddf02bd 100644
--- a/OfficeRibbonXEditor/Interfaces/IContentDialog.cs
+++ b/OfficeRibbonXEditor/Interfaces/IContentDialog.cs
@@ -2,20 +2,12 @@
 {
     using System;
     using System.ComponentModel;
-    using System.Windows;
-    using System.Windows.Media;
     using GalaSoft.MvvmLight.Command;
 
     public interface IContentDialogBase
     {
         bool Cancelled { get; }
 
-        string Title { get; }
-
-        ImageSource Icon { get; }
-
-        ResizeMode ResizeMode { get; }
-
         RelayCommand<CancelEventArgs> ClosingCommand { get; }
 
         event EventHandler Closed;
diff --git a/OfficeRibbonXEditor/Interfaces/IDialogService.cs b/OfficeRibbonXEditor/Interfaces/IDialogService.cs
deleted file mode 100644
index 37b5e66d..00000000
--- a/OfficeRibbonXEditor/Interfaces/IDialogService.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace OfficeRibbonXEditor.Interfaces
-{
-    using System.Threading.Tasks;
-
-    /// <summary>
-    /// Defines how UI view models should launch dialogs by referencing their corresponding view models
-    /// </summary>
-    public interface IDialogService
-    {
-        void ShowDialog<TDialog, TPayload>(TPayload payload) where TDialog : IContentDialog<TPayload>;
-    }
-}
diff --git a/OfficeRibbonXEditor/OfficeRibbonXEditor.csproj b/OfficeRibbonXEditor/OfficeRibbonXEditor.csproj
index c0c27b74..7ebbc4f5 100644
--- a/OfficeRibbonXEditor/OfficeRibbonXEditor.csproj
+++ b/OfficeRibbonXEditor/OfficeRibbonXEditor.csproj
@@ -152,12 +152,14 @@
     <Compile Include="..\SharedAssemblyInfo.cs">
       <Link>Properties\SharedAssemblyInfo.cs</Link>
     </Compile>
+    <Compile Include="Controls\DialogControl.cs" />
     <Compile Include="Controls\ExternalHyperlink.cs" />
     <Compile Include="Converters\InverseBooleanToVisibilityConverter.cs" />
     <Compile Include="Converters\IsNotNullConverter.cs" />
     <Compile Include="Converters\MethodToCommandConverter.cs" />
     <Compile Include="Converters\StringToVisibilityConverter.cs" />
     <Compile Include="Converters\ValueConverterGroup.cs" />
+    <Compile Include="ViewModels\CallbackDialogViewModel.cs" />
     <Compile Include="ViewModels\DialogBase.cs" />
     <Compile Include="ViewModels\AboutDialogViewModel.cs" />
     <Compile Include="Views\DialogHost.xaml.cs">
@@ -186,9 +188,7 @@
       <DependentUpon>SchemasResource.resx</DependentUpon>
     </Compile>
     <Compile Include="Services\DialogProvider.cs" />
-    <Compile Include="Services\DialogService.cs" />
     <Compile Include="Services\FileDialogService.cs" />
-    <Compile Include="Interfaces\IDialogService.cs" />
     <Compile Include="Interfaces\IFileDialogService.cs" />
     <Compile Include="Interfaces\IMessageBoxService.cs" />
     <Compile Include="Interfaces\IVersionChecker.cs" />
@@ -202,8 +202,8 @@
     <Compile Include="Views\AboutDialog.xaml.cs">
       <DependentUpon>AboutDialog.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\CallbackWindow.xaml.cs">
-      <DependentUpon>CallbackWindow.xaml</DependentUpon>
+    <Compile Include="Views\CallbackDialog.xaml.cs">
+      <DependentUpon>CallbackDialog.xaml</DependentUpon>
     </Compile>
     <Compile Include="Converters\ColorConverter.cs" />
     <Compile Include="Converters\DataTypeConverter.cs" />
@@ -212,6 +212,7 @@
     <Compile Include="ViewModels\OfficeDocumentViewModel.cs" />
     <Compile Include="ViewModels\TreeViewItemViewModel.cs" />
     <Compile Include="Models\OfficeDocument.cs" />
+    <Compile Include="Views\DialogHostBase.cs" />
     <Compile Include="Views\SettingsDialog.xaml.cs">
       <DependentUpon>SettingsDialog.xaml</DependentUpon>
     </Compile>
@@ -231,7 +232,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Views\CallbackWindow.xaml">
+    <Page Include="Views\CallbackDialog.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -350,9 +351,7 @@
     <Resource Include="Resources\Images\find_previous.png" />
     <Resource Include="Resources\Images\go_to.png" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Dialogs\" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
diff --git a/OfficeRibbonXEditor/Services/DialogService.cs b/OfficeRibbonXEditor/Services/DialogService.cs
deleted file mode 100644
index e3f69dc4..00000000
--- a/OfficeRibbonXEditor/Services/DialogService.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace OfficeRibbonXEditor.Services
-{
-    using System.Threading.Tasks;
-    using OfficeRibbonXEditor.Interfaces;
-
-    public class DialogService : IDialogService
-    {
-        public void ShowDialog<TDialog, TPayload>(TPayload payload) where TDialog : IContentDialog<TPayload>
-        {
-            throw new System.NotImplementedException();
-        }
-    }
-}
diff --git a/OfficeRibbonXEditor/ViewModels/AboutDialogViewModel.cs b/OfficeRibbonXEditor/ViewModels/AboutDialogViewModel.cs
index acea52f3..b79fd1d2 100644
--- a/OfficeRibbonXEditor/ViewModels/AboutDialogViewModel.cs
+++ b/OfficeRibbonXEditor/ViewModels/AboutDialogViewModel.cs
@@ -5,11 +5,6 @@ namespace OfficeRibbonXEditor.ViewModels
 
     public class AboutDialogViewModel : DialogBase
     {
-        public AboutDialogViewModel()
-            : base("About Office RibbonX Editor")
-        {
-        }
-
         public string AssemblyTitle
         {
             get
diff --git a/OfficeRibbonXEditor/ViewModels/CallbackDialogViewModel.cs b/OfficeRibbonXEditor/ViewModels/CallbackDialogViewModel.cs
new file mode 100644
index 00000000..27d3abf8
--- /dev/null
+++ b/OfficeRibbonXEditor/ViewModels/CallbackDialogViewModel.cs
@@ -0,0 +1,46 @@
+using OfficeRibbonXEditor.Interfaces;
+using OfficeRibbonXEditor.Models;
+
+namespace OfficeRibbonXEditor.ViewModels
+{
+
+    public class CallbackDialogViewModel : DialogBase, IContentDialog<string>
+    {
+        private VbaLexer lexer;
+
+        private string code;
+
+        public VbaLexer Lexer
+        {
+            get => this.lexer;
+            set
+            {
+                if (!this.Set(ref this.lexer, value) || this.Code == null)
+                {
+                    return;
+                }
+
+                this.Lexer.Editor.Text = this.Code;
+            }
+        }
+
+        public string Code
+        {
+            get => this.code;
+            set
+            {
+                if (!this.Set(ref this.code, value) || this.Lexer == null)
+                {
+                    return;
+                }
+
+                this.Lexer.Editor.Text = this.Code;
+            }
+        }
+
+        public void OnLoaded(string payload)
+        {
+            this.Code = payload;
+        }
+    }
+}
diff --git a/OfficeRibbonXEditor/ViewModels/DialogBase.cs b/OfficeRibbonXEditor/ViewModels/DialogBase.cs
index 74e21d52..fe2b34ed 100644
--- a/OfficeRibbonXEditor/ViewModels/DialogBase.cs
+++ b/OfficeRibbonXEditor/ViewModels/DialogBase.cs
@@ -1,33 +1,21 @@
 using System;
 using System.ComponentModel;
-using System.Drawing;
-using System.Windows;
-using System.Windows.Media;
 using GalaSoft.MvvmLight;
 using GalaSoft.MvvmLight.Command;
-using OfficeRibbonXEditor.Extensions;
 using OfficeRibbonXEditor.Interfaces;
 
 namespace OfficeRibbonXEditor.ViewModels
 {
     public class DialogBase : ViewModelBase, IContentDialogBase
     {
-        public DialogBase(string title, Bitmap icon = null)
+        public DialogBase()
         {
-            this.Title = title;
-            this.Icon = icon?.AsBitmapImage();
             this.ClosingCommand = new RelayCommand<CancelEventArgs>(this.ExecuteClosingCommand);
             this.CloseCommand = new RelayCommand(this.Close);
         }
 
         public bool Cancelled { get; protected set; } = true;
 
-        public virtual ResizeMode ResizeMode => ResizeMode.NoResize;
-
-        public string Title { get; }
-
-        public ImageSource Icon { get; }
-
         public RelayCommand<CancelEventArgs> ClosingCommand { get; }
 
         public RelayCommand CloseCommand { get; }
diff --git a/OfficeRibbonXEditor/ViewModels/MainWindowViewModel.cs b/OfficeRibbonXEditor/ViewModels/MainWindowViewModel.cs
index 8aaf82ac..d0281de1 100644
--- a/OfficeRibbonXEditor/ViewModels/MainWindowViewModel.cs
+++ b/OfficeRibbonXEditor/ViewModels/MainWindowViewModel.cs
@@ -120,8 +120,6 @@ public MainWindowViewModel(IMessageBoxService messageBoxService, IFileDialogServ
 
         public event EventHandler<DataEventArgs<IContentDialogBase>> LaunchingDialog; 
 
-        public event EventHandler<DataEventArgs<string>> ShowCallbacks;
-
         /// <summary>
         /// This event will be fired when the contents of the editor need to be updated
         /// </summary>
@@ -864,7 +862,7 @@ private void ExecuteGenerateCallbacksCommand()
                     return;
                 }
                 
-                this.ShowCallbacks?.Invoke(this, new DataEventArgs<string> { Data = callbacks.ToString() });
+                this.LaunchDialog<CallbackDialogViewModel, string>(callbacks.ToString());
             }
             catch (Exception ex)
             {
diff --git a/OfficeRibbonXEditor/ViewModels/SettingsDialogViewModel.cs b/OfficeRibbonXEditor/ViewModels/SettingsDialogViewModel.cs
index 3d6caf01..7aecb8b4 100644
--- a/OfficeRibbonXEditor/ViewModels/SettingsDialogViewModel.cs
+++ b/OfficeRibbonXEditor/ViewModels/SettingsDialogViewModel.cs
@@ -1,8 +1,6 @@
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Windows.Media;
 using GalaSoft.MvvmLight.Command;
-using OfficeRibbonXEditor.Extensions;
 using OfficeRibbonXEditor.Interfaces;
 using OfficeRibbonXEditor.Models;
 
@@ -28,7 +26,6 @@ public class SettingsDialogViewModel : DialogBase, IContentDialog<ScintillaLexer
         private readonly Dictionary<string, object> currentValues = new Dictionary<string, object>();
 
         public SettingsDialogViewModel()
-            : base("Settings", Resources.ImagesResource.settings)
         {
             this.ResetCommand = new RelayCommand(this.ResetToDefault);
             this.ApplyCommand = new RelayCommand(this.ApplySettings);
diff --git a/OfficeRibbonXEditor/Views/AboutDialog.xaml b/OfficeRibbonXEditor/Views/AboutDialog.xaml
index 80fcd90d..d377eb6f 100644
--- a/OfficeRibbonXEditor/Views/AboutDialog.xaml
+++ b/OfficeRibbonXEditor/Views/AboutDialog.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="OfficeRibbonXEditor.Views.AboutDialog"
+<controls:DialogControl x:Class="OfficeRibbonXEditor.Views.AboutDialog"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -6,14 +6,16 @@
         xmlns:controls="clr-namespace:OfficeRibbonXEditor.Controls"
         xmlns:viewModels="clr-namespace:OfficeRibbonXEditor.ViewModels"
         mc:Ignorable="d"
-        Width="431.296"
-        Height="374.47"
+        Title="About Office RibbonX Editor"
+        PreferredWidth="450"
+        SizeToContent="Height"
+        d:DesignWidth="{Binding PreferredWidth, RelativeSource={RelativeSource Self}}"
         d:DataContext="{d:DesignInstance viewModels:AboutDialogViewModel}">
-    <UserControl.Resources>
+    <controls:DialogControl.Resources>
         <Style TargetType="TextBlock">
             <Setter Property="FontSize" Value="12"/>
         </Style>
-    </UserControl.Resources>  
+    </controls:DialogControl.Resources>  
     <DockPanel LastChildFill="False" Margin="12">
         <TextBlock DockPanel.Dock="Top" TextWrapping="Wrap" Margin="0,2">
             <TextBlock FontWeight="Bold">Author:</TextBlock> Fernando Andreu
@@ -41,4 +43,4 @@
             <Button Content="Close" Padding="10,2" Margin="8,0,0,0" Command="{Binding CloseCommand}"/>
         </StackPanel>
     </DockPanel>
-</UserControl>
+</controls:DialogControl>
diff --git a/OfficeRibbonXEditor/Views/AboutDialog.xaml.cs b/OfficeRibbonXEditor/Views/AboutDialog.xaml.cs
index 69516906..f6d3c589 100644
--- a/OfficeRibbonXEditor/Views/AboutDialog.xaml.cs
+++ b/OfficeRibbonXEditor/Views/AboutDialog.xaml.cs
@@ -7,14 +7,14 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
-using System.Windows.Controls;
+using OfficeRibbonXEditor.Controls;
 
 namespace OfficeRibbonXEditor.Views
 {
     /// <summary>
     /// About dialog for the tool
     /// </summary>
-    public partial class AboutDialog : UserControl
+    public partial class AboutDialog : DialogControl
     {
         public AboutDialog()
         {
diff --git a/OfficeRibbonXEditor/Views/CallbackWindow.xaml b/OfficeRibbonXEditor/Views/CallbackDialog.xaml
similarity index 62%
rename from OfficeRibbonXEditor/Views/CallbackWindow.xaml
rename to OfficeRibbonXEditor/Views/CallbackDialog.xaml
index d94adb34..f1387d6f 100644
--- a/OfficeRibbonXEditor/Views/CallbackWindow.xaml
+++ b/OfficeRibbonXEditor/Views/CallbackDialog.xaml
@@ -1,15 +1,18 @@
-<Window x:Class="OfficeRibbonXEditor.Views.CallbackWindow"
+<controls:DialogControl x:Class="OfficeRibbonXEditor.Views.CallbackDialog"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:sn="http://scintillanet.codeplex.com"
         xmlns:extensions="clr-namespace:OfficeRibbonXEditor.Extensions"
-        mc:Ignorable="d"
-        Title="Callbacks Viewer" Height="450" Width="800"
-        WindowStartupLocation="CenterOwner"
-        ShowInTaskbar="False"
-        Icon="/Resources/Images/callbacks.png">
+        xmlns:controls="clr-namespace:OfficeRibbonXEditor.Controls"
+        Title="Callbacks Viewer"
+        PreferredWidth="800"
+        PreferredHeight="600"
+        ResizeMode="CanResizeWithGrip"
+        SizeToContent="Manual"
+        Icon="../Resources/Images/callbacks.png"
+        mc:Ignorable="d">
     <Grid>
         
         <sn:ScintillaWPF
@@ -17,7 +20,7 @@
             HorizontalAlignment="Stretch"
             FontFamily="Consolas"
             FontSize="{extensions:SettingBinding EditorFontSize}"
-            DataContext="{Binding SelectedItem, ElementName=DocumentView}"
-        />
+            DataContext="{Binding SelectedItem, ElementName=DocumentView}"/>
+
     </Grid>
-</Window>
+</controls:DialogControl>
diff --git a/OfficeRibbonXEditor/Views/CallbackWindow.xaml.cs b/OfficeRibbonXEditor/Views/CallbackDialog.xaml.cs
similarity index 51%
rename from OfficeRibbonXEditor/Views/CallbackWindow.xaml.cs
rename to OfficeRibbonXEditor/Views/CallbackDialog.xaml.cs
index f7b472bd..45e4abe2 100644
--- a/OfficeRibbonXEditor/Views/CallbackWindow.xaml.cs
+++ b/OfficeRibbonXEditor/Views/CallbackDialog.xaml.cs
@@ -7,24 +7,34 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
+using System.Windows;
+using OfficeRibbonXEditor.Controls;
+using OfficeRibbonXEditor.Models;
+using OfficeRibbonXEditor.ViewModels;
+
 namespace OfficeRibbonXEditor.Views
 {
-    using System.Windows;
-
-    using OfficeRibbonXEditor.Models;
 
     /// <summary>
     /// Interaction logic for CallbackWindow
     /// </summary>
-    public partial class CallbackWindow : Window
+    public partial class CallbackDialog : DialogControl
     {
-        private readonly VbaLexer lexer;
-
-        public CallbackWindow(string code)
+        public CallbackDialog()
         {
             this.InitializeComponent();
-            this.lexer = new VbaLexer { Editor = this.Editor };
-            this.Editor.Text = code;
+        }
+
+        protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs args)
+        {
+            base.OnPropertyChanged(args);
+
+            if (args.Property != DataContextProperty || !(args.NewValue is CallbackDialogViewModel model))
+            {
+                return;
+            }
+
+            model.Lexer = new VbaLexer {Editor = this.Editor};
         }
     }
 }
diff --git a/OfficeRibbonXEditor/Views/DialogHost.xaml b/OfficeRibbonXEditor/Views/DialogHost.xaml
index 7acb9b9d..4af95142 100644
--- a/OfficeRibbonXEditor/Views/DialogHost.xaml
+++ b/OfficeRibbonXEditor/Views/DialogHost.xaml
@@ -1,37 +1,25 @@
-<Window x:Class="OfficeRibbonXEditor.Views.DialogHost"
+<views:DialogHostBase x:Class="OfficeRibbonXEditor.Views.DialogHost"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:viewModels="clr-namespace:OfficeRibbonXEditor.ViewModels"
-        xmlns:views="clr-namespace:OfficeRibbonXEditor.Views"
         xmlns:command="http://www.galasoft.ch/mvvmlight"
+        xmlns:views="clr-namespace:OfficeRibbonXEditor.Views"
         mc:Ignorable="d"
-        Title="{Binding Content.Title}"
+        Title="{Binding View.Title, ElementName=Window}"
         WindowStartupLocation="CenterOwner"
         ShowInTaskbar="False"
-        Icon="{Binding Content.Icon}"
+        Icon="{Binding View.Icon, ElementName=Window}"
+        ResizeMode="{Binding View.ResizeMode, ElementName=Window}"
         SizeToContent="WidthAndHeight"
-        ResizeMode="{Binding Content.ResizeMode}"
         d:DataContext="{d:DesignInstance viewModels:DialogHostViewModel}"
-        Height="450"
-        Width="800">
+        Model="{Binding Content}"
+        x:Name="Window">
     <i:Interaction.Triggers>
         <i:EventTrigger EventName="Closing">
             <command:EventToCommand Command="{Binding ClosingCommand}" PassEventArgsToCommand="True"/>
         </i:EventTrigger>
     </i:Interaction.Triggers>
-    <Window.Resources>
-
-        <DataTemplate DataType="{x:Type viewModels:SettingsDialogViewModel}">
-            <views:SettingsDialog/>
-        </DataTemplate>
-
-        <DataTemplate DataType="{x:Type viewModels:AboutDialogViewModel}">
-            <views:AboutDialog/>
-        </DataTemplate>
-
-    </Window.Resources>
-    <ContentControl Content="{Binding Content}"/>
-</Window>
+</views:DialogHostBase>
diff --git a/OfficeRibbonXEditor/Views/DialogHost.xaml.cs b/OfficeRibbonXEditor/Views/DialogHost.xaml.cs
index c74dcae5..d65104ac 100644
--- a/OfficeRibbonXEditor/Views/DialogHost.xaml.cs
+++ b/OfficeRibbonXEditor/Views/DialogHost.xaml.cs
@@ -5,7 +5,7 @@ namespace OfficeRibbonXEditor.Views
     /// <summary>
     /// Interaction logic for DialogHost.xaml
     /// </summary>
-    public partial class DialogHost : Window
+    public partial class DialogHost : DialogHostBase
     {
         public DialogHost()
         {
diff --git a/OfficeRibbonXEditor/Views/DialogHostBase.cs b/OfficeRibbonXEditor/Views/DialogHostBase.cs
new file mode 100644
index 00000000..1e40c03a
--- /dev/null
+++ b/OfficeRibbonXEditor/Views/DialogHostBase.cs
@@ -0,0 +1,101 @@
+using System;
+using System.Diagnostics;
+using System.Windows;
+using OfficeRibbonXEditor.Controls;
+using OfficeRibbonXEditor.Interfaces;
+using OfficeRibbonXEditor.ViewModels;
+
+namespace OfficeRibbonXEditor.Views
+{
+    public class DialogHostBase : Window
+    {
+        public static readonly DependencyProperty ViewProperty = DependencyProperty.Register(
+            nameof(View),
+            typeof(DialogControl),
+            typeof(DialogHostBase));
+
+        public DialogControl View
+        {
+            get => (DialogControl) this.GetValue(ViewProperty);
+            set => this.SetValue(ViewProperty, value);
+        }
+
+        public static readonly DependencyProperty ModelProperty = DependencyProperty.Register(
+            nameof(Model),
+            typeof(IContentDialogBase),
+            typeof(DialogHostBase),
+            new FrameworkPropertyMetadata(OnModelChanged));
+
+        public IContentDialogBase Model
+        {
+            get => (IContentDialogBase) this.GetValue(ModelProperty);
+            set => this.SetValue(ModelProperty, value);
+        }
+
+        private static void OnModelChanged(DependencyObject sender, DependencyPropertyChangedEventArgs e)
+        {
+            if (!(sender is DialogHost control))
+            {
+                return;
+            }
+
+            if (e.NewValue == null)
+            {
+                control.View = null;
+                return;
+            }
+
+            var view = GenerateControl(e.NewValue.GetType());
+            view.DataContext = e.NewValue;
+            control.View = view;
+            control.Content = view;
+            control.SizeToContent = SizeToContent.Manual;
+
+            // What follows is done here and not in XAML bindings because there can be sizing issues otherwise
+
+            if (view.PreferredWidth > 0)
+            {
+                control.Width = view.PreferredWidth;
+            }
+
+            if (view.PreferredHeight > 0)
+            {
+                control.Height = view.PreferredHeight;
+            }
+
+            control.SizeToContent = view.SizeToContent;
+            control.CenterInOwner();
+        }
+
+        private static DialogControl GenerateControl(Type contentDialogType)
+        {
+            if (contentDialogType == typeof(AboutDialogViewModel))
+            {
+                return new AboutDialog();
+            }
+
+            if (contentDialogType == typeof(CallbackDialogViewModel))
+            {
+                return new CallbackDialog();
+            }
+
+            if (contentDialogType == typeof(SettingsDialogViewModel))
+            {
+                return new SettingsDialog();
+            }
+
+            throw new ArgumentException($"Type {contentDialogType.Name} does not have an registered control");
+        }
+
+        private void CenterInOwner()
+        {
+            if (this.Owner == null)
+            {
+                return;
+            }
+
+            this.Left = this.Owner.Left - (this.Width - this.Owner.Width) / 2;
+            this.Top = this.Owner.Top - (this.Height - this.Owner.Height) / 2;
+        }
+    }
+}
diff --git a/OfficeRibbonXEditor/Views/MainWindow.xaml.cs b/OfficeRibbonXEditor/Views/MainWindow.xaml.cs
index 27371fb1..e2ff9805 100644
--- a/OfficeRibbonXEditor/Views/MainWindow.xaml.cs
+++ b/OfficeRibbonXEditor/Views/MainWindow.xaml.cs
@@ -60,7 +60,6 @@ protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs arg
             this.FindReplaceDialog.Scintilla = this.Editor.Scintilla;
             this.FindReplaceDialog.KeyPressed += this.OnEditorKeyDown;
 
-            this.viewModel.ShowCallbacks += (o, e) => this.ShowCallbacks(e.Data);
             this.viewModel.ReadEditorInfo += (o, e) => e.Data = new EditorInfo { Text = this.Editor.Text, Selection = Tuple.Create(this.Editor.SelectionStart, this.Editor.SelectionEnd) };
             this.viewModel.InsertRecentFile += (o, e) => this.RecentFileList.InsertFile(e.Data);
             this.viewModel.UpdateEditor += (o, e) =>
@@ -180,11 +179,6 @@ private void OnScintillaUpdateUi(object sender, UpdateUIEventArgs e)
             }
         }
 
-        private void ShowCallbacks(string code)
-        {
-            new CallbackWindow(code) { Owner = this }.ShowDialog();
-        }
-
         private void OnEditorZoomChanged(object sender, EventArgs e)
         {
             this.ZoomBox.Value = this.Editor.Zoom;
diff --git a/OfficeRibbonXEditor/Views/SettingsDialog.xaml b/OfficeRibbonXEditor/Views/SettingsDialog.xaml
index c9d62f2a..b1680dd9 100644
--- a/OfficeRibbonXEditor/Views/SettingsDialog.xaml
+++ b/OfficeRibbonXEditor/Views/SettingsDialog.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="OfficeRibbonXEditor.Views.SettingsDialog"
+<controls:DialogControl x:Class="OfficeRibbonXEditor.Views.SettingsDialog"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -7,7 +7,10 @@
         xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
         xmlns:converters="clr-namespace:OfficeRibbonXEditor.Converters"
         xmlns:viewModels="clr-namespace:OfficeRibbonXEditor.ViewModels"
+        xmlns:controls="clr-namespace:OfficeRibbonXEditor.Controls"
         mc:Ignorable="d"
+        Title="Settings"
+        Icon="../Resources/Images/settings.png"
         d:DataContext="{d:DesignInstance viewModels:SettingsDialogViewModel}"
         Tag="Settings">
     <UserControl.Resources>
@@ -121,4 +124,4 @@
             <Button Content="Accept" Margin="3" Padding="8,4" Command="{Binding AcceptCommand}" IsDefault="True"/>
         </StackPanel>
     </Grid>
-</UserControl>
+</controls:DialogControl>
diff --git a/OfficeRibbonXEditor/Views/SettingsDialog.xaml.cs b/OfficeRibbonXEditor/Views/SettingsDialog.xaml.cs
index 8cf0dc2d..6dc739fc 100644
--- a/OfficeRibbonXEditor/Views/SettingsDialog.xaml.cs
+++ b/OfficeRibbonXEditor/Views/SettingsDialog.xaml.cs
@@ -7,6 +7,8 @@
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
+using OfficeRibbonXEditor.Controls;
+
 namespace OfficeRibbonXEditor.Views
 {
     using System;
@@ -20,7 +22,7 @@ namespace OfficeRibbonXEditor.Views
     /// <summary>
     /// Interaction logic for SettingsDialog
     /// </summary>
-    public partial class SettingsDialog : UserControl  // TODO: Move all this code to viewmodel
+    public partial class SettingsDialog : DialogControl
     {
         public SettingsDialog()
         {
diff --git a/OfficeRibbonXEditorTests/ViewModels/MainWindowViewModelTests.cs b/OfficeRibbonXEditorTests/ViewModels/MainWindowViewModelTests.cs
index 7e01d071..cacaa9fb 100644
--- a/OfficeRibbonXEditorTests/ViewModels/MainWindowViewModelTests.cs
+++ b/OfficeRibbonXEditorTests/ViewModels/MainWindowViewModelTests.cs
@@ -326,10 +326,15 @@ public void GenerateCallbacksTest()
 
             // This should contain a single callback for the onLoad event
             part.Contents = @"<customUI onLoad=""CustomLoad"" xmlns=""http://schemas.microsoft.com/office/2006/01/customui""><ribbon></ribbon></customUI>";
-            void Handler(object o, DataEventArgs<string> e) => Assert.IsTrue(e.Data.StartsWith("'Callback for customUI.onLoad"), "Expected callback not generated");
-            this.viewModel.ShowCallbacks += Handler;
+            void Handler(object o, DataEventArgs<IContentDialogBase> e)
+            {
+                Assert.IsTrue(e.Data is CallbackDialogViewModel, $"Unexpected dialog launched: {e.Data.GetType().Name}");
+                Assert.IsTrue(((CallbackDialogViewModel) e.Data).Code.StartsWith("'Callback for customUI.onLoad"), "Expected callback not generated");
+            }
+
+            this.viewModel.LaunchingDialog += Handler;
             this.viewModel.GenerateCallbacksCommand.Execute();
-            this.viewModel.ShowCallbacks -= Handler;  // Just in case we add other checks later
+            this.viewModel.LaunchingDialog -= Handler;  // Just in case we add other checks later
         }
 
         /// <summary>