Merge pull request #17 from Atlas-OS/na-beta-releases

TheyCreeper · web-flow · commit 5aa6746ee83a · 2025-04-11T14:55:22.000-04:00
Beta v0.1.4
diff --git a/AtlasToolbox/App.xaml.cs b/AtlasToolbox/App.xaml.cs
@@ -16,6 +16,7 @@
 using AtlasToolbox.Utils;
 using System.Diagnostics;
 using System.Collections.ObjectModel;
+using System.Diagnostics.Contracts;
 
 namespace AtlasToolbox
 {
@@ -31,6 +32,8 @@ public partial class App : Application
         public static string CurrentCategory { get; set; }
 
         private static Mutex _mutex = new(true, "{AtlasToolbox}");
+
+        public static string Version { get; set; }
         public App()
         {
             ConfigureNLog();
@@ -92,7 +95,7 @@ protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs ar
                 DebugSettings.BindingFailed += DebugSettings_BindingFailed;
             }
 #endif
-
+            Version = RegistryHelper.GetValue($@"HKLM\SOFTWARE\AtlasOS\Toolbox", "Channel") + " v" + RegistryHelper.GetValue($@"HKLM\SOFTWARE\AtlasOS\Toolbox", "VersionNumber");
             if (CompatibilityHelper.IsCompatible())
             {
                 Task.Run(() => StartNamedPipeServer());
diff --git a/AtlasToolbox/AtlasToolbox.csproj b/AtlasToolbox/AtlasToolbox.csproj
@@ -42,6 +42,7 @@
     <None Remove="Resources\HeaderTemplates.xaml" />
     <None Remove="SoftwarePage.xaml" />
     <None Remove="Views\ContentDialogView.xaml" />
+    <None Remove="Views\NewProfilePage.xaml" />
   </ItemGroup>
 	<ItemGroup>
 		<Content Include="assets\**">
@@ -191,6 +192,9 @@
       <Pack>True</Pack>
       <PackagePath>\</PackagePath>
     </None>
+    <Page Update="Views\NewProfilePage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Update="FWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>
diff --git a/AtlasToolbox/Commands/MultiOptionSaveConfigurationCommand.cs b/AtlasToolbox/Commands/MultiOptionSaveConfigurationCommand.cs
@@ -5,6 +5,7 @@
 using System.Threading.Tasks;
 using AtlasToolbox.Services.ConfigurationServices;
 using AtlasToolbox.Stores;
+using AtlasToolbox.Utils;
 using AtlasToolbox.ViewModels;
 using MVVMEssentials.Commands;
 
@@ -34,6 +35,8 @@ protected override async Task ExecuteAsync(object parameter)
         {
             int currentSetting = _configurationItemViewModel.Options.IndexOf(_configurationStore.CurrentSetting);
 
+            RecentTogglesHelper.AddRecentToggle(_configurationItemViewModel.Key, currentSetting.ToString());
+
             _configurationItemViewModel.IsBusy = true;
 
             try
diff --git a/AtlasToolbox/MainWindow.xaml.cs b/AtlasToolbox/MainWindow.xaml.cs
@@ -26,10 +26,9 @@ public MainWindow()
 
             //Window parameters
             WindowManager.Get(this).Width = 1250;
-            WindowManager.Get(this).MinWidth = 1250;
-
             WindowManager.Get(this).Height = 850;
-            WindowManager.Get(this).MinHeight = 850;
+            WindowManager.Get(this).IsResizable = false;
+            WindowManager.Get(this).IsMaximizable = false;
 
             CenterWindowOnScreen();
             ExtendsContentIntoTitleBar = true;
diff --git a/AtlasToolbox/Views/HomePage.xaml b/AtlasToolbox/Views/HomePage.xaml
@@ -47,6 +47,8 @@
                             Margin="75,0,0,0"
                             VerticalAlignment="Center"
                             Orientation="Vertical">
+                            <TextBlock x:Name="WinVer" />
+                            <TextBlock x:Name="AtlasVer" Margin="0,0,0,20" />
                             <TextBlock
                                 x:Name="subHeaderBlock"
                                 FontSize="18"
@@ -89,6 +91,10 @@
                                         x:Uid="Set_Profile"
                                         Click="SetProfile_Click"
                                         Text="Set this profile" />
+                                    <MenuFlyoutItem
+                                        x:Uid="Delete"
+                                        Click="DeleteProfile"
+                                        Text="Delete" />
                                 </MenuFlyout>
                             </Grid.ContextFlyout>
                             <TextBlock Text="{x:Bind Name}" />
@@ -112,12 +118,11 @@
                 HorizontalAlignment="Left"
                 BorderBrush="#36363e"
                 BorderThickness="2"
-                CornerRadius="5"
-                >
+                CornerRadius="5">
                 <ListView.ItemTemplate>
                     <DataTemplate x:DataType="model:RecentToggle">
                         <Grid>
-                            <TextBlock Text="{Binding Description}"/>
+                            <TextBlock Text="{Binding Description}" />
                         </Grid>
                     </DataTemplate>
                 </ListView.ItemTemplate>
@@ -126,23 +131,10 @@
                 Grid.Row="2"
                 Margin="36,0,0,24"
                 Orientation="Horizontal">
-                <TextBox
-                    x:Name="ProfileNameTextBox"
-                    Width="210"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Top"
-                    Text="{Binding Name}"
-                    TextChanged="ProfileNameTextBox_TextChanged" />
-                <Button
-                    Margin="12,0,0,0"
-                    VerticalAlignment="Top"
-                    Click="AddProfile"
-                    Content="Add" />
                 <Button
-                    Margin="12,0,0,0"
                     VerticalAlignment="Top"
-                    Click="DeleteProfile"
-                    Content="Delete" />
+                    Click="Button_Click"
+                    Content="Create a new profile" />
             </StackPanel>
         </Grid>
     </ScrollViewer>
diff --git a/AtlasToolbox/Views/HomePage.xaml.cs b/AtlasToolbox/Views/HomePage.xaml.cs
@@ -10,6 +10,7 @@
 using Microsoft.UI.Xaml.Input;
 using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Navigation;
+using Microsoft.Xaml.Interactivity;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -30,28 +31,27 @@ public sealed partial class HomePage : Page
 
         public HomePage()
         {
+            OperatingSystem os = Environment.OSVersion;
+
             RecentTogglesHelper.LoadRecentToggles();
             this.InitializeComponent();
             _viewModel = App._host.Services.GetRequiredService<HomePageViewModel>();
             this.DataContext = _viewModel;
+            WinVer.Text = "Windows Version: " + RegistryHelper.GetValue("HKLM\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", "DisplayVersion").ToString();
+            AtlasVer.Text = "Playbook version: " + RegistryHelper.GetValue("HKLM\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", "RegisteredOrganization").ToString();
 
             List<object> list = new();
 
-            for (int i = 0; i > 9; i++)
+            for (int i = 0; i < 9; i++)
             {
                 list.Add(RecentTogglesHelper.recentToggles[i]);
+                if (RecentTogglesHelper.recentToggles.Count == i + 1) i = 10; 
             }
             RecentTogglesList.ItemsSource = list;
             ProfilesListView.ItemsSource = _viewModel.ProfilesList;
             ProfilesListView.SelectedItem = _viewModel.ProfileSelected;
         }
 
-        private void AddProfile(object sender, RoutedEventArgs e)
-        {
-            _viewModel.AddProfileCommand.Execute(null);
-            ProfileNameTextBox.Text = "";
-        }
-
         /// <summary>
         /// Deletes the profile
         /// </summary>
@@ -63,7 +63,7 @@ private async void DeleteProfile(object sender, RoutedEventArgs e)
             {
                 var selectedItem = ProfilesListView.SelectedItem as Profiles;
 
-                if (selectedItem.Key != "default.txt")
+                if (selectedItem.Key != "default.json")
                 {
                     ContentDialog dialog = new ContentDialog();
 
@@ -103,10 +103,13 @@ private async void SetProfile_Click(object sender, RoutedEventArgs e)
             dialog.PrimaryButtonText = "Yes";
             dialog.CloseButtonText = "No";
             dialog.DefaultButton = ContentDialogButton.Primary;
-            dialog.PrimaryButtonCommand = _viewModel.SetProfileCommand;
 
             var result = await dialog.ShowAsync();
-            RestartPCPrompt();
+            if (result == ContentDialogResult.Primary)
+            {
+                RestartPCPrompt();
+                _viewModel.SetProfileCommand.Execute(this);
+            }
         }
 
         /// <summary>
@@ -125,11 +128,36 @@ private async void RestartPCPrompt()
             dialog.PrimaryButtonCommand = new RelayCommand(ComputerStateHelper.RestartComputer);
 
             var result = await dialog.ShowAsync();
+            if (result == ContentDialogResult.Primary)
+            {
+                ComputerStateHelper.RestartComputer();
+            }
+        }
+
+        private async void NewProfile()
+        {
+            ContentDialog dialog = new ContentDialog();
+
+            dialog.XamlRoot = this.XamlRoot;
+            dialog.Style = Application.Current.Resources["DefaultContentDialogStyle"] as Style;
+            dialog.Title = "Create a new profile";
+            dialog.PrimaryButtonText = "Create";
+            dialog.CloseButtonText = "Cancel";
+            dialog.Content = new NewProfilePage(_viewModel);
+            dialog.DefaultButton = ContentDialogButton.Primary;
+
+            var result = await dialog.ShowAsync();
+
+            if (result == ContentDialogResult.Primary)
+            {
+                _viewModel.AddProfileCommand.Execute(null);
+            }
+            Name = "";
         }
 
-        private void ProfileNameTextBox_TextChanged(object sender, TextChangedEventArgs e)
+        private void Button_Click(object sender, RoutedEventArgs e)
         {
-            _viewModel.Name = ProfileNameTextBox.Text;
+            NewProfile();
         }
     }
 }
diff --git a/AtlasToolbox/Views/NewProfilePage.xaml b/AtlasToolbox/Views/NewProfilePage.xaml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Page
+    x:Class="AtlasToolbox.Views.NewProfilePage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:AtlasToolbox.Views"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:viewmodel="using:AtlasToolbox.ViewModels"
+    d:DataContext="{d:DesignInstance Type=viewmodel:HomePageViewModel}"
+    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
+    mc:Ignorable="d">
+
+    <Grid>
+        <StackPanel HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+            <!--  Content body  -->
+            <TextBlock Text="Your current configuration will be saved to this profile" TextWrapping="Wrap" />
+            <TextBox
+                x:Name="ProfileName"
+                PlaceholderText="Name"
+                TextChanged="TextBox_TextChanged" />
+        </StackPanel>
+    </Grid>
+</Page>
diff --git a/AtlasToolbox/Views/NewProfilePage.xaml.cs b/AtlasToolbox/Views/NewProfilePage.xaml.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using AtlasToolbox.ViewModels;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
+
+namespace AtlasToolbox.Views
+{
+    public sealed partial class NewProfilePage : Page
+    {
+        private static HomePageViewModel _viewModel;
+        public NewProfilePage(HomePageViewModel homePageViewModel)
+        {
+            this.InitializeComponent();
+            this.DataContext = homePageViewModel;
+            _viewModel = homePageViewModel;
+        }
+
+        private void TextBox_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            _viewModel.Name = ProfileName.Text;
+        }
+    }
+}
diff --git a/AtlasToolbox/Views/SettingsPage.xaml b/AtlasToolbox/Views/SettingsPage.xaml
@@ -33,12 +33,9 @@
             </StackPanel>
             <StackPanel>
                 <TextBlock Style="{StaticResource CategoryTitle}" Text="About" />
