Squashed commit of the following:

commit c2c1a01 Author: CodingWonders <[email protected]> Date: Sat Nov 18 10:59:11 2023 +0100 Update README.md Update nightly installer link commit 503fdf8 Merge: 874b748 0b8fa3f Author: CodingWonders <[email protected]> Date: Sat Nov 18 10:50:55 2023 +0100 Merge pull request #66 from CodingWonders/dt_pre_23113 DISMTools 0.4 Preview 3 commit 0b8fa3f Author: CodingWonders <[email protected]> Date: Sat Nov 18 10:45:32 2023 +0100 Update What's New section, and update system information files commit 064d4e4 Author: CodingWonders <[email protected]> Date: Fri Nov 17 22:05:06 2023 +0100 Do not show the RTB again commit f98e847 Author: CodingWonders <[email protected]> Date: Fri Nov 17 20:26:26 2023 +0100 Inform user when report is being saved commit bbc61ba Author: CodingWonders <[email protected]> Date: Fri Nov 17 17:34:17 2023 +0100 Perform smooth progress bar value update commit 110dd02 Author: CodingWonders <[email protected]> Date: Thu Nov 16 22:18:09 2023 +0100 Replace helper command with native WMI queries commit 3b5b32e Author: CodingWonders <[email protected]> Date: Thu Nov 16 18:55:35 2023 +0100 Modernize initial setup screen commit c96132d Author: CodingWonders <[email protected]> Date: Thu Nov 16 16:29:42 2023 +0100 Correctly detect the offline installation management mode commit 410ae44 Author: CodingWonders <[email protected]> Date: Mon Nov 13 16:03:59 2023 +0100 Don't show "Could not get value MB" commit a36fb90 Author: CodingWonders <[email protected]> Date: Mon Nov 13 15:26:27 2023 +0100 Fixed image info saver exception commit 07b1f43 Merge: 95b469f 84d1a85 Author: CodingWonders <[email protected]> Date: Sun Nov 12 16:05:39 2023 +0100 Merge pull request #64 from CodingWonders/dt_pre/next-design DISMTools Design Refresh (2023/11/12)
CodingWonders · Nov 18, 2023 · 20d3639 · 20d3639
1 parent 84d1a85
commit 20d3639
Show file tree

Hide file tree

Showing 25 changed files with 273 additions and 63 deletions.
diff --git a/DISMTools.vbproj b/DISMTools.vbproj
@@ -91,6 +91,9 @@
     <Reference Include="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <Private>True</Private>
     </Reference>
+    <Reference Include="System.Management">
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <Private>True</Private>
     </Reference>
@@ -1043,6 +1046,9 @@
     <None Include="Resources\split_img.png" />
     <None Include="Resources\export_driver.png" />
     <None Include="Resources\about\mdl_discussion.png" />
+    <None Include="Resources\FirstUse\backbox.png" />
+    <None Include="Resources\FirstUse\backbox_down.png" />
+    <None Include="Resources\FirstUse\backbox_focus.png" />
     <Content Include="ThemeVS2012\Resources\Dockindicator_PaneDiamond_Hotspot.png" />
     <Content Include="ThemeVS2012\Resources\DockIndicator_PaneDiamond_HotspotIndex.png" />
     <Content Include="ThemeVS2012\Resources\MaskArrowBottom.png" />

