Merge pull request #37 from FlexConfirmMail/support-default-config-fi…

…les-v22.4 Add default configuration files for v22.4
FlexConfirmMail · Sep 26, 2024 · 890fa61 · 890fa61
2 parents 567d2f7 + 1a5ef73
commit 890fa61
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 3 deletions.
diff --git a/Config/Const.cs b/Config/Const.cs
@@ -8,6 +8,11 @@ public class RegistryPath
         public static readonly string Policy = @"SOFTWARE\Policies\FlexConfirmMail";
     }
 
+    public class ConfigPath
+    {
+        public static readonly string DefaultConfigDirName = @"DefaultConfig";
+    }
+
     public enum ConfigOption
     {
         CountEnabled,

diff --git a/Config/StandardPath.cs b/Config/StandardPath.cs
@@ -1,5 +1,4 @@
 using System;
-
 using System.IO;
 
 namespace FlexConfirmMail
@@ -10,6 +9,12 @@ public static string GetUserDir()
         {
             string appData = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
             return Path.Combine(appData, Global.AppName);
+        }
+
+        public static string GetDefaultConfigDir()
+        {
+            string dllDirectory = AppDomain.CurrentDomain.BaseDirectory;
+            return Path.Combine(dllDirectory, ConfigPath.DefaultConfigDirName);
         }
     }
 }
diff --git a/Dialog/ConfigDialog.xaml.cs b/Dialog/ConfigDialog.xaml.cs
@@ -24,7 +24,10 @@ public ConfigDialog()
             {
                 _default = Loader.LoadFromReg(RegistryPath.DefaultPolicy);
                 _config.Merge(_default);
-            }
+            }
+            Config defaultWithFile = Loader.LoadFromDir(StandardPath.GetDefaultConfigDir());
+            _default.Merge(defaultWithFile);
+            _config.Merge(defaultWithFile);
 
             _local = Loader.LoadFromDir(StandardPath.GetUserDir());
             _config.Merge(_local);

diff --git a/FlexConfirmMail.iss b/FlexConfirmMail.iss
@@ -46,3 +46,4 @@ Source: "bin\Release\zh\FlexConfirmMail.resources.dll"; DestDir: "{app}\zh"; Fla
 Source: "bin\Release\Microsoft.Office.Tools.Common.v4.0.Utilities.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "bin\Release\Microsoft.Office.Tools.Outlook.v4.0.Utilities.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "Resources\fcm.ico"; DestDir: "{app}"; Flags: ignoreversion
+Source: "{src}\DefaultConfig\*.txt"; DestDir: "{app}\DefaultConfig"; Flags:external skipifsourcedoesntexist
diff --git a/ThisAddIn.cs b/ThisAddIn.cs
@@ -77,7 +77,8 @@ private bool DoCheck(Outlook.MailItem mail)
             if (Global.EnableGPO)
             {
                 config.Merge(Loader.LoadFromReg(RegistryPath.DefaultPolicy));
-            }
+            }
+            config.Merge(Loader.LoadFromDir(StandardPath.GetDefaultConfigDir()));
             config.Merge(Loader.LoadFromDir(StandardPath.GetUserDir()));
 
             MainDialog mainDialog = new MainDialog(config, mail);