Allow for custom editors to modify patches and set background color if patch is not open anymore

DPE/DistributedPolicyEngine.cs

 using pEp.DPE.Interfaces;
 using pEp.Extensions;
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using Outlook = Microsoft.Office.Interop.Outlook;
@@ -12,7 +11,6 @@ namespace pEp.DPE
     {
         private static readonly string  DPE_FOLDER              = Path.Combine(Globals.PEPUserFolder, "DPE");
         public static readonly string   DPE_TEMP_LOCATION       = Path.Combine(DistributedPolicyEngine.DPE_FOLDER, "temp");
-        private const string            PATCH_EXTENSION         = ".patch";
         private const string            PATCH_MESSAGE_SUBJECT   = "Configuration changes";
         public const string             DPE_MESSAGE_CLASS       = "IPM.Note.DPE";
 
@@ -30,7 +28,7 @@ namespace pEp.DPE
         }
 
         #region Event handlers
-    
+
         /// <summary>
         /// Event handler for when a patch has been accepted.
         /// </summary>
@@ -90,7 +88,7 @@ namespace pEp.DPE
                     { MapiProperty.PidTagMessageDeliveryTime, DateTime.UtcNow }
                 });
                 omi.SetMessageFlag(MapiPropertyValue.EnumPidTagMessageFlags.mfUnsent, false);
-                
+
                 // Move to inbox and set Received time
                 mi = omi.Move(Globals.ThisAddIn.Application.Session.GetDefaultFolder(Outlook.OlDefaultFolders.olFolderInbox));
                 mi.Save();

PEPSettings.cs

@@ -62,8 +62,9 @@ namespace pEp
         public const string                CULTURE_CODE_DEFAULT                               = "en";
         public const bool                  DELETE_MIRROR_MESSAGES_DEFAULT                     = false;
         public const string                DISCLAIMER_TEXT_DEFAULT                            = null;
-        public static readonly string      DPE_WEB_CLIENT_URL_DEFAULT                         = "http://localhost:30457/pEpDPE/";
-        public static readonly string      DPE_WEB_SERVER_URL_DEFAULT                         = "http://localhost:30456/pEpDPE/";
+        public const string                DPE_EDITOR_PATH_DEFAULT                            = "Notepad.exe";
+        public const string                DPE_WEB_CLIENT_URL_DEFAULT                         = "http://localhost:30457/pEpDPE/";
+        public const string                DPE_WEB_SERVER_URL_DEFAULT                         = "http://localhost:30456/pEpDPE/";
         public const bool                  ENABLE_NATIVE_METHODS_DEFAULT                      = true;
         public const bool                  ENCRYPT_ACCOUNTS_BY_DEFAULT                        = true;
         public const bool                  HIDE_INTERNAL_MESSAGES_DEFAULT                     = true;
@@ -172,6 +173,12 @@ namespace pEp
         /// </summary>
         public bool DeleteMirrorMessages { get; private set; } = PEPSettings.DELETE_MIRROR_MESSAGES_DEFAULT;
 
+        /// <summary>
+        /// Gets the path to the editor to use to edit config files.
+        /// Can only be set from the Registry.
+        /// </summary>
+        public string DPEEditorPath { get; private set; } = PEPSettings.DPE_EDITOR_PATH_DEFAULT;
+
         /// <summary>
         /// Gets the URL of the DPE Web client.
         /// </summary>

UI/ViewModels/FormControlPatchViewModel.cs

 using pEp.DPE;
 using System;
 using System.Windows.Documents;
+using System.Windows.Media;
 
 namespace pEp.UI.ViewModels
 {
@@ -18,14 +19,21 @@ namespace pEp.UI.ViewModels
 
         private readonly Patch patch;
 
-        private PatchStatus     _Status         = PatchStatus.Open;
+        private Brush           _Background     = Brushes.White;
+        private FlowDocument    _DisplayDiff    = null;
         private DateTime?       _EditDate       = null;
         private string          _Explanation    = null;
+        private PatchStatus     _Status         = PatchStatus.Open;
 
         #endregion
 
         #region Properties
 
+        /// <summary>
+        /// Gets or sets the background.
+        /// </summary>
+        public Brush Background { get => this._Background; set => this.SetProperty(ref this._Background, value); }
+
         /// <summary>
         /// The commit message of the patch.
         /// </summary>
@@ -58,9 +66,9 @@ namespace pEp.UI.ViewModels
         }
 
         /// <summary>
-        /// Gets the diff of this patch as formatted flow document.
+        /// Gets or sets the diff of this patch as formatted flow document.
         /// </summary>
-        public FlowDocument DisplayDiff => PatchDialogViewModel.FormatDiff(this.Diff);
+        public FlowDocument DisplayDiff { get => this._DisplayDiff; set => this.SetProperty(ref this._DisplayDiff, value); }
 
         /// <summary>
         /// Gets or sets the last date the patch was edited.
@@ -154,10 +162,9 @@ namespace pEp.UI.ViewModels
             this.EditDate = editDate;
             this.patch = patch;
             this.Submitter = submitter;
-            this.Status = status;
             this.IsRejectButtonVisible = true;
             this.OKButtonText = "Support";
-            this.SetExplanation();
+            this.UpdateView(status);
         }
 
         #endregion
@@ -171,9 +178,7 @@ namespace pEp.UI.ViewModels
         private void RejectPatch(object parameter)
         {
             Globals.ThisAddIn.DistributedPolicyEngine.Reject(this.patch, new PEPIdentity());
-            this.Status = PatchStatus.Rejected;
-            this.EditDate = DateTime.UtcNow;
-            this.SetExplanation();
+            this.UpdateView(PatchStatus.Rejected);
         }
 
         /// <summary>
