Pre-Release 1

Dive/Dive.UI/Dive.UI.csproj

@@ -11,11 +11,11 @@
 		<Platforms>x64</Platforms>
 		<Prefer32Bit>false</Prefer32Bit>
 		<ApplicationManifest>app.manifest</ApplicationManifest>
-		<ApplicationIcon>Dive.ico</ApplicationIcon>
+		<ApplicationIcon>DiveV2.ico</ApplicationIcon>
 		<AssemblyName>Dive</AssemblyName>
 		<Company>Exploitox</Company>
 		<Authors>valnoxy</Authors>
-		<Version>1.0.0.508</Version>
+		<Version>1.0.0.513</Version>
 		<Copyright>Copyright © 2018 - 2023 Exploitox. All rights reserved.</Copyright>
 		<PackageProjectUrl>https://github.com/valnoxy/dive</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/valnoxy/dive</RepositoryUrl>
@@ -36,7 +36,7 @@
 		<None Remove="Assets\icon-windows-vista-40.png" />
 		<None Remove="Assets\icon-windows-xp-40.png" />
 		<None Remove="Assets\pexels-johannes-plenio-1103970.png" />
-		<None Remove="Dive.ico" />
+		<None Remove="DiveV2.ico" />
 	</ItemGroup>
 	<ItemGroup>
 		<Page Remove="Localization\ResourceDictionary.de-DE.xaml" />
@@ -58,7 +58,7 @@
 		<Resource Include="Assets\icon-windows-server-2012-40.png" />
 		<Resource Include="Assets\icon-windows-vista-40.png" />
 		<Resource Include="Assets\icon-windows-xp-40.png" />
-		<Resource Include="dive.ico" />
+		<Resource Include="DiveV2.ico" />
 		<Resource Include="Localization\ResourceDictionary.de-DE.xaml" />
 		<Resource Include="Localization\ResourceDictionary.xaml" />
 	</ItemGroup>

Dive/Dive.UI/Localization/ResourceDictionary.de-DE.xaml

@@ -70,7 +70,7 @@
     <system:String x:Key="InjectDriversNoSource">Kein Quellverzeichnis ausgewählt.</system:String>
 
     <system:String x:Key="MoreSettingsTitle">Weitere Einstellungen</system:String>
-    <system:String x:Key="MoreSettingsDescription">Aktuell nicht implementiert</system:String>
+    <system:String x:Key="MoreSettingsDescription">Eine Liste mit weiteren Einstellungen für die Bereitstellung.</system:String>
     <system:String x:Key="MoreSettingsBtn">Konfigurieren</system:String>
 
     <system:String x:Key="SettingsImportExportTitle">Einstellungen Import- &amp; Exportieren</system:String>

Dive/Dive.UI/MainWindow.xaml

@@ -50,11 +50,14 @@
                             <ui:SymbolIcon Symbol="Cloud24" />
                         </ui:NavigationViewItem.Icon>
                     </ui:NavigationViewItem>
+
+                    <!-- Not implemented
                     <ui:NavigationViewItem Content="{DynamicResource Tweaks}" TargetPageType="{x:Type pages:TweaksContent}">
                         <ui:NavigationViewItem.Icon>
                             <ui:SymbolIcon Symbol="Toolbox24" />
                         </ui:NavigationViewItem.Icon>
                     </ui:NavigationViewItem>
+                    -->
                 </ui:NavigationView.MenuItems>
 
                 <ui:NavigationView.FooterMenuItems>
@@ -71,7 +74,6 @@
                 </ui:NavigationView.FooterMenuItems>
             </ui:NavigationView>
 
-
             <StatusBar
                 x:Name="RootStatusBar"
                 Grid.Row="1"
@@ -145,7 +147,7 @@
             ShowMaximize="False"
             Grid.Row="0">
             <ui:TitleBar.Icon>
-                <ui:ImageIcon Source="pack://application:,,,/dive.ico" />
+                <ui:ImageIcon Source="pack://application:,,,/DiveV2.ico" />
             </ui:TitleBar.Icon>
         </ui:TitleBar>
 

Dive/Dive.UI/MainWindow.xaml.cs

@@ -30,9 +30,9 @@ public MainWindow()
             _displayDebugConsole = true;
             Branch.Text = "Development";
 #else
-            DebugString.Visibility = Visibility.Visible;
-            DebugString.Text = "Public Beta Build 7";
-            Branch.Text = "Stable";
+            DebugString.Visibility = Visibility.Hidden;
+            //DebugString.Text = "Pre-Release 1";
+            Branch.Text = "Pre-Release 1";
 #endif
             // Get version
             var assembly = Assembly.GetExecutingAssembly();

Dive/Dive.UI/Pages/AboutPage.xaml