diff --git a/Helpers/dthelper.bat b/Helpers/dthelper.bat
@@ -33,6 +33,11 @@ if "%1%"=="/sh" (
 
 :dt_wmic
 cls
+
+:: Show deprecation notice
+echo This function is deprecated and has been replaced by native WMI commands.
+echo You can still access this function, but it will be removed in the future.
+
 echo Getting drive information. Please wait...
 if exist .\wmic (
 	del .\wmic

diff --git a/Installer/Output/dt_setup.exe b/Installer/Output/dt_setup.exe
diff --git a/Installer/dt.iss b/Installer/dt.iss
@@ -69,6 +69,7 @@ Source: ".\files\Microsoft.Dism.dll"; DestDir: "{#pfDir}"; Flags: ignoreversion
 Source: ".\files\ScintillaNET.dll"; DestDir: "{#pfDir}"; Flags: ignoreversion
 Source: ".\files\System.dll"; DestDir: "{#pfDir}"; Flags: ignoreversion
 Source: ".\files\System.Drawing.dll"; DestDir: "{#pfDir}"; Flags: ignoreversion
+Source: ".\files\System.Management.dll"; DestDir: "{#pfDir}"; Flags: ignoreversion
 Source: ".\files\System.Windows.Forms.dll"; DestDir: "{#pfDir}"; Flags: ignoreversion
 Source: ".\files\System.Xml.dll"; DestDir: "{#pfDir}"; Flags: ignoreversion
 Source: ".\files\System.Xml.Linq.dll"; DestDir: "{#pfDir}"; Flags: ignoreversion

diff --git a/MainForm.vb b/MainForm.vb
@@ -12209,14 +12209,17 @@ Public Class MainForm
         If ImgInfoSFD.ShowDialog() = Windows.Forms.DialogResult.OK Then
             If Not ImgInfoSaveDlg.IsDisposed Then ImgInfoSaveDlg.Dispose()
             ImgInfoSaveDlg.SaveTarget = ImgInfoSFD.FileName
-            For x = 0 To Array.LastIndexOf(MountedImageMountDirs, MountedImageMountDirs.Last)
-                If MountedImageMountDirs(x) = MountDir Then
-                    ImgInfoSaveDlg.SourceImage = MountedImageImgFiles(x)
-                    Exit For
-                End If
-            Next
+            If MountedImageMountDirs.Count > 0 Then
+                For x = 0 To Array.LastIndexOf(MountedImageMountDirs, MountedImageMountDirs.Last)
+                    If MountedImageMountDirs(x) = MountDir Then
+                        ImgInfoSaveDlg.SourceImage = MountedImageImgFiles(x)
+                        Exit For
+                    End If
+                Next
+            End If
             ImgInfoSaveDlg.ImgMountDir = If(Not OnlineManagement, MountDir, "")
             ImgInfoSaveDlg.OnlineMode = OnlineManagement
+            ImgInfoSaveDlg.OfflineMode = OfflineManagement
             ImgInfoSaveDlg.AllDrivers = AllDrivers
             ImgInfoSaveDlg.SaveTask = 0
             ImgInfoSaveDlg.ShowDialog()

diff --git a/My Project/Resources.Designer.vb b/My Project/Resources.Designer.vb
diff --git a/My Project/Resources.resx b/My Project/Resources.resx
@@ -1099,14 +1099,18 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
   <data name="WhatsNew" xml:space="preserve">
     <value>Bugfixes
 
-- The background process details panel is now hidden when leaving the offline or online installation management modes
+- Fixed an issue where the program threw an exception when attempting to save complete image information if no images were mounted
+- When getting Windows PE configuration, the program no longer returns "Could not get value MB" if it fails to get the scratch space configuration
+- Image information reports correctly detect the offline installation management mode now
+- The image information saver now informs you when the target report file is being saved
 
 New features
 
-- You can now access the offline installation management mode from the File menu
-- You will now see an image information report preview right after the generation process has been completed
-- When performing feature enablement, component store repair, and capability addition operations to an active installation in Safe Mode, the progress panel will inform you about it
-- Added a menu entry to contribute to the help system</value>
+- The program now recommends monospaced fonts for log windows
+- The initial setup wizard has had a minor redesign:
+  - The Back and Cancel buttons are now hidden, in favor of the window controls
+- The image application drive specifier now uses native WMI queries instead of the helper command
+- When getting information of driver packages, the progress bar will smoothly increase in value now</value>
   </data>
   <data name="split_img" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\split_img.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -1117,4 +1121,13 @@ New features
   <data name="mdl_discussion" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\about\mdl_discussion.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="backbox" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\FirstUse\backbox.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="backbox_down" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\FirstUse\backbox_down.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="backbox_focus" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\FirstUse\backbox_focus.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
diff --git a/Panels/FirstUse/PrgSetup.Designer.vb b/Panels/FirstUse/PrgSetup.Designer.vb
diff --git a/Panels/FirstUse/PrgSetup.vb b/Panels/FirstUse/PrgSetup.vb
@@ -82,6 +82,39 @@ Public Class PrgSetup
         End If
     End Sub
 
+    Private Sub backBox_MouseEnter(sender As Object, e As EventArgs) Handles backBox.MouseEnter
+        backBox.Image = My.Resources.backbox_focus
+    End Sub
+
+    Private Sub backBox_MouseLeave(sender As Object, e As EventArgs) Handles backBox.MouseLeave
+        backBox.Image = My.Resources.backbox
+    End Sub
+
+    Private Sub backBox_MouseDown(sender As Object, e As MouseEventArgs) Handles backBox.MouseDown
+        backBox.Image = My.Resources.backbox_down
+    End Sub
+
+    Private Sub backBox_MouseUp(sender As Object, e As MouseEventArgs) Handles backBox.MouseUp
+        backBox.Image = My.Resources.backbox_focus
+    End Sub
+
+    Private Sub backBox_MouseHover(sender As Object, e As EventArgs) Handles backBox.MouseHover
+        Dim msg As String = ""
+        Select Case My.Computer.Info.InstalledUICulture.ThreeLetterWindowsLanguageName
+            Case "ENU", "ENG"
+                msg = "Go back"
+            Case "ESN"
+                msg = "Atrás"
+            Case "FRA"
+                msg = "Retourner"
+        End Select
+        btnToolTip.SetToolTip(sender, msg)
+    End Sub
+
+    'Private Sub backBox_Click(sender As Object, e As EventArgs) Handles backBox.Click
+    '    Back_Button.PerformClick()
+    'End Sub
+
     Private Sub wndControlPanel_MouseDown(sender As Object, e As MouseEventArgs) Handles wndControlPanel.MouseDown
         If e.Button = Windows.Forms.MouseButtons.Left Then
             ' Get the new position
@@ -192,12 +225,16 @@ Public Class PrgSetup
         End If
         If pageInt = 0 Then
             Back_Button.Enabled = False
+            backBox.Visible = False
+            Label1.Left = 8
         Else
             Back_Button.Enabled = True
+            backBox.Visible = True
+            Label1.Left = 54
         End If
     End Sub
 
-    Private Sub Back_Button_Click(sender As Object, e As EventArgs) Handles Back_Button.Click
+    Private Sub Back_Button_Click(sender As Object, e As EventArgs) Handles Back_Button.Click, backBox.Click
         pageInt -= 1
         Select Case pageInt
             Case 0
@@ -263,8 +300,12 @@ Public Class PrgSetup
         End If
         If pageInt = 0 Then
             Back_Button.Enabled = False
+            backBox.Visible = False
+            Label1.Left = 8
         Else
             Back_Button.Enabled = True
+            backBox.Visible = True
+            Label1.Left = 54
         End If
     End Sub
 
@@ -282,6 +323,8 @@ Public Class PrgSetup
         TextBox2.Text = Environment.GetFolderPath(Environment.SpecialFolder.Windows) & "\Logs\DISM\DISM.log"
         MainForm.LogFile = TextBox2.Text
 
+        Next_Button.Left = 998
+
         ' Set color modes
         If MainForm.BackColor = Color.FromArgb(48, 48, 48) Then
             BodyPanelContainer.BackColor = Color.FromArgb(48, 48, 48)

diff --git a/Panels/Get_Ops/AppxPkgs/GetAppxPkgInfo.vb b/Panels/Get_Ops/AppxPkgs/GetAppxPkgInfo.vb
@@ -340,6 +340,7 @@ Public Class GetAppxPkgInfoDlg
             ImgInfoSaveDlg.ImgMountDir = If(Not MainForm.OnlineManagement, MainForm.MountDir, "")
             ImgInfoSaveDlg.SaveTarget = MainForm.ImgInfoSFD.FileName
             ImgInfoSaveDlg.OnlineMode = MainForm.OnlineManagement
+            ImgInfoSaveDlg.OfflineMode = MainForm.OfflineManagement
             ImgInfoSaveDlg.SaveTask = 5
             ImgInfoSaveDlg.ShowDialog()
         End If

diff --git a/Panels/Get_Ops/Capabilities/GetCapabilityInfo.vb b/Panels/Get_Ops/Capabilities/GetCapabilityInfo.vb
@@ -319,6 +319,7 @@ Public Class GetCapabilityInfoDlg
             ImgInfoSaveDlg.ImgMountDir = If(Not MainForm.OnlineManagement, MainForm.MountDir, "")
             ImgInfoSaveDlg.SaveTarget = MainForm.ImgInfoSFD.FileName
             ImgInfoSaveDlg.OnlineMode = MainForm.OnlineManagement
+            ImgInfoSaveDlg.OfflineMode = MainForm.OfflineManagement
             ImgInfoSaveDlg.SaveTask = 6
             ImgInfoSaveDlg.ShowDialog()
         End If

diff --git a/Panels/Get_Ops/Drivers/GetDriverInfo.vb b/Panels/Get_Ops/Drivers/GetDriverInfo.vb
@@ -875,6 +875,7 @@ Public Class GetDriverInfo
             ImgInfoSaveDlg.SaveTarget = MainForm.ImgInfoSFD.FileName
             ImgInfoSaveDlg.ImgMountDir = If(Not MainForm.OnlineManagement, MainForm.MountDir, "")
             ImgInfoSaveDlg.OnlineMode = MainForm.OnlineManagement
+            ImgInfoSaveDlg.OfflineMode = MainForm.OfflineManagement
             ImgInfoSaveDlg.AllDrivers = MainForm.AllDrivers
             ImgInfoSaveDlg.SaveTask = If(InfoFromDrvPackagesPanel.Visible, 8, 7)
             If InfoFromDrvPackagesPanel.Visible Then

diff --git a/Panels/Get_Ops/Features/GetFeatureInfo.vb b/Panels/Get_Ops/Features/GetFeatureInfo.vb
@@ -321,6 +321,7 @@ Public Class GetFeatureInfoDlg
             ImgInfoSaveDlg.ImgMountDir = If(Not MainForm.OnlineManagement, MainForm.MountDir, "")
             ImgInfoSaveDlg.SaveTarget = MainForm.ImgInfoSFD.FileName
             ImgInfoSaveDlg.OnlineMode = MainForm.OnlineManagement
+            ImgInfoSaveDlg.OfflineMode = MainForm.OfflineManagement
             ImgInfoSaveDlg.SaveTask = 4
             ImgInfoSaveDlg.ShowDialog()
         End If

diff --git a/Panels/Get_Ops/GetImgInfoDlg.vb b/Panels/Get_Ops/GetImgInfoDlg.vb
@@ -584,6 +584,7 @@ Public Class GetImgInfoDlg
             ImgInfoSaveDlg.SourceImage = SelectedImageFile
             ImgInfoSaveDlg.SaveTarget = MainForm.ImgInfoSFD.FileName
             ImgInfoSaveDlg.OnlineMode = False
+            ImgInfoSaveDlg.OfflineMode = False
             ImgInfoSaveDlg.SaveTask = 1
             ImgInfoSaveDlg.ShowDialog()
         End If