-                <controls:SettingsExpander
-                    Description="© 2024 Microsoft. All rights reserved."
-                    Header="AtlasOS Toolbox"
-                    Style="{StaticResource ConfigurationSettingsExpanderTemplate}">
+                <controls:SettingsExpander Header="AtlasOS Toolbox" Style="{StaticResource ConfigurationSettingsExpanderTemplate}">
                     <controls:SettingsExpander.HeaderIcon>
-                        <BitmapIcon ShowAsMonochrome="False" UriSource="/assets/logo/toolbox-logo.png" />
+                        <BitmapIcon ShowAsMonochrome="False" UriSource="/assets/logo/toolbox-icon.ico" />
                     </controls:SettingsExpander.HeaderIcon>
                     <TextBlock
                         Foreground="{ThemeResource TextFillColorSecondaryBrush}"
diff --git a/AtlasToolbox/Views/SettingsPage.xaml.cs b/AtlasToolbox/Views/SettingsPage.xaml.cs
@@ -16,7 +16,7 @@ public string Version
         {
             get
             {
-                return ConfigurationManager.AppSettings.Get("ToolboxVersion");
+                return App.Version;
             }
         }
 
diff --git a/Installer/setup.iss b/Installer/setup.iss
@@ -2,13 +2,14 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Atlas Toolbox"
-#define MyAppVersion "0.1.2"
+#define MyAppVersion "0.1.4"
 #define MyAppPublisher "AtlasOS"
 #define MyAppURL "https://www.atlasos.net/"
 #define MyAppExeName "AtlasToolbox.exe"
 #define MyAppAssocName MyAppName + ""
 #define MyAppAssocExt ".exe"
 #define MyAppAssocKey StringChange(MyAppAssocName, " ", "") + MyAppAssocExt