@@ -97,7 +97,7 @@
                                     <ColumnDefinition Width="Auto" />
                                 </Grid.ColumnDefinitions>
                                 <StackPanel Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Left" Orientation="Horizontal">
-                                    <ui:Image Source="pack://application:,,,/Dive.ico" Width="30" Margin="0,0,10,0"/>
+                                    <ui:Image Source="pack://application:,,,/DiveV2.ico" Width="30" Margin="0,0,10,0"/>
                                     <StackPanel>
                                         <Label Foreground="{DynamicResource TextFillColorPrimaryBrush}" Content="Dive" FontSize="15" Margin="0,0,0,-5"/>
                                         <Label x:Name="ValueCopyright" Foreground="{DynamicResource TextFillColorPrimaryBrush}" Content="Copyright © Exploitox." FontSize="15" FontFamily="Segoe UI Variable Display"/>

Dive/Dive.UI/Pages/ApplyPages/DeploymentSettingsStep_old.xaml

@@ -89,7 +89,7 @@
                                     FontSize="14"
                                     VerticalAlignment="Center"
                                     Text="{DynamicResource Password}" />
-                                <ui:PasswordBox
+                                <ui:TextBox
                                     x:Name="TbPassword" 
                                     Grid.Column="1" 
                                     Grid.Row="1"

Dive/Dive.UI/Pages/ApplyPages/DeploymentSettingsStep_old.xaml.cs

@@ -1,16 +1,14 @@
-using Microsoft.Win32;
+using Dive.UI.Common;
+using Dive.UI.Pages.Extras;
+using Microsoft.Win32;
+using Path = System.IO.Path;
 using System;
-using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Controls;
-using Dive.UI.Common;
 using System.IO;
 using System.Linq;
-using System.Xml.Serialization;
-using Path = System.IO.Path;
 using System.Xml;
-using Dive.UI.Pages.Extras;
-using Wpf.Ui.Controls;
+using System.Xml.Serialization;
 
 namespace Dive.UI.Pages.ApplyPages
 {
@@ -22,8 +20,8 @@ public partial class DeploymentSettingsStep : UserControl
         public DeploymentSettingsStep()
         {
             InitializeComponent();
-            Common.DeploymentInfo.UseUserInfo = false;
-            Common.OemInfo.UseOemInfo = false;
+            DeploymentInfo.UseUserInfo = false;
+            OemInfo.UseOemInfo = false;
         }
 
         private void TbUser_OnTextChanged(object sender, TextChangedEventArgs e)
@@ -36,13 +34,13 @@ private void TbUser_OnTextChanged(object sender, TextChangedEventArgs e)
             else
             {
                 TbPassword.IsEnabled = true;
-                Common.DeploymentInfo.Username = TbUser.Text;
+                DeploymentInfo.Username = TbUser.Text;
             }
         }
 
         private void TbPassword_OnTextChanged(object sender, TextChangedEventArgs e)
         {
-            Common.DeploymentInfo.Password = TbPassword.Text;
+            DeploymentInfo.Password = TbPassword.Text;
         }
 
         private void OEMLogo_OpenFileClick(object sender, RoutedEventArgs e)
@@ -60,37 +58,37 @@ private void OEMLogo_OpenFileClick(object sender, RoutedEventArgs e)
 
         private void TbLogo_OnTextChanged(object sender, TextChangedEventArgs e)
         {
-            Common.OemInfo.LogoPath = TbLogo.Text;
+            OemInfo.LogoPath = TbLogo.Text;
         }
 
         private void TbManufacturer_OnTextChanged(object sender, TextChangedEventArgs e)
         {
-            Common.OemInfo.Manufacturer = TbManufacturer.Text;
+            OemInfo.Manufacturer = TbManufacturer.Text;
         }
 
         private void TbModel_OnTextChanged(object sender, TextChangedEventArgs e)
         {
-            Common.OemInfo.Model = TbModel.Text;
+            OemInfo.Model = TbModel.Text;
         }
 
         private void TbSupportHours_OnTextChanged(object sender, TextChangedEventArgs e)
         {
-            Common.OemInfo.SupportHours = TbSupportHours.Text;
+            OemInfo.SupportHours = TbSupportHours.Text;
         }
 
         private void TbPhone_OnTextChanged(object sender, TextChangedEventArgs e)
         {
-            Common.OemInfo.SupportPhone = TbPhone.Text;
+            OemInfo.SupportPhone = TbPhone.Text;
         }
 
         private void TbUrl_OnTextChanged(object sender, TextChangedEventArgs e)
         {
-            Common.OemInfo.SupportURL = TbUrl.Text;
+            OemInfo.SupportURL = TbUrl.Text;
         }
 
         private void User_Switch(object sender, RoutedEventArgs e)
         {
-            Common.DeploymentInfo.UseUserInfo = ToggleUser.IsChecked.Value;
+            DeploymentInfo.UseUserInfo = ToggleUser.IsChecked.Value;
             if (ToggleUser.IsChecked.Value)
             {
                 Debug.Write("Use User Information in Unattend: ");
@@ -105,7 +103,7 @@ private void User_Switch(object sender, RoutedEventArgs e)
 
         private void Oem_Switch(object sender, RoutedEventArgs e)
         {
-            Common.OemInfo.UseOemInfo = ToggleOem.IsChecked.Value;
+            OemInfo.UseOemInfo = ToggleOem.IsChecked.Value;
             if (ToggleOem.IsChecked.Value)
             {
                 Debug.Write("Use OEM Information in Unattend: ");
@@ -170,7 +168,7 @@ private void Import_OnClicked(object sender, RoutedEventArgs e)
                         }
                         else
                         {
-
+                            // TODO: Add Error handling
                         }
                     }
 
@@ -284,7 +282,7 @@ private void Export_OnClicked(object sender, RoutedEventArgs e)
                 }
                 catch
                 {
-
+                    // TODO: Add error handling
                 }
             }
 
