Skip to content

Commit 9f84a13

Browse files
valnoxyvalnoxy
committed
Pre-Release 1
1 parent ec4c37d commit 9f84a13

16 files changed

+78
-98
lines changed

‎Dive/Dive.UI/Dive.UI.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
<Platforms>x64</Platforms>
1212
<Prefer32Bit>false</Prefer32Bit>
1313
<ApplicationManifest>app.manifest</ApplicationManifest>
14-
<ApplicationIcon>Dive.ico</ApplicationIcon>
14+
<ApplicationIcon>DiveV2.ico</ApplicationIcon>
1515
<AssemblyName>Dive</AssemblyName>
1616
<Company>Exploitox</Company>
1717
<Authors>valnoxy</Authors>
18-
<Version>1.0.0.508</Version>
18+
<Version>1.0.0.513</Version>
1919
<Copyright>Copyright © 2018 - 2023 Exploitox. All rights reserved.</Copyright>
2020
<PackageProjectUrl>https://github.com/valnoxy/dive</PackageProjectUrl>
2121
<RepositoryUrl>https://github.com/valnoxy/dive</RepositoryUrl>
@@ -36,7 +36,7 @@
3636
<None Remove="Assets\icon-windows-vista-40.png" />
3737
<None Remove="Assets\icon-windows-xp-40.png" />
3838
<None Remove="Assets\pexels-johannes-plenio-1103970.png" />
39-
<None Remove="Dive.ico" />
39+
<None Remove="DiveV2.ico" />
4040
</ItemGroup>
4141
<ItemGroup>
4242
<Page Remove="Localization\ResourceDictionary.de-DE.xaml" />
@@ -58,7 +58,7 @@
5858
<Resource Include="Assets\icon-windows-server-2012-40.png" />
5959
<Resource Include="Assets\icon-windows-vista-40.png" />
6060
<Resource Include="Assets\icon-windows-xp-40.png" />
61-
<Resource Include="dive.ico" />
61+
<Resource Include="DiveV2.ico" />
6262
<Resource Include="Localization\ResourceDictionary.de-DE.xaml" />
6363
<Resource Include="Localization\ResourceDictionary.xaml" />
6464
</ItemGroup>

‎Dive/Dive.UI/DiveV2.ico

111 KB
Binary file not shown.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<system:String x:Key="InjectDriversNoSource">Kein Quellverzeichnis ausgewählt.</system:String>
7171

7272
<system:String x:Key="MoreSettingsTitle">Weitere Einstellungen</system:String>
73-
<system:String x:Key="MoreSettingsDescription">Aktuell nicht implementiert</system:String>
73+
<system:String x:Key="MoreSettingsDescription">Eine Liste mit weiteren Einstellungen für die Bereitstellung.</system:String>
7474
<system:String x:Key="MoreSettingsBtn">Konfigurieren</system:String>
7575

7676
<system:String x:Key="SettingsImportExportTitle">Einstellungen Import- &amp; Exportieren</system:String>

‎Dive/Dive.UI/MainWindow.xaml

+4-2
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,14 @@
5050
<ui:SymbolIcon Symbol="Cloud24" />
5151
</ui:NavigationViewItem.Icon>
5252
</ui:NavigationViewItem>
53+
54+
<!-- Not implemented
5355
<ui:NavigationViewItem Content="{DynamicResource Tweaks}" TargetPageType="{x:Type pages:TweaksContent}">
5456
<ui:NavigationViewItem.Icon>
5557
<ui:SymbolIcon Symbol="Toolbox24" />
5658
</ui:NavigationViewItem.Icon>
5759
</ui:NavigationViewItem>
60+
-->
5861
</ui:NavigationView.MenuItems>
5962

6063
<ui:NavigationView.FooterMenuItems>
@@ -71,7 +74,6 @@
7174
</ui:NavigationView.FooterMenuItems>
7275
</ui:NavigationView>
7376

