Support running from MSI Installer #1838

Analogy.Common/DataTypes/Enums.cs

@@ -60,6 +60,7 @@ public enum FontSelectionType
 
     public enum SettingsMode
     {
+        None = -1,
         PerUser,
         ApplicationFolder,
         ProgramData,

Analogy.Common/Interfaces/IUserSettingsManager.cs

@@ -45,7 +45,7 @@ public interface IUserSettingsManager
         bool TrackActiveMessage { get; set; }
         float RealTimeRefreshInterval { get; set; }
         FilteringExclusion FilteringExclusion { get; set; }
-        string LogsLayoutFileName { get; set; }
+        string LogsLayoutFileName { get; }
         bool UseCustomLogsLayout { get; set; }
         bool ViewDetailedMessageWithHTML { get; set; }
         TimeSpan TimeOffset { get; set; }
@@ -65,5 +65,6 @@ public interface IUserSettingsManager
         void ResetSettings();
         bool TryGetWindowPosition(Guid id, out AnalogyPositionState? position);
         void SetWindowPosition(Guid id, AnalogyPositionState position);
+        void SetLogsLayoutFileName(string filename);
     }
 }

Analogy.Common/Managers/DefaultUserSettingsManager.cs

@@ -43,7 +43,7 @@ public class DefaultUserSettingsManager : IUserSettingsManager
         public bool TrackActiveMessage { get; set; }
         public float RealTimeRefreshInterval { get; set; } = 1;
         public FilteringExclusion FilteringExclusion { get; set; } = new FilteringExclusion();
-        public string LogsLayoutFileName { get; set; }
+        public string LogsLayoutFileName { get; }
         public bool UseCustomLogsLayout { get; set; }
         public bool ViewDetailedMessageWithHTML { get; set; }
         public TimeSpan TimeOffset { get; set; } = TimeSpan.Zero;
@@ -102,5 +102,10 @@ public bool TryGetWindowPosition(Guid id, out AnalogyPositionState? position)
         public void SetWindowPosition(Guid id, AnalogyPositionState position)
         {
         }
+
+        public void SetLogsLayoutFileName(string filename)
+        {
+
+        }
     }
 }

Analogy.CommonControls/UserControls/LogMessagesUC.cs

@@ -1001,7 +1001,7 @@ private void SetupEventsHandlers()
 
             wsLogs.WorkspaceSaved += (s, e) =>
             {
-                Settings.LogsLayoutFileName = e.Workspace.Path;
+                Settings.SetLogsLayoutFileName(e.Workspace.Path);
                 // Settings.UseCustomLogsLayout = true;
             };
             wsLogs.AfterApplyWorkspace += (s, e) =>
@@ -1015,7 +1015,7 @@ private void SetupEventsHandlers()
                     else if (File.Exists(ws.Workspace.Path))
                     {
                         // Settings.UseCustomLogsLayout = true;
-                        Settings.LogsLayoutFileName = ws.Workspace.Path;
+                        Settings.SetLogsLayoutFileName(ws.Workspace.Path);
                     }
 
                 }

Analogy.CommonControls/UserControls/ServerSideLogMessagesUC.cs

@@ -761,7 +761,7 @@ private void SetupEventsHandlers()
 
             wsLogs.WorkspaceSaved += (s, e) =>
             {
-                Settings.LogsLayoutFileName = e.Workspace.Path;
+                Settings.SetLogsLayoutFileName(e.Workspace.Path);
                 // Settings.UseCustomLogsLayout = true;
             };
             wsLogs.AfterApplyWorkspace += (s, e) =>
@@ -775,7 +775,7 @@ private void SetupEventsHandlers()
                     else if (File.Exists(ws.Workspace.Path))
                     {
                         // Settings.UseCustomLogsLayout = true;
-                        Settings.LogsLayoutFileName = ws.Workspace.Path;
+                        Settings.SetLogsLayoutFileName(ws.Workspace.Path);
                     }
 
                 }

Analogy/ApplicationSettings/ApplicationGeneralSettingsUC.cs