@@ -212,9 +217,20 @@ namespace pEp.UI.ViewModels
         private void SupportPatch(object parameter)
         {
             Globals.ThisAddIn.DistributedPolicyEngine.Support(this.patch, new PEPIdentity());
-            this.Status = PatchStatus.Supported;
+            this.UpdateView(PatchStatus.Supported);
+        }
+
+        /// <summary>
+        /// Updates the view according to a new patch status.
+        /// </summary>
+        /// <param name="patchStatus">The new patch status.</param>
+        private void UpdateView(PatchStatus patchStatus)
+        {
+            this.Status = patchStatus;
             this.EditDate = DateTime.UtcNow;
             this.SetExplanation();
+            this.DisplayDiff = PatchDialogViewModel.FormatDiff(this.Diff, this.Status == PatchStatus.Open);
+            this.Background = (patchStatus == PatchStatus.Open) ? Brushes.White : Brushes.WhiteSmoke;
         }
 
         #endregion

UI/ViewModels/PatchDialogViewModel.cs

@@ -488,15 +488,20 @@ namespace pEp.UI.ViewModels
                     File.Copy(fileName, originalFileName, true);
                 }
 
-                // Open temp file in Notepad for the user to edit
+                // Open temp file for the user to edit
                 using (Process modifyFileProcess = Process.Start(new ProcessStartInfo
                 {
-                    FileName = "Notepad.exe",
+                    FileName = Globals.ThisAddIn.Settings.DPEEditorPath,
                     Arguments = fileName,
                     UseShellExecute = false,
                     CreateNoWindow = true
                 }))
                 {
+                    while (!modifyFileProcess.HasExited)
+                    {
+                        System.Threading.Thread.Sleep(200);
+                    }
+
                     modifyFileProcess.WaitForExit();
                 }
 
@@ -602,11 +607,14 @@ namespace pEp.UI.ViewModels
 
         #region Static methods
 
+
         /// <summary>
         /// Formats the diff displaying colors of changes.
         /// </summary>
+        /// <param name="diff">The diff to format.</param>
+        /// <param name="isOpen">Whether the patch is still open.</param>
         /// <returns>The formatted diff or null if no diff is available.</returns>
-        public static FlowDocument FormatDiff(string diff)
+        public static FlowDocument FormatDiff(string diff, bool isOpen = true)
         {
             if (string.IsNullOrEmpty(diff))
             {
@@ -616,7 +624,7 @@ namespace pEp.UI.ViewModels
             // Initialize the document with zero width to set the real width later
             FlowDocument document = new FlowDocument
             {
-                Background = Brushes.White,
+                Background = isOpen ? Brushes.White : Brushes.WhiteSmoke,
                 PageWidth = 0
             };
 

UI/Views/FormControlPatchView.xaml

@@ -9,6 +9,7 @@
              mc:Ignorable="d" 
              FontFamily="Segoe UI"
              FontSize="12"
+             Background="{Binding Background}"
              d:DataContext="{d:DesignInstance Type=vm:FormControlPatchViewModel}"
              d:DesignHeight="450" d:DesignWidth="800">
     <UserControl.Resources>
@@ -27,7 +28,7 @@
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="*" />
             <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
@@ -41,19 +42,19 @@
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
         <Label Grid.Column="0"
-               Grid.Row="0"
                Grid.ColumnSpan="2"
+               Grid.Row="0"
                Content="{Binding Explanation}"
                FontWeight="Bold"
                Margin="10,5"/>
         <Label Grid.Column="0"
-               Grid.Row="1"
                Grid.ColumnSpan="2"
+               Grid.Row="1"
                Content="{Binding Submitter.DisplayString}"
                Margin="10,1" />
         <Label Grid.Column="0"
-               Grid.Row="2"
                Grid.ColumnSpan="2"
+               Grid.Row="2"
                Content="{Binding CreationDateString}"
                Margin="10,1" />
         <Image Grid.Column="2"
@@ -84,11 +85,11 @@
         <TextBox Grid.Column="1"
                  Grid.ColumnSpan="2"
                  Grid.Row="4"
+                 Background="{Binding Background}"
                  VerticalAlignment="Center"
                  Padding="2"
                  Text="{Binding Uri}" 
                  IsReadOnly="True"
-                 MinWidth="400"
                  Margin="5,10,10,10"/>
         <Label Grid.Column="0"
                Grid.Row="5"
@@ -97,11 +98,11 @@
         <TextBox Grid.Column="1"
                  Grid.ColumnSpan="2"
                  Grid.Row="5"
+                 Background="{Binding Background}"
                  VerticalAlignment="Center"
                  Padding="2"
                  Text="{Binding CommitMessage}"
                  IsReadOnly="True"
-                 MinWidth="400"
                  Margin="5,10,10,10"/>
         <Label Grid.Column="0"
                Grid.Row="6"
@@ -110,11 +111,11 @@
         <TextBox Grid.Column="1"
                  Grid.ColumnSpan="2"
                  Grid.Row="6"
+                 Background="{Binding Background}"
                  VerticalAlignment="Center"
                  Padding="2"
                  Text="{Binding Tag}"
                  IsReadOnly="True"
-                 MinWidth="400"
                  Margin="5,10,10,10"/>
         <StackPanel Grid.Column="0"
                     Grid.ColumnSpan="3"