74-
7577
<StatusBar
7678
x:Name="RootStatusBar"
7779
Grid.Row="1"
@@ -145,7 +147,7 @@
145147
ShowMaximize="False"
146148
Grid.Row="0">
147149
<ui:TitleBar.Icon>
148-
<ui:ImageIcon Source="pack://application:,,,/dive.ico" />
150+
<ui:ImageIcon Source="pack://application:,,,/DiveV2.ico" />
149151
</ui:TitleBar.Icon>
150152
</ui:TitleBar>
151153

‎Dive/Dive.UI/MainWindow.xaml.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ public MainWindow()
3030
_displayDebugConsole = true;
3131
Branch.Text = "Development";
3232
#else
33-
DebugString.Visibility = Visibility.Visible;
34-
DebugString.Text = "Public Beta Build 7";
35-
Branch.Text = "Stable";
33+
DebugString.Visibility = Visibility.Hidden;
34+
//DebugString.Text = "Pre-Release 1";
35+
Branch.Text = "Pre-Release 1";
3636
#endif
3737
// Get version
3838
var assembly = Assembly.GetExecutingAssembly();

‎Dive/Dive.UI/Pages/AboutPage.xaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
<ColumnDefinition Width="Auto" />
9898
</Grid.ColumnDefinitions>
9999
<StackPanel Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Left" Orientation="Horizontal">
100-
<ui:Image Source="pack://application:,,,/Dive.ico" Width="30" Margin="0,0,10,0"/>
100+
<ui:Image Source="pack://application:,,,/DiveV2.ico" Width="30" Margin="0,0,10,0"/>
101101
<StackPanel>
102102
<Label Foreground="{DynamicResource TextFillColorPrimaryBrush}" Content="Dive" FontSize="15" Margin="0,0,0,-5"/>
103103
<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

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
FontSize="14"
9090
VerticalAlignment="Center"
9191
Text="{DynamicResource Password}" />
92-
<ui:PasswordBox
92+
<ui:TextBox
9393
x:Name="TbPassword"
9494
Grid.Column="1"
9595
Grid.Row="1"

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

+25-27
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
1-
using Microsoft.Win32;
1+
using Dive.UI.Common;
2+
using Dive.UI.Pages.Extras;
3+
using Microsoft.Win32;
4+
using Path = System.IO.Path;
25
using System;
3-
using System.Collections.Generic;
46
using System.Windows;
57
using System.Windows.Controls;
6-
using Dive.UI.Common;
78
using System.IO;
89
using System.Linq;
9-
using System.Xml.Serialization;
10-
using Path = System.IO.Path;
1110
using System.Xml;
12-
using Dive.UI.Pages.Extras;
13-
using Wpf.Ui.Controls;
11+
using System.Xml.Serialization;
1412

1513
namespace Dive.UI.Pages.ApplyPages
1614
{
@@ -22,8 +20,8 @@ public partial class DeploymentSettingsStep : UserControl
2220
public DeploymentSettingsStep()
2321
{
2422
InitializeComponent();
25-
Common.DeploymentInfo.UseUserInfo = false;
26-
Common.OemInfo.UseOemInfo = false;
23+
DeploymentInfo.UseUserInfo = false;
24+
OemInfo.UseOemInfo = false;
2725
}
2826

2927
private void TbUser_OnTextChanged(object sender, TextChangedEventArgs e)
@@ -36,13 +34,13 @@ private void TbUser_OnTextChanged(object sender, TextChangedEventArgs e)
3634
else
3735
{
3836
TbPassword.IsEnabled = true;
39-
Common.DeploymentInfo.Username = TbUser.Text;
37+
DeploymentInfo.Username = TbUser.Text;
4038
}
4139
}
4240

4341
private void TbPassword_OnTextChanged(object sender, TextChangedEventArgs e)
4442
{
45-
Common.DeploymentInfo.Password = TbPassword.Text;
43+
DeploymentInfo.Password = TbPassword.Text;
4644
}
4745

