Adam-Software · vertigra · Nov 6, 2024 · Jun 21, 2024 · Jun 23, 2024 · Jun 23, 2024
diff --git a/AdamSetup.devel.iss b/AdamSetup.devel.iss
@@ -54,7 +54,7 @@ Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: de
 
 [Run]
 Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent;
-Filename: "{tmp}\7za.exe"; Parameters: "x ""{tmp}\BlocklySource.zip"" -o""{commonappdata}\AdamStudio\BlocklySource"" * -r -aoa"; Flags: runasoriginaluser runhidden;
+Filename: "{tmp}\7za.exe"; Parameters: "x ""{tmp}\BlocklySource.zip"" -o""{commonappdata}\{#MyAppName}\BlocklySource"" * -r -aoa"; Flags: runasoriginaluser runhidden;
 Filename: "{tmp}\MicrosoftEdgeWebView2RuntimeInstaller.125.0.2535.51.X64.exe"; Parameters: "/silent /install";
 Filename: "{tmp}\VC_redist.14.29.30135.0.x64.exe"; Parameters: "/install /quiet /norestart"; 
 Filename: "{tmp}\windowsdesktop-runtime-8.0.5-win-x64.exe"; Parameters: "/install /quiet /norestart"; 

diff --git a/AdamSetup.release.iss b/AdamSetup.release.iss
@@ -56,7 +56,7 @@ Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: de
 
 [Run]
 Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent;
-Filename: "{tmp}\7za.exe"; Parameters: "x ""{tmp}\BlocklySource.zip"" -o""{commonappdata}\AdamController\BlocklySource"" * -r -aoa"; Flags: runasoriginaluser runhidden;
+Filename: "{tmp}\7za.exe"; Parameters: "x ""{tmp}\BlocklySource.zip"" -o""{commonappdata}\{#MyAppName}\BlocklySource"" * -r -aoa"; Flags: runasoriginaluser runhidden;
 Filename: "{tmp}\MicrosoftEdgeWebView2RuntimeInstaller.125.0.2535.51.X64.exe"; Parameters: "/silent /install";
 Filename: "{tmp}\VC_redist.14.29.30135.0.x64.exe"; Parameters: "/install /quiet /norestart"; 
 Filename: "{tmp}\windowsdesktop-runtime-8.0.5-win-x64.exe"; Parameters: "/install /quiet /norestart"; 

diff --git a/AdamStudio.Controls/CustomControls.Mvvm/FlyoutContainer/FlyoutBase.cs b/AdamStudio.Controls/CustomControls.Mvvm/FlyoutContainer/FlyoutBase.cs
@@ -1,7 +1,4 @@
-using MahApps.Metro.Controls;
-using Prism.Mvvm;
-using System.Drawing;
-using System.Windows;
+using Prism.Mvvm;
 using System.Windows.Input;
 
 namespace AdamStudio.Controls.CustomControls.Mvvm.FlyoutContainer

diff --git a/AdamStudio.Controls/CustomControls.Services/FlyoutManager.cs b/AdamStudio.Controls/CustomControls.Services/FlyoutManager.cs
@@ -1,5 +1,6 @@
 using AdamStudio.Controls.CustomControls.Mvvm.FlyoutContainer;
 using DryIoc;
+using Microsoft.Extensions.DependencyInjection;
 using Prism.Regions;
 using System.Windows;
 
@@ -28,10 +29,18 @@ public class FlyoutManager : IFlyoutManager
         /// </summary>
         /// <param name="container">DryIoc container, generally passed by dependency injection.</param>
         /// <param name="regionManager">Region manager, generally passed by dependency injection.</param>
-        public FlyoutManager(IContainer container, IRegionManager regionManager)
+        //public FlyoutManager(IContainer container, IRegionManager regionManager)
+        //{
+        //    mDryIocContainer = container;
+        //    RegionManager = regionManager;
+
+        //    mFlyouts = new Dictionary<string, IFlyout>();
+        //}
+
+        public FlyoutManager(IServiceProvider serviceProvider)
         {
-            mDryIocContainer = container;
-            RegionManager = regionManager;
+            mDryIocContainer = serviceProvider.GetService<IContainer>();
+            RegionManager = serviceProvider.GetService<IRegionManager>();
 
             mFlyouts = new Dictionary<string, IFlyout>();
         }