@@ -17,9 +17,12 @@ namespace Analogy.ApplicationSettings
     public partial class ApplicationGeneralSettingsUC : DevExpress.XtraEditors.XtraUserControl
     {
         private IAnalogyUserSettings Settings { get; }
-        public ApplicationGeneralSettingsUC(IAnalogyUserSettings settings)
+        private IAnalogyFoldersAccess FoldersAccess { get; }
+
+        public ApplicationGeneralSettingsUC(IAnalogyUserSettings settings,IAnalogyFoldersAccess foldersAccess)
         {
             Settings = settings;
+            FoldersAccess = foldersAccess;
             InitializeComponent();
         }
 
@@ -71,6 +74,7 @@ private void SetupEventsHandlers()
 
         private void LoadSettings()
         {
+            ceSettingsLocationApplicationFolder.Text = $"Portable: Store settings in the Application Folder ({FoldersAccess.ConfigurationsFolder})";
             toggleSwitchIdleMode.IsOn = Settings.IdleMode;
             nudIdleTime.Value = Settings.IdleTimeMinutes;
             nudRecentFiles.Value = Settings.RecentFilesCount;

Analogy/CommonChangeLog.cs

@@ -9,6 +9,7 @@ public static IEnumerable<AnalogyChangeLog> GetChangeLog()
         {
             return new List<AnalogyChangeLog>
             {
+                new ("V5.0.0 - Support running from MSI Installer #1838", AnalogChangeLogType.Improvement,"Lior Banai",new DateTime(2023,09,03),"5.0.0.0"),
                 new ("V5.0.0 - Add Export to Simple File #1815", AnalogChangeLogType.Improvement,"Lior Banai",new DateTime(2023,08,25),"5.0.0.0"),
                 new ("V5.0.0 - Change Time Offset is very slow #1769", AnalogChangeLogType.Bug,"Lior Banai",new DateTime(2023,08,25),"5.0.0.0"),
                 new ("V5.0.0 - Message viewer doesn't understand Linux-style new lines #1770", AnalogChangeLogType.Improvement,"Lior Banai",new DateTime(2023,08,25),"5.0.0.0"),

Analogy/Forms/ApplicationSettingsForm.cs

@@ -14,19 +14,21 @@ public partial class ApplicationSettingsForm : DevExpress.XtraBars.FluentDesignS
     {
         private IAnalogyUserSettings Settings { get; }
         private IFactoriesManager FactoriesManager { get; }
+        private IAnalogyFoldersAccess FoldersAccess { get; }
         private UpdateManager UpdateManager { get; }
         private ApplicationSettingsSelectionType SelectedSettingType { get; }
-        public ApplicationSettingsForm(IAnalogyUserSettings settings, IFactoriesManager factoriesManager, UpdateManager updateManager)
+        public ApplicationSettingsForm(IAnalogyUserSettings settings, IFactoriesManager factoriesManager, IAnalogyFoldersAccess foldersAccess, UpdateManager updateManager)
         {
             InitializeComponent();
             Settings = settings;
             FactoriesManager = factoriesManager;
+            FoldersAccess = foldersAccess;
             UpdateManager = updateManager;
             EnableAcrylicAccent = false;
             SelectedSettingType = ApplicationSettingsSelectionType.ApplicationGeneralSettings;
         }
 
-        public ApplicationSettingsForm(ApplicationSettingsSelectionType selectedSettingType, IAnalogyUserSettings settings, IFactoriesManager factoriesManager, UpdateManager updateManager) : this(settings, factoriesManager, updateManager)
+        public ApplicationSettingsForm(ApplicationSettingsSelectionType selectedSettingType, IAnalogyUserSettings settings, IFactoriesManager factoriesManager, IAnalogyFoldersAccess foldersAccess, UpdateManager updateManager) : this(settings, factoriesManager, foldersAccess, updateManager)
         {
             SelectedSettingType = selectedSettingType;
         }
@@ -48,7 +50,7 @@ private UserControl GetUserControlByType(ApplicationSettingsSelectionType settin
             switch (settingType)
             {
                 case ApplicationSettingsSelectionType.ApplicationGeneralSettings:
-                    return new ApplicationGeneralSettingsUC(Settings);
+                    return new ApplicationGeneralSettingsUC(Settings, FoldersAccess);
                 case ApplicationSettingsSelectionType.ApplicationUISettings:
                     return new ApplicationUISettingsUC(Settings);
                 case ApplicationSettingsSelectionType.MessagesFilteringSettings:
@@ -199,7 +201,7 @@ private void bbtnReset_ItemClick(object sender, ItemClickEventArgs e)
                 Hide();
                 Close();
                 Settings.ResetSettings();
-                ApplicationSettingsForm us = new ApplicationSettingsForm(Settings, FactoriesManager, UpdateManager);
+                ApplicationSettingsForm us = new ApplicationSettingsForm(Settings, FactoriesManager, FoldersAccess, UpdateManager);
                 us.ShowDialog(owner);
             }
         }