@@ -367,14 +365,14 @@ private void Source_OpenFolderClick(object sender, RoutedEventArgs e)
                             var driverWindow = new LoadDriversLiveSystem(infFiles);
                             driverWindow.ShowDialog();
                         }
-                        Common.Debug.Write("Found");
-                        Common.Debug.Write(infFiles.Count.ToString(), true, ConsoleColor.DarkYellow);
-                        Common.Debug.Write("drivers.", true);
-                        Common.ApplyDetails.DriverList = infFiles;
+                        Debug.Write("Found");
+                        Debug.Write(infFiles.Count.ToString(), true, ConsoleColor.DarkYellow);
+                        Debug.Write("drivers.", true);
+                        ApplyDetails.DriverList = infFiles;
                         break;
                     case 0:
-                        Common.Debug.Write("No drivers was found in the selected directory.");
-                        Common.ApplyDetails.DriverList = null;
+                        Debug.Write("No drivers was found in the selected directory.");
+                        ApplyDetails.DriverList = null;
                         break;
                 }
             }

Dive/Dive.UI/Pages/Dashboard.xaml

@@ -134,6 +134,7 @@
                             Text="{DynamicResource CloudInstallationDescription}" />
                     </StackPanel>
                 </ui:CardAction>
+                <!--
                 <ui:CardAction
                     Margin="0,0,0,8"
                     Click="SwitchToRepairPage"
@@ -149,7 +150,7 @@
                             Text="{DynamicResource RepairAndTweaksDescription}" />
                     </StackPanel>
                 </ui:CardAction>
-
+                -->
                 <Label Content="Made with ❤️ by valnoxy"/>
             </StackPanel>
         </Grid>

Dive/Dive.UI/Pages/Extras/UnattendConfiguration.xaml

@@ -7,13 +7,14 @@
         mc:Ignorable="d"
         Title="Dive - Deployment Settings" MinHeight="600" MinWidth="650" MaxHeight="600" MaxWidth="650"
         xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
+        xmlns:unattendConfigurationPages="clr-namespace:Dive.UI.Pages.Extras.UnattendConfigurationPages"
         Background="{ui:ThemeResource ApplicationBackgroundBrush}"
         WindowStartupLocation="CenterScreen"
         ExtendsContentIntoTitleBar="True"
         WindowBackdropType="Mica"
         WindowCornerPreference="Round"
         ResizeMode="NoResize"
-        ContentRendered="UnattendConfiguration_OnContentRendered"
+        Loaded="UnattendConfiguration_OnLoaded"
         Closing="UnattendConfiguration_OnClosing">
 
     <Grid>
@@ -27,18 +28,37 @@
                 <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
 
-            <ui:NavigationView
-                x:Name="NavView"
-                Grid.Column="0"
-                Margin="6,0,6,0"
-                Loaded="NavView_OnLoaded"/>
+            <ui:NavigationView x:Name="NavView" PaneDisplayMode="Top" IsBackButtonVisible="Auto" Margin="6,0" Grid.Row="0">
+                <ui:NavigationView.MenuItems>
+                    <ui:NavigationViewItem Content="{DynamicResource Deployment}" TargetPageType="{x:Type unattendConfigurationPages:DeploymentConfigurationPage}">
+                        <ui:NavigationViewItem.Icon>
+                            <ui:SymbolIcon Symbol="HardDrive20" />
+                        </ui:NavigationViewItem.Icon>
+                    </ui:NavigationViewItem>
+                    <ui:NavigationViewItem Content="{DynamicResource OOBE}" TargetPageType="{x:Type unattendConfigurationPages:OOBEConfigurationPage}">
+                        <ui:NavigationViewItem.Icon>
+                            <ui:SymbolIcon Symbol="CheckboxPerson24" />
+                        </ui:NavigationViewItem.Icon>
+                    </ui:NavigationViewItem>
+                    <!-- Not implemented
+                    <ui:NavigationViewItem Content="{DynamicResource Application}" TargetPageType="{x:Type unattendConfigurationPages:ApplicationConfigurationPage}">
+                        <ui:NavigationViewItem.Icon>
+                            <ui:SymbolIcon Symbol="AppGeneric24" />
+                        </ui:NavigationViewItem.Icon>
+                    </ui:NavigationViewItem>
+                    -->
+                </ui:NavigationView.MenuItems>
+            </ui:NavigationView>
         </Grid>
 
         <ui:TitleBar
             Title="Deployment Settings"
