Merge pull request #11 from ionite34/add-py-version-settings

StabilityMatrix/App.xaml.cs

@@ -6,6 +6,7 @@ using StabilityMatrix.Helper;
 using StabilityMatrix.Services;
 using StabilityMatrix.ViewModels;
 using Wpf.Ui.Contracts;
+using Wpf.Ui.Services;
 
 namespace StabilityMatrix
 {
@@ -24,6 +25,7 @@ namespace StabilityMatrix
             serviceCollection.AddTransient<InstallPage>();
             serviceCollection.AddTransient<MainWindowViewModel>();
             serviceCollection.AddSingleton<SettingsViewModel>();
+            serviceCollection.AddSingleton<IContentDialogService, ContentDialogService>();
             serviceCollection.AddSingleton<ISettingsManager, SettingsManager>();
             serviceCollection.AddRefitClient<IGithubApi>();
 

StabilityMatrix/MainWindow.xaml

@@ -60,5 +60,6 @@
                     Command="{Binding GoAdvancedModeCommand}"
                     VerticalAlignment="Bottom" Margin="16" FontSize="14"/>
         </Grid>
+        <ContentPresenter x:Name="RootContentDialog" Grid.Row="1" />
     </Grid>
 </ui:FluentWindow>

StabilityMatrix/MainWindow.xaml.cs

@@ -2,6 +2,7 @@ using System.Diagnostics;
 using System.Windows;
 using StabilityMatrix.ViewModels;
 using Wpf.Ui.Contracts;
+using Wpf.Ui.Controls.Navigation;
 using Wpf.Ui.Controls.Window;
 
 namespace StabilityMatrix
@@ -11,18 +12,27 @@ namespace StabilityMatrix
     /// </summary>
     public partial class MainWindow : FluentWindow
     {
+        private readonly IPageService pageService;
+        private readonly ISettingsManager settingsManager;
+        private readonly IContentDialogService contentDialogService;
         private readonly MainWindowViewModel mainWindowViewModel;
 
-        public MainWindow(IPageService pageService, MainWindowViewModel mainWindowViewModel)
+        public MainWindow(IPageService pageService, ISettingsManager settingsManager, 
+            IContentDialogService contentDialogService, MainWindowViewModel mainWindowViewModel)
         {
             InitializeComponent();
 
+            this.pageService = pageService;
+            this.settingsManager = settingsManager;
+            this.contentDialogService = contentDialogService;
             this.mainWindowViewModel = mainWindowViewModel;
 
             DataContext = mainWindowViewModel;
             
             RootNavigation.Navigating += (_, _) => Debug.WriteLine("Navigating");
             RootNavigation.SetPageService(pageService);
+            
+            contentDialogService.SetContentPresenter(RootContentDialog);
         }
 
         private void MainWindow_OnLoaded(object sender, RoutedEventArgs e)

StabilityMatrix/PyRunner.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Diagnostics;
+using System.Globalization;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -114,8 +115,8 @@ internal static class PyRunner
             {
                 using (Py.GIL())
                 {
-                    dynamic result = PythonEngine.Eval(code);
-                    return result.ToString();
+                    var result = PythonEngine.Eval(code);
+                    return result.ToString(CultureInfo.InvariantCulture);
                 }
             });
         }

StabilityMatrix/SettingsPage.xaml

@@ -37,6 +37,14 @@
                 </StackPanel>
             </ui:Card>
             
+            <ui:Card Margin="8">
+                <StackPanel Orientation="Vertical" HorizontalAlignment="Left">
+                    <TextBlock Text="Embedded Python" FontWeight="Bold" FontSize="16" Margin="0,8" />
+                    <!-- Add a button to show messagebox for python version -->
+                    <Button Margin="8" Content="Check Version Info" Command="{Binding PythonVersionCommand}"/>
+                </StackPanel>
+            </ui:Card>
+
             <ui:Card Margin="8">
                 <StackPanel Orientation="Vertical" HorizontalAlignment="Left">
                     <TextBlock Text="Some Other Setting" FontWeight="Bold" FontSize="16" Margin="0,8" />

StabilityMatrix/ViewModels/SettingsViewModel.cs

@@ -1,12 +1,16 @@
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
 using System.Net;
 using System.Net.Http;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Windows;
 using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
 using StabilityMatrix.Helper;
 using Wpf.Ui.Appearance;
+using Wpf.Ui.Contracts;
+using Wpf.Ui.Controls.ContentDialogControl;
 
 namespace StabilityMatrix.ViewModels;
 
@@ -21,10 +25,12 @@ public partial class SettingsViewModel : ObservableObject
         "System",
     };
     private string selectedTheme;
+    private readonly IContentDialogService contentDialogService;
     
-    public SettingsViewModel(ISettingsManager settingsManager)
+    public SettingsViewModel(ISettingsManager settingsManager, IContentDialogService contentDialogService)
     {
         this.settingsManager = settingsManager;
+        this.contentDialogService = contentDialogService;
         SelectedTheme = settingsManager.Settings.Theme;
     }
 
@@ -61,6 +67,19 @@ public partial class SettingsViewModel : ObservableObject
     [ObservableProperty] 
     public string testProperty;
     
+    public AsyncRelayCommand PythonVersionCommand => new(async () =>
+    {
+        // Get python version
+        await PyRunner.Initialize();
+        var result = await PyRunner.Eval("str(__import__('sys').version_info)");
+        // Show dialog box
+        var dialog = contentDialogService.CreateDialog();
+        dialog.Title = "Python version info";
+        dialog.Content = result;
+        dialog.PrimaryButtonText = "Ok";
+        await dialog.ShowAsync();
+    });
+
     public async Task OnLoaded()
     {
         SelectedTheme = string.IsNullOrWhiteSpace(settingsManager.Settings.Theme)