4846
private void OEMLogo_OpenFileClick(object sender, RoutedEventArgs e)
@@ -60,37 +58,37 @@ private void OEMLogo_OpenFileClick(object sender, RoutedEventArgs e)
6058

6159
private void TbLogo_OnTextChanged(object sender, TextChangedEventArgs e)
6260
{
63-
Common.OemInfo.LogoPath = TbLogo.Text;
61+
OemInfo.LogoPath = TbLogo.Text;
6462
}
6563

6664
private void TbManufacturer_OnTextChanged(object sender, TextChangedEventArgs e)
6765
{
68-
Common.OemInfo.Manufacturer = TbManufacturer.Text;
66+
OemInfo.Manufacturer = TbManufacturer.Text;
6967
}
7068

7169
private void TbModel_OnTextChanged(object sender, TextChangedEventArgs e)
7270
{
73-
Common.OemInfo.Model = TbModel.Text;
71+
OemInfo.Model = TbModel.Text;
7472
}
7573

7674
private void TbSupportHours_OnTextChanged(object sender, TextChangedEventArgs e)
7775
{
78-
Common.OemInfo.SupportHours = TbSupportHours.Text;
76+
OemInfo.SupportHours = TbSupportHours.Text;
7977
}
8078

8179
private void TbPhone_OnTextChanged(object sender, TextChangedEventArgs e)
8280
{
83-
Common.OemInfo.SupportPhone = TbPhone.Text;
81+
OemInfo.SupportPhone = TbPhone.Text;
8482
}
8583

8684
private void TbUrl_OnTextChanged(object sender, TextChangedEventArgs e)
8785
{
88-
Common.OemInfo.SupportURL = TbUrl.Text;
86+
OemInfo.SupportURL = TbUrl.Text;
8987
}
9088

9189
private void User_Switch(object sender, RoutedEventArgs e)
9290
{
93-
Common.DeploymentInfo.UseUserInfo = ToggleUser.IsChecked.Value;
91+
DeploymentInfo.UseUserInfo = ToggleUser.IsChecked.Value;
9492
if (ToggleUser.IsChecked.Value)
9593
{
9694
Debug.Write("Use User Information in Unattend: ");
@@ -105,7 +103,7 @@ private void User_Switch(object sender, RoutedEventArgs e)
105103

106104
private void Oem_Switch(object sender, RoutedEventArgs e)
107105
{
108-
Common.OemInfo.UseOemInfo = ToggleOem.IsChecked.Value;
106+
OemInfo.UseOemInfo = ToggleOem.IsChecked.Value;
109107
if (ToggleOem.IsChecked.Value)
110108
{
111109
Debug.Write("Use OEM Information in Unattend: ");
@@ -170,7 +168,7 @@ private void Import_OnClicked(object sender, RoutedEventArgs e)
170168
}
171169
else
172170
{
173-
171+
// TODO: Add Error handling
174172
}
175173
}
176174

@@ -284,7 +282,7 @@ private void Export_OnClicked(object sender, RoutedEventArgs e)
284282
}
285283
catch
286284
{
287-
285+
// TODO: Add error handling
288286
}
289287
}
290288

@@ -367,14 +365,14 @@ private void Source_OpenFolderClick(object sender, RoutedEventArgs e)
367365
var driverWindow = new LoadDriversLiveSystem(infFiles);
368366
driverWindow.ShowDialog();
369367
}
370-
Common.Debug.Write("Found");
371-
Common.Debug.Write(infFiles.Count.ToString(), true, ConsoleColor.DarkYellow);
372-
Common.Debug.Write("drivers.", true);
373-
Common.ApplyDetails.DriverList = infFiles;
368+
Debug.Write("Found");
369+
Debug.Write(infFiles.Count.ToString(), true, ConsoleColor.DarkYellow);
370+
Debug.Write("drivers.", true);
371+
ApplyDetails.DriverList = infFiles;
374372
break;
375373
case 0:
376-
Common.Debug.Write("No drivers was found in the selected directory.");
377-
Common.ApplyDetails.DriverList = null;
374+
Debug.Write("No drivers was found in the selected directory.");
375+
ApplyDetails.DriverList = null;
378376
break;
379377
}
380378
}