@@ -148,7 +157,7 @@ public bool OpenFlyout(string key, bool forceOpen)
         /// <returns>The result of the identified flyout's CanOpen method.</returns>
         public bool OpenFlyout(string key, FlyoutParameters flyoutParameters, bool forceOpen)
         {
-            var flyoutToActivate = mFlyouts[key];
+            IFlyout flyoutToActivate = mFlyouts[key];
             bool canOpen = flyoutToActivate.CanOpen(flyoutParameters);
 
             if (!forceOpen && !canOpen)
@@ -210,13 +219,13 @@ public bool CloseFlyout(string key, bool forceClose)
         /// <returns>The results of the indentified flyouts CanClose method.</returns>
         public bool CloseFlyout(string key, FlyoutParameters flyoutParameters, bool forceClose)
         {
-            var flyoutToClose = mFlyouts[key];
+            IFlyout flyoutToClose = mFlyouts[key];
             bool canClose = flyoutToClose.CanClose(flyoutParameters);
 
             if (!forceClose && !canClose)
                 return false;
 
-            flyoutToClose.Open(flyoutParameters);
+            flyoutToClose.Close(flyoutParameters);
 
             return canClose;
         }

diff --git a/AdamStudio.Controls/CustomControls.Services/FlyoutStateChecker.cs b/AdamStudio.Controls/CustomControls.Services/FlyoutStateChecker.cs
@@ -3,10 +3,10 @@ namespace AdamStudio.Controls.CustomControls.Services
 {
     public class FlyoutStateChecker : IFlyoutStateChecker
     {
-        public event IsNotificationFlyoutOpenedStateChangeEventHandler IsNotificationFlyoutOpenedStateChangeEvent;
+        public event IsFlyoutsOpenedStateChangeEventHandler IsFlyoutsOpenedStateChangeEvent;
 
         private bool isNotificationFlyoutOpened;
-        public bool IsNotificationFlyoutOpened 
+        public bool IsFlyoutsOpened 
         { 
             get {  return isNotificationFlyoutOpened; }
             set 
@@ -21,7 +21,7 @@ public bool IsNotificationFlyoutOpened
 
         protected void OnNotificationFlyoutOpenedStateChangeEvent()
         {
-            IsNotificationFlyoutOpenedStateChangeEventHandler raiseEvent = IsNotificationFlyoutOpenedStateChangeEvent;
+            IsFlyoutsOpenedStateChangeEventHandler raiseEvent = IsFlyoutsOpenedStateChangeEvent;
             raiseEvent?.Invoke(this);
         }
     }

diff --git a/AdamStudio.Controls/CustomControls.Services/IFlyoutStateChecker.cs b/AdamStudio.Controls/CustomControls.Services/IFlyoutStateChecker.cs
@@ -1,11 +1,11 @@
 namespace AdamStudio.Controls.CustomControls.Services
 {
-    public delegate void IsNotificationFlyoutOpenedStateChangeEventHandler(object sender);
+    public delegate void IsFlyoutsOpenedStateChangeEventHandler(object sender);
 
     public interface IFlyoutStateChecker
     {
-        public event IsNotificationFlyoutOpenedStateChangeEventHandler IsNotificationFlyoutOpenedStateChangeEvent;
+        public event IsFlyoutsOpenedStateChangeEventHandler IsFlyoutsOpenedStateChangeEvent;
 
-        public bool IsNotificationFlyoutOpened { get; set; }
+        public bool IsFlyoutsOpened { get; set; }
     }
 }
diff --git a/AdamStudio.Controls/CustomControls/FlyoutContainer.xaml b/AdamStudio.Controls/CustomControls/FlyoutContainer.xaml
@@ -1,7 +1,8 @@
 <metro:FlyoutsControl x:Class="AdamStudio.Controls.CustomControls.FlyoutContainer"
                       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                      xmlns:metro="http://metro.mahapps.com/winfx/xaml/controls">
+                      xmlns:metro="http://metro.mahapps.com/winfx/xaml/controls"
+                       >
 
     <metro:FlyoutsControl.ItemContainerStyle>
 

diff --git a/AdamStudio.Core/Converters/StringToViewRegionIconsConverter.cs b/AdamStudio.Core/Converters/StringToViewRegionIconsConverter.cs
@@ -16,10 +16,10 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
             if (value != null)
                 stringValue = (string)value;
 
-            if (stringValue == SubRegionNames.SubRegionVisualSettings)
+            if (stringValue == ViewNames.SettingsView)
                 return PackIconSimpleIconsKind.Scratch;
 
-            if (stringValue == SubRegionNames.SubRegionScratch)
+            if (stringValue == ViewNames.ScratchView)
                 return PackIconFeatherIconsKind.Settings;
 
             return PackIconSimpleIconsKind.AbbRobotStudio;

diff --git a/AdamStudio.Core/Mvvm/RegionViewModelBase.cs b/AdamStudio.Core/Mvvm/RegionViewModelBase.cs
@@ -1,4 +1,5 @@
-using Prism.Regions;
+using Microsoft.Extensions.DependencyInjection;
+using Prism.Regions;
 using System;
 
 
@@ -15,9 +16,9 @@ public class RegionViewModelBase : ViewModelBase, INavigationAware, IConfirmNavi
 
         #region ~
 
-        public RegionViewModelBase(IRegionManager regionManager)
+        public RegionViewModelBase(IServiceProvider serviceProvider)
         {
-            RegionManager = regionManager;
+            RegionManager = serviceProvider.GetService<IRegionManager>();
         }
 
         #endregion

diff --git a/AdamStudio.Core/Properties/Settings.Designer.cs b/AdamStudio.Core/Properties/Settings.Designer.cs
diff --git a/AdamStudio.Core/Properties/Settings.settings b/AdamStudio.Core/Properties/Settings.settings
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="AdamController.Core.Properties" GeneratedClassName="Settings">
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="AdamStudio.Core.Properties" GeneratedClassName="Settings">
   <Profiles />
   <Settings>
     <Setting Name="VideoDataExchangePort" Type="System.String" Scope="User">
@@ -281,5 +281,11 @@
     <Setting Name="ShowVideo" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
+    <Setting Name="PopupPanelHeight" Type="System.Double" Scope="User">
+      <Value Profile="(Default)">500</Value>
+    </Setting>
+    <Setting Name="SSHPanelHeight" Type="System.Double" Scope="User">
+      <Value Profile="(Default)">500</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/AdamStudio.Core/RegionNames.cs b/AdamStudio.Core/RegionNames.cs
@@ -2,9 +2,10 @@
 {
     public class RegionNames
     {
-        public const string MenuRegion = $"{nameof(MenuRegion)}";
         public const string ContentRegion = $"{nameof(ContentRegion)}";
         public const string FlayoutsRegion = $"{nameof(FlayoutsRegion)}";
+        public const string ToolBarRegion = $"{nameof(ToolBarRegion)}";
         public const string StatusBarRegion = $"{nameof(StatusBarRegion)}";
+        public const string MenuRegion = $"{nameof(MenuRegion)}";
     }
 }
diff --git a/AdamStudio.Core/SubRegionNames.cs b/AdamStudio.Core/SubRegionNames.cs
diff --git a/AdamStudio.Core/ViewNames.cs b/AdamStudio.Core/ViewNames.cs
@@ -0,0 +1,8 @@
+namespace AdamStudio.Core
+{
+    public class ViewNames
+    {
+        public const string ScratchView = "ScratchControlView";
+        public const string SettingsView = "SettingsControlView";
+    }
+}
diff --git a/AdamStudio.Services/AdamStudio.Services.csproj b/AdamStudio.Services/AdamStudio.Services.csproj
@@ -8,16 +8,22 @@
     <PackageReference Include="AvalonEdit" Version="6.3.0.90" />
     <PackageReference Include="FFmpeg.zgabi.FFME.Windows.6.0.2" Version="1.0.13" />
     <PackageReference Include="MahApps.Metro" Version="2.4.10" />
-    <PackageReference Include="MahApps.Metro.IconPacks" Version="4.11.0" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2478.35" />
-    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
+    <PackageReference Include="MahApps.Metro.IconPacks" Version="5.1.0" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2592.51" />
+    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.135" />
     <PackageReference Include="NetCoreServer" Version="8.0.7" />
+    <PackageReference Include="Prism.Container.Extensions" Version="8.0.62" />
     <PackageReference Include="Prism.Core" Version="8.1.97" />
     <PackageReference Include="Prism.DryIoc" Version="8.1.97" />
     <PackageReference Include="Prism.Wpf" Version="8.1.97" />
+    <PackageReference Include="Serilog" Version="4.1.0" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Serilog.Sinks.DelegatingText" Version="1.0.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
     <PackageReference Include="System.IO.FileSystem" Version="4.3.0" />
     <PackageReference Include="System.Net.Primitives" Version="4.3.1" />
-    <PackageReference Include="Websocket.Client" Version="5.1.1" />
+    <PackageReference Include="The.Microsoft.Expression.Interactions" Version="4.5.0" />
+    <PackageReference Include="Websocket.Client" Version="5.1.2" />
     <PackageReference Include="zgabi.FFME.Windows" Version="6.0.2" />
   </ItemGroup>
 

diff --git a/AdamStudio.Services/AvalonEditService.cs b/AdamStudio.Services/AvalonEditService.cs
@@ -1,7 +1,7 @@
-using AdamBlocklyLibrary.Properties;
-using AdamStudio.Services.Interfaces;
+using AdamStudio.Services.Interfaces;
 using ICSharpCode.AvalonEdit.Highlighting;
 using ICSharpCode.AvalonEdit.Highlighting.Xshd;
+using Microsoft.Extensions.DependencyInjection;
 using System;
 using System.Collections.ObjectModel;
 
@@ -18,9 +18,9 @@ public class AvalonEditService : IAvalonEditService
 
         #region ~
 
-        public AvalonEditService(IFileManagmentService fileManagmentService)
+        public AvalonEditService(IServiceProvider serviceProvider)
         {    
-            mFileManagmentService = fileManagmentService;
+            mFileManagmentService = serviceProvider.GetService<IFileManagmentService>();
             mHighlightingManager = HighlightingManager.Instance;
         }
 
@@ -41,7 +41,7 @@ public void RegisterHighlighting(string highlightingName, byte[] xmlByteArray)
         {
             var xml = mFileManagmentService.ReadTextAsXml(xmlByteArray);
             var definition = HighlightingLoader.Load(xml, mHighlightingManager);
-            mHighlightingManager.RegisterHighlighting(highlightingName, Array.Empty<string>(), definition);
+            mHighlightingManager.RegisterHighlighting(highlightingName, [], definition);
 
         }
 

diff --git a/AdamStudio.Services/CommunicationProviderService.cs b/AdamStudio.Services/CommunicationProviderService.cs
@@ -1,5 +1,7 @@
 using AdamStudio.Services.Interfaces;
 using AdamStudio.Services.UdpClientServiceDependency;
+using Microsoft.Extensions.DependencyInjection;
+using System;
 using System.Net;
 using System.Text;
 using System.Threading.Tasks;
@@ -35,13 +37,12 @@ public class CommunicationProviderService : ICommunicationProviderService
 
         #region ~
 
-        public CommunicationProviderService(ITcpClientService adamTcpClientService, IUdpClientService adamUdpClientService, 
-            IUdpServerService adamUdpServerService, IWebSocketClientService adamWebSocketClientService)
+        public CommunicationProviderService(IServiceProvider serviceProvider)
         {
-            mTcpClientService = adamTcpClientService;
-            mUdpClientService = adamUdpClientService;
-            mUdpServerService = adamUdpServerService;
-            mWebSocketClientService = adamWebSocketClientService;
+            mTcpClientService = serviceProvider.GetService<ITcpClientService>(); 
+            mUdpClientService = serviceProvider.GetService<IUdpClientService>();
+            mUdpServerService = serviceProvider.GetService<IUdpServerService>();
+            mWebSocketClientService = serviceProvider.GetService<IWebSocketClientService>();
 
             Subscribe();
         }
@@ -102,11 +103,6 @@ public void Dispose()
 
         #endregion
 
-
-        #region Private methods
-
-        #endregion
-
         #region Subscriptions
 
         private void Subscribe()
@@ -116,19 +112,16 @@ private void Subscribe()
             mTcpClientService.RaiseTcpClientDisconnectedEvent += RaiseTcpClientDisconnected;
 
             mUdpClientService.RaiseUdpClientMessageEnqueueEvent += RaiseUdpClientMessageEnqueueEvent;
-
             mUdpServerService.RaiseUdpServerReceivedEvent += RaiseServiceUdpServerReceived;
         }
 
-
         private void Unsubscribe()
         {
             mTcpClientService.RaiseTcpClientReconnectedEvent -= RaiseServiceTcpClientReconnected;
             mTcpClientService.RaiseTcpCientConnectedEvent -= RaiseServiceTcpCientConnected;
             mTcpClientService.RaiseTcpClientDisconnectedEvent -= RaiseTcpClientDisconnected;
 
             mUdpClientService.RaiseUdpClientMessageEnqueueEvent -= RaiseUdpClientMessageEnqueueEvent;
-
             mUdpServerService.RaiseUdpServerReceivedEvent -= RaiseServiceUdpServerReceived;
         }
 

diff --git a/AdamStudio.Services/FileManagmentService.cs b/AdamStudio.Services/FileManagmentService.cs
@@ -17,7 +17,7 @@ public class FileManagmentService : IFileManagmentService
 
         #region ~
 
-        public FileManagmentService() { }
+        public FileManagmentService() {}
 
         #endregion