-            ShowMaximize="False"
-            Icon="pack://application:,,,/Dive.ico"
             ShowMinimize="False"
-            Grid.Row="0"/>
+            ShowMaximize="False"
+            Grid.Row="0">
+            <ui:TitleBar.Icon>
+                <ui:ImageIcon Source="pack://application:,,,/DiveV2.ico" />
+            </ui:TitleBar.Icon>
+        </ui:TitleBar>
     </Grid>
 </ui:FluentWindow>

Dive/Dive.UI/Pages/Extras/UnattendConfiguration.xaml.cs

@@ -18,51 +18,9 @@ public UnattendConfiguration()
             InitializeComponent();
         }
 
-        private void NavView_OnLoaded(object sender, RoutedEventArgs e)
+        private void UnattendConfiguration_OnLoaded(object sender, RoutedEventArgs e)
         {
-            var navItems = new List<INavigationViewItem>
-            {
-                new NavigationViewItem
-                {
-                    Content = Common.LocalizationManager.LocalizeValue("Deployment"),
-                    Icon = new SymbolIcon
-                    {
-                        Symbol = SymbolRegular.HardDrive20
-                    },
-                    TargetPageTag = "deployment",
-                    TargetPageType = new TypeDelegator(typeof(Extras.UnattendConfigurationPages.DeploymentConfigurationPage))
-                },
-                new NavigationViewItem
-                {
-                    Content = Common.LocalizationManager.LocalizeValue("OOBE"),
-                    Icon = new SymbolIcon
-                    {
-                        Symbol = SymbolRegular.CheckboxPerson20
-                    },
-                    TargetPageTag = "oobe",
-                    TargetPageType = new TypeDelegator(typeof(Extras.UnattendConfigurationPages.OOBEConfigurationPage))
-                },
-                new NavigationViewItem
-                {
-                    Content = Common.LocalizationManager.LocalizeValue("Application"),
-                    Icon = new SymbolIcon
-                    {
-                        Symbol = SymbolRegular.AppGeneric20
-                    },
-                    TargetPageTag = "application",
-                    TargetPageType = new TypeDelegator(typeof(Extras.UnattendConfigurationPages.ApplicationConfigurationPage))
-                }
-            };
-
-            NavView.MenuItems = navItems;
-            NavView.PaneDisplayMode = NavigationViewPaneDisplayMode.Top;
-            NavView.IsBackButtonVisible = NavigationViewBackButtonVisible.Collapsed;
-            NavView.Navigate(typeof(Extras.UnattendConfigurationPages.DeploymentConfigurationPage));
-        }
-
-        private void UnattendConfiguration_OnContentRendered(object? sender, EventArgs e)
-        {
-            NavView.Navigate(typeof(Extras.UnattendConfigurationPages.DeploymentConfigurationPage)); // Workaround
+            NavView.Navigate(typeof(UnattendConfigurationPages.DeploymentConfigurationPage));
         }
 
         private void UnattendConfiguration_OnClosing(object? sender, CancelEventArgs e)

Dive/Dive.UI/Pages/Extras/UnattendConfigurationPages/OOBEConfigurationPage.xaml

@@ -131,7 +131,7 @@
                             FontSize="14"
                             VerticalAlignment="Center"
                             Text="Password" />
-                        <ui:PasswordBox
+                        <ui:TextBox
                             x:Name="TbDomainPassword" 
                             Grid.Column="1" 
                             Grid.Row="1"

Dive/Dive.UI/Pages/Extras/UnattendConfigurationPages/OOBEConfigurationPage.xaml.cs

@@ -206,6 +206,7 @@ private void TbDomainUser_OnTextChanged(object sender, TextChangedEventArgs e)
         private void TbDomainPassword_OnTextChanged(object sender, TextChangedEventArgs e)
         {
             DomainInfo.Password = TbDomainPassword.Text;
+            Debug.WriteLine("Password: " + DomainInfo.Password);
         }
 
         private void TbDomain_OnTextChanged(object sender, TextChangedEventArgs e)