‎Dive/Dive.UI/Pages/Dashboard.xaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@
134134
Text="{DynamicResource CloudInstallationDescription}" />
135135
</StackPanel>
136136
</ui:CardAction>
137+
<!--
137138
<ui:CardAction
138139
Margin="0,0,0,8"
139140
Click="SwitchToRepairPage"
@@ -149,7 +150,7 @@
149150
Text="{DynamicResource RepairAndTweaksDescription}" />
150151
</StackPanel>
151152
</ui:CardAction>
152-
153+
-->
153154
<Label Content="Made with ❤️ by valnoxy"/>
154155
</StackPanel>
155156
</Grid>

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

+29-9
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@
77
mc:Ignorable="d"
88
Title="Dive - Deployment Settings" MinHeight="600" MinWidth="650" MaxHeight="600" MaxWidth="650"
99
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
10+
xmlns:unattendConfigurationPages="clr-namespace:Dive.UI.Pages.Extras.UnattendConfigurationPages"
1011
Background="{ui:ThemeResource ApplicationBackgroundBrush}"
1112
WindowStartupLocation="CenterScreen"
1213
ExtendsContentIntoTitleBar="True"
1314
WindowBackdropType="Mica"
1415
WindowCornerPreference="Round"
1516
ResizeMode="NoResize"
16-
ContentRendered="UnattendConfiguration_OnContentRendered"
17+
Loaded="UnattendConfiguration_OnLoaded"
1718
Closing="UnattendConfiguration_OnClosing">
1819

1920
<Grid>
@@ -27,18 +28,37 @@
2728
<ColumnDefinition Width="*" />
2829
</Grid.ColumnDefinitions>
2930

30-
<ui:NavigationView
31-
x:Name="NavView"
32-
Grid.Column="0"
33-
Margin="6,0,6,0"
34-
Loaded="NavView_OnLoaded"/>
31+
<ui:NavigationView x:Name="NavView" PaneDisplayMode="Top" IsBackButtonVisible="Auto" Margin="6,0" Grid.Row="0">
32+
<ui:NavigationView.MenuItems>
33+
<ui:NavigationViewItem Content="{DynamicResource Deployment}" TargetPageType="{x:Type unattendConfigurationPages:DeploymentConfigurationPage}">
34+
<ui:NavigationViewItem.Icon>
35+
<ui:SymbolIcon Symbol="HardDrive20" />
36+
</ui:NavigationViewItem.Icon>
37+
</ui:NavigationViewItem>
38+
<ui:NavigationViewItem Content="{DynamicResource OOBE}" TargetPageType="{x:Type unattendConfigurationPages:OOBEConfigurationPage}">
39+
<ui:NavigationViewItem.Icon>
40+
<ui:SymbolIcon Symbol="CheckboxPerson24" />
41+
</ui:NavigationViewItem.Icon>
42+
</ui:NavigationViewItem>
43+
<!-- Not implemented
44+
<ui:NavigationViewItem Content="{DynamicResource Application}" TargetPageType="{x:Type unattendConfigurationPages:ApplicationConfigurationPage}">
45+
<ui:NavigationViewItem.Icon>
46+
<ui:SymbolIcon Symbol="AppGeneric24" />
47+
</ui:NavigationViewItem.Icon>
48+
</ui:NavigationViewItem>
49+
-->
50+
</ui:NavigationView.MenuItems>
51+
</ui:NavigationView>
3552
</Grid>
3653

