Merge pull request #23 from CodingWonders/dt_pre_2382

DISMTools 0.3.1 Preview 2

Author: CodingWonders

DISMTools.vbproj

@@ -893,6 +893,12 @@
     <None Include="Resources\get_drv_info.png" />
     <None Include="Resources\drv_info_from_image.png" />
     <None Include="Resources\info_from_drv_file.png" />
+    <None Include="Resources\next_element.png" />
+    <None Include="Resources\next_element_dark.png" />
+    <None Include="Resources\prev_element.png" />
+    <None Include="Resources\prev_element_dark.png" />
+    <None Include="Resources\jumpto_dark.png" />
+    <None Include="Resources\jumpto.png" />
     <Content Include="ThemeVS2012\Resources\Dockindicator_PaneDiamond_Hotspot.png" />
     <Content Include="ThemeVS2012\Resources\DockIndicator_PaneDiamond_HotspotIndex.png" />
     <Content Include="ThemeVS2012\Resources\MaskArrowBottom.png" />

Installer/Output/dt_setup.exe

@@ -291,6 +291,12 @@ These options, and the program information, can be found by opening the Help men
         JCQkJEQxb97/AOrW4M1DfY/XAAAAAElFTkSuQmCC
 </value>
   </data>
+  <metadata name="ToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>249, 17</value>
+  </metadata>
+  <metadata name="StatusStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>356, 17</value>
+  </metadata>
   <data name="TabPageIcon1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABGdBTUEAALGPC/xhBQAAAxpJREFUaEPt
@@ -605,6 +611,12 @@ These options, and the program information, can be found by opening the Help men
   <metadata name="ToolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>866, 17</value>
   </metadata>
+  <metadata name="prjTreeStatus.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>132, 17</value>
+  </metadata>
+  <metadata name="ToolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>866, 17</value>
+  </metadata>
   <data name="RefreshViewTSB.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8

MainForm.Designer.vb

@@ -4592,7 +4592,7 @@ Public Class MainForm
                     ' Menu - Commands - OS uninstall
                     GetOSUninstallWindow.Text = "Obtener margen de desinstalación..."
                     InitiateOSUninstall.Text = "Iniciar desinstalación..."
-                    RemoveOSUninstall.Text = "Eliminar abilidad de desinstalación..."
+                    RemoveOSUninstall.Text = "Eliminar habilidad de desinstalación..."
                     SetOSUninstallWindow.Text = "Establecer margen de desinstalación..."
                     ' Menu - Commands - Reserved storage
                     SetReservedStorageState.Text = "Establecer estado de almacenamiento reservado..."
@@ -5157,7 +5157,7 @@ Public Class MainForm
                 ' Menu - Commands - OS uninstall
                 GetOSUninstallWindow.Text = "Obtener margen de desinstalación..."
                 InitiateOSUninstall.Text = "Iniciar desinstalación..."
-                RemoveOSUninstall.Text = "Eliminar abilidad de desinstalación..."
+                RemoveOSUninstall.Text = "Eliminar habilidad de desinstalación..."
                 SetOSUninstallWindow.Text = "Establecer margen de desinstalación..."
                 ' Menu - Commands - Reserved storage
                 SetReservedStorageState.Text = "Establecer estado de almacenamiento reservado..."
@@ -9444,7 +9444,13 @@ Public Class MainForm
                             ' Choose the largest one
                             Return logoFiles.Last
                         Else
-                            Return Path.Combine(If(OnlineManagement, Path.GetPathRoot(Environment.GetFolderPath(Environment.SpecialFolder.Windows)), MountDir) & "\Program Files\WindowsApps\" & PackageName, line.Replace(" ", "").Trim().Replace("/", "").Trim().Replace("<Logo>", "").Trim())
+                            If File.Exists(Path.Combine(If(OnlineManagement, Path.GetPathRoot(Environment.GetFolderPath(Environment.SpecialFolder.Windows)), MountDir) & "\Program Files\WindowsApps\" & PackageName, line.Replace(" ", "").Trim().Replace("/", "").Trim().Replace("<Logo>", "").Trim())) Then
+                                Return Path.Combine(If(OnlineManagement, Path.GetPathRoot(Environment.GetFolderPath(Environment.SpecialFolder.Windows)), MountDir) & "\Program Files\WindowsApps\" & PackageName, line.Replace(" ", "").Trim().Replace("/", "").Trim().Replace("<Logo>", "").Trim())
+                            Else
+                                ' There may be 1 asset in the folder we're looking on. Open it
+                                Dim logoFiles() As String = Directory.GetFiles(If(OnlineManagement, Path.GetPathRoot(Environment.GetFolderPath(Environment.SpecialFolder.Windows)), MountDir) & "\Program Files\WindowsApps\" & PackageName & "\" & newPath, "*.png")
+                                Return logoFiles.Last
+                            End If
                         End If
                     End If
                 Next
@@ -10074,4 +10080,8 @@ Public Class MainForm
         End While
         GetDriverInfo.ShowDialog()
     End Sub
+
+    Private Sub ViewProjectFilesInFileExplorerToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ViewProjectFilesInFileExplorerToolStripMenuItem.Click
+        ExplorerView.PerformClick()
+    End Sub
 End Class

MainForm.resx

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' mediante el asterisco ('*'), como se muestra a continuación:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("0.3.1.2381")> 
-<Assembly: AssemblyFileVersion("0.3.1.2381")> 
+<Assembly: AssemblyVersion("0.3.1.2382")> 
+<Assembly: AssemblyFileVersion("0.3.1.2382")> 

MainForm.vb

@@ -1072,17 +1072,31 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
   <data name="WhatsNew" xml:space="preserve">
     <value>Bugfixes
 
-- Fixed an issue where the progress panel would not be positioned correctly when performing image operation-related direct actions, after waiting for background processes to be completed while their details panel was focused
-- Fixed an issue where the splash screen would be in front of the initial setup screen, thanks abbodi1406 for spotting the issue!
-- The program now ships 32-bit and 64-bit 7-Zip binaries, and uses the right binary according to the architecture of the OS, thanks abbodi1406 for spotting the issue!
-- Fixed an issue where AppX package information would not be displayed on applications packaged with the MSIX Packaging Tool
+- Fixed an issue where the program opened the resource directory of an AppX package instead of the actual resource file if the directory only contained 1 file in it
 
 New features
 
-- "Element independence" now affects the operation of adding AppX packages. Element independence allows you to set settings for individual Elements as opposed to having those apply to all Elements
-- The AppX regions group box is no longer enabled if the version of the specified DISM executable is not 10.0 or greater
-- The program no longer relies on an in-house XML deserializer and instead relies on the deserializer provided by the `System.Xml` namespace now
-- You can now perform other tasks while background processes for specific elements are being run
-- The program no longer allows you to remove AppX packages from Windows Server Core images without the Desktop Experience feature enabled</value>
+- The program no longer uses the system DISM at all times if the user specified a custom DISM executable
+- Introduced the driver information dialog
+- You can now see the architecture of a driver file when adding it
+- To avoid creating big log files, the program no longer gets driver information if a file targets more than 10 devices</value>
+  </data>
+  <data name="jumpto" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\jumpto.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="jumpto_dark" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\jumpto_dark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="next_element" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\next_element.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="next_element_dark" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\next_element_dark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="prev_element" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\prev_element.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="prev_element_dark" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\prev_element_dark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>