+#define AppChannel "Beta"
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
@@ -49,14 +50,15 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 [Files]
 Source: "D:\a\atlas-toolbox\atlas-toolbox\Deploy\src\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 Source: "D:\a\atlas-toolbox\atlas-toolbox\Installer\Toolbox\*"; DestDir: "C:\Windows\AtlasModules\Toolbox"; Flags: ignoreversion recursesubdirs
-;Source: "C:\Users\TheyCreeper\Desktop\AtlasToolbox\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
-;Source: "C:\Users\TheyCreeper\Documents\Dev\atlas-toolbox\Installer\Toolbox\*"; DestDir: "C:\Windows\AtlasModules\Toolbox"; Flags: ignoreversion recursesubdirs
 
 [Registry]
 Root: HKA; Subkey: "Software\Classes\{#MyAppAssocExt}\OpenWithProgids"; ValueType: string; ValueName: "{#MyAppAssocKey}"; ValueData: ""; Flags: uninsdeletevalue
 Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}"; ValueType: string; ValueName: ""; ValueData: "{#MyAppAssocName}"; Flags: uninsdeletekey
 Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#MyAppExeName},0"
 Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#MyAppExeName}"" ""%1"""
+Root: HKLM; Subkey: "Software\AtlasOS\Toolbox"; ValueType: string; ValueName: "Channel"; ValueData: "{#AppChannel}"
+Root: HKLM; Subkey: "Software\AtlasOS\Toolbox"; ValueType: string; ValueName: "Version"; ValueData: "{#MyAppVersion}"
+
 
 [Icons]
 Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`using AtlasToolbox.Utils;`
`17`	`17`	`using System.Diagnostics;`
`18`	`18`	`using System.Collections.ObjectModel;`
	`19`	`+using System.Diagnostics.Contracts;`
`19`	`20`
`20`	`21`	`namespace AtlasToolbox`
`21`	`22`	`{`
`@@ -31,6 +32,8 @@ public partial class App : Application`
`31`	`32`	`public static string CurrentCategory { get; set; }`
`32`	`33`
`33`	`34`	`private static Mutex _mutex = new(true, "{AtlasToolbox}");`
	`35`	`+`
	`36`	`+ public static string Version { get; set; }`
`34`	`37`	`public App()`
`35`	`38`	`{`
`36`	`39`	`ConfigureNLog();`
`@@ -92,7 +95,7 @@ protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs ar`
`92`	`95`	`DebugSettings.BindingFailed += DebugSettings_BindingFailed;`
`93`	`96`	`}`
`94`	`97`	`#endif`
`95`		`-`
	`98`	`+ Version = RegistryHelper.GetValue($@"HKLM\SOFTWARE\AtlasOS\Toolbox", "Channel") + " v" + RegistryHelper.GetValue($@"HKLM\SOFTWARE\AtlasOS\Toolbox", "VersionNumber");`
`96`	`99`	`if (CompatibilityHelper.IsCompatible())`
`97`	`100`	`{`
`98`	`101`	`Task.Run(() => StartNamedPipeServer());`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public string Version`
`16`	`16`	`{`
`17`	`17`	`get`
`18`	`18`	`{`
`19`		`- return ConfigurationManager.AppSettings.Get("ToolboxVersion");`
	`19`	`+ return App.Version;`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`