3754
<ui:TitleBar
3855
Title="Deployment Settings"
39-
ShowMaximize="False"
40-
Icon="pack://application:,,,/Dive.ico"
4156
ShowMinimize="False"
42-
Grid.Row="0"/>
57+
ShowMaximize="False"
58+
Grid.Row="0">
59+
<ui:TitleBar.Icon>
60+
<ui:ImageIcon Source="pack://application:,,,/DiveV2.ico" />
61+
</ui:TitleBar.Icon>
62+
</ui:TitleBar>
4363
</Grid>
4464
</ui:FluentWindow>

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

+2-44
Original file line numberDiff line numberDiff line change
@@ -18,51 +18,9 @@ public UnattendConfiguration()
1818
InitializeComponent();
1919
}
2020

21-
private void NavView_OnLoaded(object sender, RoutedEventArgs e)
21+
private void UnattendConfiguration_OnLoaded(object sender, RoutedEventArgs e)
2222
{
23-
var navItems = new List<INavigationViewItem>
24-
{
25-
new NavigationViewItem
26-
{
27-
Content = Common.LocalizationManager.LocalizeValue("Deployment"),
28-
Icon = new SymbolIcon
29-
{
30-
Symbol = SymbolRegular.HardDrive20
31-
},
32-
TargetPageTag = "deployment",
33-
TargetPageType = new TypeDelegator(typeof(Extras.UnattendConfigurationPages.DeploymentConfigurationPage))
34-
},
35-
new NavigationViewItem
36-
{
37-
Content = Common.LocalizationManager.LocalizeValue("OOBE"),
38-
Icon = new SymbolIcon
39-
{
40-
Symbol = SymbolRegular.CheckboxPerson20
41-
},
42-
TargetPageTag = "oobe",
43-
TargetPageType = new TypeDelegator(typeof(Extras.UnattendConfigurationPages.OOBEConfigurationPage))
44-
},
45-
new NavigationViewItem
46-
{
47-
Content = Common.LocalizationManager.LocalizeValue("Application"),
48-
Icon = new SymbolIcon
49-
{
50-
Symbol = SymbolRegular.AppGeneric20
51-
},
52-
TargetPageTag = "application",
53-
TargetPageType = new TypeDelegator(typeof(Extras.UnattendConfigurationPages.ApplicationConfigurationPage))
54-
}
55-
};
56-
57-
NavView.MenuItems = navItems;
58-
NavView.PaneDisplayMode = NavigationViewPaneDisplayMode.Top;
59-
NavView.IsBackButtonVisible = NavigationViewBackButtonVisible.Collapsed;
60-
NavView.Navigate(typeof(Extras.UnattendConfigurationPages.DeploymentConfigurationPage));
61-
}
62-
63-
private void UnattendConfiguration_OnContentRendered(object? sender, EventArgs e)
64-
{
65-
NavView.Navigate(typeof(Extras.UnattendConfigurationPages.DeploymentConfigurationPage)); // Workaround
23+
NavView.Navigate(typeof(UnattendConfigurationPages.DeploymentConfigurationPage));
6624
}
6725

6826
private void UnattendConfiguration_OnClosing(object? sender, CancelEventArgs e)

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
FontSize="14"
132132
VerticalAlignment="Center"
133133
Text="Password" />
134-
<ui:PasswordBox
134+
<ui:TextBox
135135
x:Name="TbDomainPassword"
136136
Grid.Column="1"
137137
Grid.Row="1"

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

+1
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ private void TbDomainUser_OnTextChanged(object sender, TextChangedEventArgs e)
206206
private void TbDomainPassword_OnTextChanged(object sender, TextChangedEventArgs e)
207207
{
208208
DomainInfo.Password = TbDomainPassword.Text;
209+
Debug.WriteLine("Password: " + DomainInfo.Password);
209210
}
210211

211212
private void TbDomain_OnTextChanged(object sender, TextChangedEventArgs e)

‎Dive/Dive.UI/dive.ico

-153 KB
Binary file not shown.

0 commit comments

Comments
 (0)