File tree 6 files changed +24
-9
lines changed
6 files changed +24
-9
lines changed Original file line number Diff line number Diff line change @@ -8,6 +8,11 @@ public class RegistryPath
8
8
public static readonly string Policy = @"SOFTWARE\Policies\FlexConfirmMail" ;
9
9
}
10
10
11
+ public class ConfigPath
12
+ {
13
+ public static readonly string DefaultConfigDirName = @"DefaultConfig" ;
14
+ }
15
+
11
16
public enum ConfigOption
12
17
{
13
18
CountEnabled ,
Original file line number Diff line number Diff line change 1
1
using System ;
2
-
3
2
using System . IO ;
4
3
5
4
namespace FlexConfirmMail
@@ -10,6 +9,12 @@ public static string GetUserDir()
10
9
{
11
10
string appData = Environment . GetFolderPath ( Environment . SpecialFolder . ApplicationData ) ;
12
11
return Path . Combine ( appData , Global . AppName ) ;
12
+ }
13
+
14
+ public static string GetDefaultConfigDir ( )
15
+ {
16
+ string dllDirectory = AppDomain . CurrentDomain . BaseDirectory ;
17
+ return Path . Combine ( dllDirectory , ConfigPath . DefaultConfigDirName ) ;
13
18
}
14
19
}
15
20
}
Original file line number Diff line number Diff line change @@ -11,7 +11,7 @@ namespace FlexConfirmMail.Dialog
11
11
public partial class ConfigDialog : Window
12
12
{
13
13
Config _config = new Config ( ) ;
14
- Config _default = new Config ( ) ;
14
+ Config _default = new Config ( ) ;
15
15
Config _local = new Config ( ) ;
16
16
17
17
public ConfigDialog ( )
@@ -24,7 +24,10 @@ public ConfigDialog()
24
24
{
25
25
_default = Loader . LoadFromReg ( RegistryPath . DefaultPolicy ) ;
26
26
_config . Merge ( _default ) ;
27
- }
27
+ }
28
+ Config defaultWithFile = Loader . LoadFromDir ( StandardPath . GetDefaultConfigDir ( ) ) ;
29
+ _default . Merge ( defaultWithFile ) ;
30
+ _config . Merge ( defaultWithFile ) ;
28
31
29
32
_local = Loader . LoadFromDir ( StandardPath . GetUserDir ( ) ) ;
30
33
_config . Merge ( _local ) ;
Original file line number Diff line number Diff line change 1
1
[Setup]
2
2
AppName = FlexConfirmMail
3
3
AppVerName = FlexConfirmMail
4
- VersionInfoVersion = 22.6 .0
4
+ VersionInfoVersion = 22.7 .0
5
5
AppPublisher = ClearCode Inc.
6
- AppVersion = 22.6 .0
6
+ AppVersion = 22.7 .0
7
7
UninstallDisplayIcon = {app} \fcm.ico
8
8
DefaultDirName = {commonpf}\FlexConfirmMail
9
9
ShowLanguageDialog = no
@@ -42,8 +42,9 @@ Source: "bin\Release\FlexConfirmMail.dll"; DestDir: "{app}"; Flags: ignoreversio
42
42
Source : " bin\Release\FlexConfirmMail.dll.manifest" ; DestDir : " {app} " ; Flags : ignoreversion
43
43
Source : " bin\Release\FlexConfirmMail.vsto" ; DestDir : " {app} " ; Flags : ignoreversion
44
44
Source : " bin\Release\en\FlexConfirmMail.resources.dll" ; DestDir : " {app} \en" ; Flags : ignoreversion
45
- Source : " bin\Release\zh\FlexConfirmMail.resources.dll" ; DestDir : " {app} \zh" ; Flags : ignoreversion
45
+ Source : " bin\Release\zh\FlexConfirmMail.resources.dll" ; DestDir : " {app} \zh" ; Flags : ignoreversion
46
46
Source : " bin\Release\es\FlexConfirmMail.resources.dll" ; DestDir : " {app} \es" ; Flags : ignoreversion
47
47
Source : " bin\Release\Microsoft.Office.Tools.Common.v4.0.Utilities.dll" ; DestDir : " {app} " ; Flags : ignoreversion
48
48
Source : " bin\Release\Microsoft.Office.Tools.Outlook.v4.0.Utilities.dll" ; DestDir : " {app} " ; Flags : ignoreversion
49
49
Source : " Resources\fcm.ico" ; DestDir : " {app} " ; Flags : ignoreversion
50
+ Source : " {src} \DefaultConfig\*.txt" ; DestDir : " {app} \DefaultConfig" ; Flags :external skipifsourcedoesntexist
Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ namespace FlexConfirmMail
5
5
public class Global
6
6
{
7
7
public static readonly string AppName = "FlexConfirmMail" ;
8
- public static readonly string Version = "22.6 .0" ;
8
+ public static readonly string Version = "22.7 .0" ;
9
9
public static readonly string Edition = "Enterprise" ;
10
10
public static readonly bool EnableGPO = true ;
11
11
}
Original file line number Diff line number Diff line change 3
3
using System . Windows . Media ;
4
4
using System . Windows . Interop ;
5
5
using Outlook = Microsoft . Office . Interop . Outlook ;
6
- using System . Collections . Generic ;
6
+ using System . Collections . Generic ;
7
7
8
8
namespace FlexConfirmMail
9
9
{
@@ -158,7 +158,8 @@ private bool DoCheck(Outlook.MailItem mail)
158
158
if ( Global . EnableGPO )
159
159
{
160
160
config . Merge ( Loader . LoadFromReg ( RegistryPath . DefaultPolicy ) ) ;
161
- }
161
+ }
162
+ config . Merge ( Loader . LoadFromDir ( StandardPath . GetDefaultConfigDir ( ) ) ) ;
162
163
config . Merge ( Loader . LoadFromDir ( StandardPath . GetUserDir ( ) ) ) ;
163
164
164
165
List < RecipientInfo > originalRecipients = GetOriginalRecipientsFromDictionary ( mail . EntryID ) ;
You can’t perform that action at this time.
0 commit comments