diff --git a/AdamController/AdamController.csproj b/AdamController/AdamController.csproj index 8d6999a..afeb6a8 100644 --- a/AdamController/AdamController.csproj +++ b/AdamController/AdamController.csproj @@ -3,8 +3,8 @@ Dynamic False MIT-Modern-Variant - 2.0.0.0 - 2.0.0.0 + 2.0.0.3 + 2.0.0.3 net7.0-windows diff --git a/AdamSetup.devel.iss b/AdamSetup.devel.iss index 92742be..67648d8 100644 --- a/AdamSetup.devel.iss +++ b/AdamSetup.devel.iss @@ -2,11 +2,11 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "AdamStudio" -#define MyAppPublisher "AdamStudioProduction" +#define MyAppPublisher "AdamSoftware" #define MyAppURL "https://robotco.ru/" -#define MySupportURL = "https://github.com/vertigra/Adam-IDE" +#define MySupportURL = "https://github.com/Adam-Software/Adam-IDE" #define MyAppExeName "AdamController.exe" -#define InstallerIconPath "AdamController\Images\Icons\AdamIconAndRGBPageIcon.ico" +#define InstallerIconPath "AdamController.Core\Properties\Icons\main_app_icon.ico" #define AppReleaseFolderPath "AdamController\bin\Debug\net7.0-windows\" #define MyAppVersion GetVersionNumbersString(AppReleaseFolderPath + MyAppExeName) diff --git a/AdamSetup.release.iss b/AdamSetup.release.iss index 847cbc0..82f0fc2 100644 --- a/AdamSetup.release.iss +++ b/AdamSetup.release.iss @@ -2,11 +2,11 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "AdamStudio" -#define MyAppPublisher "AdamStudioProduction" +#define MyAppPublisher "AdamSoftware" #define MyAppURL "https://robotco.ru/" -#define MySupportURL = "https://github.com/vertigra/Adam-IDE" +#define MySupportURL = "https://github.com/Adam-Software/Adam-IDE" #define MyAppExeName "AdamController.exe" -#define InstallerIconPath "AdamController\Images\Icons\AdamIconAndRGBPageIcon.ico" +#define InstallerIconPath "AdamController.Core\Properties\Icons\main_app_icon.ico" #define AppReleaseFolderPath "AdamController\bin\Release\net7.0-windows\" #define MyAppVersion GetVersionNumbersString(AppReleaseFolderPath + MyAppExeName) diff --git a/Modules/AdamController.Modules.ContentRegion/ViewModels/ScratchControlViewModel.cs b/Modules/AdamController.Modules.ContentRegion/ViewModels/ScratchControlViewModel.cs index d8c04c7..1484a14 100644 --- a/Modules/AdamController.Modules.ContentRegion/ViewModels/ScratchControlViewModel.cs +++ b/Modules/AdamController.Modules.ContentRegion/ViewModels/ScratchControlViewModel.cs @@ -4,7 +4,6 @@ using AdamBlocklyLibrary.Toolbox; using AdamBlocklyLibrary.ToolboxSets; using AdamController.Controls.CustomControls.Services; -using AdamController.Controls.Enums; using AdamController.Core; using AdamController.Core.Extensions; using AdamController.Core.Mvvm; diff --git a/Modules/AdamController.Modules.ContentRegion/Views/ScratchControlView.xaml.cs b/Modules/AdamController.Modules.ContentRegion/Views/ScratchControlView.xaml.cs index 38efa24..057c1fb 100644 --- a/Modules/AdamController.Modules.ContentRegion/Views/ScratchControlView.xaml.cs +++ b/Modules/AdamController.Modules.ContentRegion/Views/ScratchControlView.xaml.cs @@ -27,7 +27,6 @@ public partial class ScratchControlView : UserControl #region Var private readonly string mPathToSource; - private readonly string mPath; #endregion @@ -41,7 +40,6 @@ public ScratchControlView(IWebViewProvider webViewProvider, IStatusBarNotificati mControlHelper = controlHelper; mPathToSource = Path.Combine(folderManagment.CommonDirAppData, "BlocklySource"); - mPath = Path.Combine(Path.GetTempPath(), "AdamBrowser"); WebView.CoreWebView2InitializationCompleted += WebViewCoreWebView2InitializationCompleted; WebView.NavigationCompleted += WebViewNavigationCompleted; @@ -106,15 +104,16 @@ private void TextResulEditorTextChanged(object sender, EventArgs e) private async void InitializeWebViewCore() { - CoreWebView2Environment env = await CoreWebView2Environment.CreateAsync(userDataFolder: mPath); - await WebView.EnsureCoreWebView2Async(env); + var tempPath = Path.Combine(Path.GetTempPath(), "AdamBrowser"); + CoreWebView2Environment env = await CoreWebView2Environment.CreateAsync(userDataFolder: tempPath); + await WebView?.EnsureCoreWebView2Async(env); } private void WebViewCoreWebView2InitializationCompleted(object sender, CoreWebView2InitializationCompletedEventArgs e) { WebView.CoreWebView2.Settings.AreDefaultContextMenusEnabled = !Settings.Default.DontShowBrowserMenuInBlockly; - WebView.CoreWebView2.SetVirtualHostNameToFolderMapping("localhost", mPathToSource, CoreWebView2HostResourceAccessKind.Allow); - WebView.CoreWebView2.Navigate("https://localhost/index.html"); + WebView?.CoreWebView2?.SetVirtualHostNameToFolderMapping("localhost", mPathToSource, CoreWebView2HostResourceAccessKind.Allow); + WebView?.CoreWebView2?.Navigate("https://localhost/index.html"); } private void WebViewWebMessageReceived(object sender, CoreWebView2WebMessageReceivedEventArgs e)